diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/VnfCmBase.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/VnfCmBase.groovy
index 4237a8d..32fc46a 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/VnfCmBase.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/VnfCmBase.groovy
@@ -264,24 +264,8 @@
 					execution.setVariable("vmIdList", vmidsArray.toString())
 					execution.setVariable("vserverIdList", vserveridsArray.toString())
 				}
-			}
-						
-			if (cloudRegionId != null) {			
-				AAIUri cloudRegionUri = AAIUriFactory.createResourceUri(AAIObjectType.DEFAULT_CLOUD_REGION, cloudRegionId)				
-				// Check if this client region exists
-				if (!client.exists(cloudRegionUri)) {
-					msoLogger.debug("Cloud Region with cloudRegionId " + cloudRegionId + " does not exist in A&AI")
-					exceptionUtil.buildAndThrowWorkflowException(execution, 404, "Cloud Region with cloudRegionId " + cloudRegionId + " does not exist in A&AI")
-				}
+			}					
 			
-				AAIResultWrapper aaiRWCloud = client.get(cloudRegionUri)
-			
-				Map<String, Object> resultCloud = aaiRWCloud.asMap()			
-			
-				String aicIdentity = resultCloud.get("identity-url")
-				msoLogger.debug("aicIdentity from A&AI is: " + aicIdentity)
-				execution.setVariable("aicIdentity", aicIdentity)
-			}
 			// preserve relationships if exist
 			Optional<Relationships> relationships = aaiRW.getRelationships()
 			
@@ -825,7 +809,5 @@
 		}
 		msoLogger.trace("Exit postProcessRollback ")
 	}
- 
-
 	
 }
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/VnfInPlaceUpdate.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/VnfInPlaceUpdate.bpmn
index 3c42320..3663bad 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/VnfInPlaceUpdate.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/VnfInPlaceUpdate.bpmn
@@ -131,7 +131,7 @@
     </bpmn2:startEvent>
     <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="StartEvent_1" targetRef="PreProcessRequest" />
     <bpmn2:sequenceFlow id="SequenceFlow_3" name="no" sourceRef="ExclusiveGateway_18j1ow5" targetRef="ScriptTask_10" />
-    <bpmn2:sequenceFlow id="SequenceFlow_053qjfy" sourceRef="Task_1opcb4j" targetRef="Task_0vy2zge" />
+    <bpmn2:sequenceFlow id="SequenceFlow_053qjfy" sourceRef="Task_1opcb4j" targetRef="Task_0op98k0" />
     <bpmn2:scriptTask id="Task_1opcb4j" name="Query A&#38;AI for VNF" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_0y0jt4l</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_053qjfy</bpmn2:outgoing>
@@ -169,8 +169,8 @@
 ]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:scriptTask id="Task_0vy2zge" name="Check If Physical Servers Are Locked in A&#38;AI" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_053qjfy</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_179tyul</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_1us5byg</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0usxnlk</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
 def uvfm = new VnfInPlaceUpdate()
@@ -240,7 +240,7 @@
       <bpmn2:outgoing>SequenceFlow_1c0vdki</bpmn2:outgoing>
       <bpmn2:outgoing>SequenceFlow_11o5j55</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_1c0vdki" name="no" sourceRef="ExclusiveGateway_1etgtgi" targetRef="Task_0eae8go" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1c0vdki" name="no" sourceRef="ExclusiveGateway_1etgtgi" targetRef="Task_0qa3yfr" />
     <bpmn2:exclusiveGateway id="ExclusiveGateway_02tj4dw" name="Error on Upgrade Software?" default="SequenceFlow_162mm0m">
       <bpmn2:incoming>SequenceFlow_1uno5rs</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_162mm0m</bpmn2:outgoing>
@@ -295,13 +295,15 @@
       <bpmn2:outgoing>SequenceFlow_1quapjx</bpmn2:outgoing>
       <bpmn2:outgoing>SequenceFlow_101n488</bpmn2:outgoing>
       <bpmn2:outgoing>SequenceFlow_021ah63</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_015qhj5</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_1xeh8rb</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_05gpym3" name="Skip" sourceRef="ExclusiveGateway_0xlxgl0" targetRef="ExclusiveGateway_0y82zzx">
       <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("disposition") == "Skip"]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_19ba94v" sourceRef="Task_0eae8go" targetRef="ExclusiveGateway_19an3h2" />
     <bpmn2:sequenceFlow id="SequenceFlow_1nlqlwn" sourceRef="ExclusiveGateway_0y82zzx" targetRef="IntermediateThrowEvent_0ee7wot">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[(execution.getVariable("disposition") == "Skip" && execution.getVariable("workStep") == "QuiesceTraffic") ||
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[(execution.getVariable("disposition") == "Skip" && execution.getVariable("workStep") == "Stop") ||
 (execution.getVariable("disposition") == "Retry" && execution.getVariable("workStep") == "Snapshot")]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_1c022sy" sourceRef="ExclusiveGateway_0y82zzx" targetRef="Task_1tg549h" />
@@ -371,15 +373,6 @@
     <bpmn2:sequenceFlow id="SequenceFlow_0zzwdwf" sourceRef="IntermediateThrowEvent_1wdxgjm" targetRef="Task_0e313zv" />
     <bpmn2:sequenceFlow id="SequenceFlow_06ajc11" name="no" sourceRef="ExclusiveGateway_0ud5uwa" targetRef="Task_0e313zv" />
     <bpmn2:sequenceFlow id="SequenceFlow_179z9vl" sourceRef="Task_0n1d5f2" targetRef="ExclusiveGateway_148eo7w" />
-    <bpmn2:scriptTask id="Task_0n1d5f2" name="Set VF Is Closed Loop Disabled Flag in A&#38;AI" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_0du9273</bpmn2:incoming>
-      <bpmn2:incoming>SequenceFlow_032tm9y</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_179z9vl</bpmn2:outgoing>
-      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
-def uvfm = new VnfInPlaceUpdate()
-uvfm.setClosedLoopDisabledInAAI(execution, true)
-]]></bpmn2:script>
-    </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_032tm9y" sourceRef="IntermediateThrowEvent_1552q1o" targetRef="Task_0n1d5f2" />
     <bpmn2:intermediateCatchEvent id="IntermediateThrowEvent_1552q1o" name="To set Closed Loop Disabled">
       <bpmn2:outgoing>SequenceFlow_032tm9y</bpmn2:outgoing>
@@ -434,7 +427,7 @@
       <bpmn2:outgoing>SequenceFlow_1fuaq5k</bpmn2:outgoing>
       <bpmn2:outgoing>SequenceFlow_04gth9f</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_1fuaq5k" name="no" sourceRef="ExclusiveGateway_19an3h2" targetRef="Task_1mdr1nd" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1fuaq5k" name="no" sourceRef="ExclusiveGateway_19an3h2" targetRef="Task_1j68pc1" />
     <bpmn2:intermediateCatchEvent id="IntermediateThrowEvent_0a1s69h" name="To SnapShot">
       <bpmn2:outgoing>SequenceFlow_0if6xj4</bpmn2:outgoing>
       <bpmn2:linkEventDefinition name="To SnapShot" />
@@ -594,11 +587,11 @@
 (execution.getVariable("disposition") == "Retry" && execution.getVariable("workStep") == "Lock")]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_1ar6ikk" sourceRef="ExclusiveGateway_0y82zzx" targetRef="IntermediateThrowEvent_1p9i2bi">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[(execution.getVariable("disposition") == "Skip" && execution.getVariable("workStep") == "UpgradePreCheck") ||
-(execution.getVariable("disposition") == "Retry" && execution.getVariable("workStep") == "QuiesceTraffic")]]></bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[(execution.getVariable("disposition") == "Skip" && execution.getVariable("workStep") == "QuiesceTraffic") ||
+(execution.getVariable("disposition") == "Retry" && execution.getVariable("workStep") == "Stop")]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_171iq7e" sourceRef="ExclusiveGateway_0y82zzx" targetRef="IntermediateThrowEvent_0rp1ax0">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[(execution.getVariable("disposition") == "Skip" && execution.getVariable("workStep") == "Snapshot") ||
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[(execution.getVariable("disposition") == "Skip" && execution.getVariable("workStep") == "Start") ||
 (execution.getVariable("disposition") == "Retry" && execution.getVariable("workStep") == "UpgradeBackup")]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="SequenceFlow_1553o9f" sourceRef="ExclusiveGateway_0y82zzx" targetRef="IntermediateThrowEvent_01ngkx2">
@@ -653,9 +646,9 @@
       <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[(execution.getVariable("disposition") == "Skip" && execution.getVariable("workStep") == "Lock") ||
 (execution.getVariable("disposition") == "Retry" && execution.getVariable("workStep") == "UpgradePreCheck")]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
-    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_1p9i2bi" name="To Quiesce Traffic">
+    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_1p9i2bi" name="To Stop VNF">
       <bpmn2:incoming>SequenceFlow_1ar6ikk</bpmn2:incoming>
-      <bpmn2:linkEventDefinition name="To Quiesce Traffic" />
+      <bpmn2:linkEventDefinition name="To Stop VNF" />
     </bpmn2:intermediateThrowEvent>
     <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_0ee7wot" name="To SnapShot">
       <bpmn2:incoming>SequenceFlow_1nlqlwn</bpmn2:incoming>
@@ -718,12 +711,12 @@
         <camunda:out source="workStep" target="workStep" />
         <camunda:out source="failedActivity" target="failedActivity" />
         <camunda:in source="vmIdList" target="vmIdList" />
-        <camunda:in source="aicIdentity" target="identityUrl" />
+        <camunda:in source="identityUrl" target="identityUrl" />
         <camunda:in source="controllerType" target="controllerType" />
         <camunda:in source="vserverIdList" target="vserverIdList" />
       </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_1c0vdki</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_0if6xj4</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_10yw9oj</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_19ba94v</bpmn2:outgoing>
     </bpmn2:callActivity>
     <bpmn2:callActivity id="Task_1dtbnuy" name="Call APP-C VNF Lock" calledElement="AppCClient">
@@ -888,8 +881,8 @@
         <camunda:in source="vnfName" target="vnfName" />
         <camunda:in source="controllerType" target="controllerType" />
       </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_1fuaq5k</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_1v59be9</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_0ugaydb</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_04rprct</bpmn2:outgoing>
     </bpmn2:callActivity>
     <bpmn2:callActivity id="Task_1hdg951" name="Call APP-C Upgrade Software" calledElement="AppCClient">
@@ -934,6 +927,107 @@
       <bpmn2:outgoing>SequenceFlow_1j81s6b</bpmn2:outgoing>
       <bpmn2:outgoing>SequenceFlow_0qy68ib</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_10yw9oj" sourceRef="ExclusiveGateway_0bd79on" targetRef="Task_0eae8go" />
+    <bpmn2:intermediateCatchEvent id="IntermediateThrowEvent_10hdz40" name="To Stop VNF">
+      <bpmn2:outgoing>SequenceFlow_02zphll</bpmn2:outgoing>
+      <bpmn2:linkEventDefinition name="To Stop VNF" />
+    </bpmn2:intermediateCatchEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_02zphll" sourceRef="IntermediateThrowEvent_10hdz40" targetRef="Task_0qa3yfr" />
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_0bd79on" name="Error on Stop VNF?" default="SequenceFlow_10yw9oj">
+      <bpmn2:incoming>SequenceFlow_0ayfzd3</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_10yw9oj</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_1qdt3ml</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_0ayfzd3" sourceRef="Task_0qa3yfr" targetRef="ExclusiveGateway_0bd79on" />
+    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_0u4t4eb" name="To Rainy Day Handling">
+      <bpmn2:incoming>SequenceFlow_1qdt3ml</bpmn2:incoming>
+      <bpmn2:linkEventDefinition name="To Rainy Day Handling" />
+    </bpmn2:intermediateThrowEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_1qdt3ml" name="yes" sourceRef="ExclusiveGateway_0bd79on" targetRef="IntermediateThrowEvent_0u4t4eb">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("errorCode") != "0"]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:callActivity id="Task_0qa3yfr" name="Call APP-C Stop VNF" calledElement="AppCClient">
+      <bpmn2:extensionElements>
+        <camunda:in source="msoRequestId" target="msoRequestId" />
+        <camunda:in source="actionStop" target="action" />
+        <camunda:in source="vnfId" target="vnfId" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:in source="identityUrl" target="identityUrl" />
+        <camunda:in source="controllerType" target="controllerType" />
+        <camunda:out source="errorCode" target="errorCode" />
+        <camunda:out source="errorText" target="errorText" />
+        <camunda:out source="workStep" target="workStep" />
+        <camunda:out source="failedActivity" target="failedActivity" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_1c0vdki</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_02zphll</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0ayfzd3</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:sequenceFlow id="SequenceFlow_015qhj5" sourceRef="ExclusiveGateway_0y82zzx" targetRef="IntermediateThrowEvent_0utxo48">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[(execution.getVariable("disposition") == "Skip" && execution.getVariable("workStep") == "UpgradePreCheck") ||
+(execution.getVariable("disposition") == "Retry" && execution.getVariable("workStep") == "QuiesceTraffic")]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_0utxo48" name="To Quiesce Traffic">
+      <bpmn2:incoming>SequenceFlow_015qhj5</bpmn2:incoming>
+      <bpmn2:linkEventDefinition name="To Quiesce Traffic" />
+    </bpmn2:intermediateThrowEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_1xeh8rb" sourceRef="ExclusiveGateway_0y82zzx" targetRef="IntermediateThrowEvent_034letx">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[(execution.getVariable("disposition") == "Skip" && execution.getVariable("workStep") == "Snapshot") ||
+(execution.getVariable("disposition") == "Retry" && execution.getVariable("workStep") == "Start")]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_034letx" name="To Start VNF">
+      <bpmn2:incoming>SequenceFlow_1xeh8rb</bpmn2:incoming>
+      <bpmn2:linkEventDefinition name="To Start VNF" />
+    </bpmn2:intermediateThrowEvent>
+    <bpmn2:sequenceFlow id="SequenceFlow_1c2q423" sourceRef="Task_1j68pc1" targetRef="ExclusiveGateway_1aepvyq" />
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_1aepvyq" name="Error on Start VNF?" default="SequenceFlow_0ugaydb">
+      <bpmn2:incoming>SequenceFlow_1c2q423</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_0ugaydb</bpmn2:outgoing>
+      <bpmn2:outgoing>SequenceFlow_1ouddzv</bpmn2:outgoing>
+    </bpmn2:exclusiveGateway>
+    <bpmn2:sequenceFlow id="SequenceFlow_0ugaydb" name="no" sourceRef="ExclusiveGateway_1aepvyq" targetRef="Task_1mdr1nd" />
+    <bpmn2:sequenceFlow id="SequenceFlow_12k801c" sourceRef="IntermediateThrowEvent_01xb76a" targetRef="Task_1j68pc1" />
+    <bpmn2:sequenceFlow id="SequenceFlow_1ouddzv" name="yes" sourceRef="ExclusiveGateway_1aepvyq" targetRef="IntermediateThrowEvent_0d6k86e">
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[execution.getVariable("errorCode") != "0"]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:intermediateCatchEvent id="IntermediateThrowEvent_01xb76a" name="To Start VNF">
+      <bpmn2:outgoing>SequenceFlow_12k801c</bpmn2:outgoing>
+      <bpmn2:linkEventDefinition name="To Start VNF" />
+    </bpmn2:intermediateCatchEvent>
+    <bpmn2:intermediateThrowEvent id="IntermediateThrowEvent_0d6k86e" name="To Rainy Day Handler">
+      <bpmn2:incoming>SequenceFlow_1ouddzv</bpmn2:incoming>
+      <bpmn2:linkEventDefinition name="To Rainy Day Handling" />
+    </bpmn2:intermediateThrowEvent>
+    <bpmn2:callActivity id="Task_1j68pc1" name="Call APP-C Start VNF" calledElement="AppCClient">
+      <bpmn2:extensionElements>
+        <camunda:in source="msoRequestId" target="msoRequestId" />
+        <camunda:in source="actionStart" target="action" />
+        <camunda:in source="vnfId" target="vnfId" />
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:in source="identityUrl" target="identityUrl" />
+        <camunda:in source="controllerType" target="controllerType" />
+        <camunda:out source="errorCode" target="errorCode" />
+        <camunda:out source="errorText" target="errorText" />
+        <camunda:out source="workStep" target="workStep" />
+        <camunda:out source="failedActivity" target="failedActivity" />
+      </bpmn2:extensionElements>
+      <bpmn2:incoming>SequenceFlow_1fuaq5k</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_12k801c</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1c2q423</bpmn2:outgoing>
+    </bpmn2:callActivity>
+    <bpmn2:scriptTask id="Task_0n1d5f2" name="Set VF Is Closed Loop Disabled Flag in A&#38;AI" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_0du9273</bpmn2:incoming>
+      <bpmn2:incoming>SequenceFlow_032tm9y</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_179z9vl</bpmn2:outgoing>
+      <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
+def uvfm = new VnfInPlaceUpdate()
+uvfm.setClosedLoopDisabledInAAI(execution, true)]]></bpmn2:script>
+    </bpmn2:scriptTask>
+    <bpmn2:sequenceFlow id="SequenceFlow_1us5byg" sourceRef="Task_0op98k0" targetRef="Task_0vy2zge" />
+    <bpmn2:serviceTask id="Task_0op98k0" name="Query Catalog DB for IdentityUrl" camunda:expression="${CloudSiteCatalogUtils.getIdentityUrlFromCloudSite(execution)}">
+      <bpmn2:incoming>SequenceFlow_053qjfy</bpmn2:incoming>
+      <bpmn2:outgoing>SequenceFlow_1us5byg</bpmn2:outgoing>
+    </bpmn2:serviceTask>
   </bpmn2:process>
   <bpmn2:error id="Error_1" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
@@ -945,9 +1039,9 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_125" bpmnElement="EndEvent_1">
-        <dc:Bounds x="569" y="1073" width="36" height="36" />
+        <dc:Bounds x="1248" y="1096" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="568" y="1114" width="38" height="12" />
+          <dc:Bounds x="1247" y="1137" width="38" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_StartEvent_50" targetElement="_BPMNShape_ScriptTask_124">
@@ -978,30 +1072,30 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_127" bpmnElement="ScriptTask_4">
-        <dc:Bounds x="415" y="1051" width="100" height="80" />
+        <dc:Bounds x="1094" y="1074" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_ScriptTask_127" targetElement="_BPMNShape_EndEvent_125">
-        <di:waypoint xsi:type="dc:Point" x="515" y="1091" />
-        <di:waypoint xsi:type="dc:Point" x="549" y="1091" />
-        <di:waypoint xsi:type="dc:Point" x="549" y="1091" />
-        <di:waypoint xsi:type="dc:Point" x="569" y="1091" />
+        <di:waypoint xsi:type="dc:Point" x="1194" y="1114" />
+        <di:waypoint xsi:type="dc:Point" x="1228" y="1114" />
+        <di:waypoint xsi:type="dc:Point" x="1228" y="1114" />
+        <di:waypoint xsi:type="dc:Point" x="1248" y="1114" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="564" y="1091" width="0" height="0" />
+          <dc:Bounds x="1243" y="1114" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_133" bpmnElement="ScriptTask_10">
-        <dc:Bounds x="126" y="1051" width="100" height="80" />
+        <dc:Bounds x="805" y="1074" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_CallActivity_27" bpmnElement="CallActivity_1">
-        <dc:Bounds x="269" y="1051" width="100" height="80" />
+        <dc:Bounds x="948" y="1074" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_17" bpmnElement="SequenceFlow_17" sourceElement="_BPMNShape_ScriptTask_133" targetElement="_BPMNShape_CallActivity_27">
-        <di:waypoint xsi:type="dc:Point" x="226" y="1091" />
-        <di:waypoint xsi:type="dc:Point" x="248" y="1091" />
-        <di:waypoint xsi:type="dc:Point" x="248" y="1091" />
-        <di:waypoint xsi:type="dc:Point" x="269" y="1091" />
+        <di:waypoint xsi:type="dc:Point" x="905" y="1114" />
+        <di:waypoint xsi:type="dc:Point" x="927" y="1114" />
+        <di:waypoint xsi:type="dc:Point" x="927" y="1114" />
+        <di:waypoint xsi:type="dc:Point" x="948" y="1114" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="263" y="1091" width="0" height="0" />
+          <dc:Bounds x="942" y="1114" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_SubProcess_17" bpmnElement="SubProcess_1" isExpanded="true">
@@ -1059,12 +1153,12 @@
         <dc:Bounds x="748" y="1446" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_CallActivity_27" targetElement="_BPMNShape_ScriptTask_127">
-        <di:waypoint xsi:type="dc:Point" x="369" y="1091" />
-        <di:waypoint xsi:type="dc:Point" x="392" y="1091" />
-        <di:waypoint xsi:type="dc:Point" x="392" y="1091" />
-        <di:waypoint xsi:type="dc:Point" x="415" y="1091" />
+        <di:waypoint xsi:type="dc:Point" x="1048" y="1114" />
+        <di:waypoint xsi:type="dc:Point" x="1071" y="1114" />
+        <di:waypoint xsi:type="dc:Point" x="1071" y="1114" />
+        <di:waypoint xsi:type="dc:Point" x="1094" y="1114" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="407" y="1091" width="0" height="0" />
+          <dc:Bounds x="1086" y="1114" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_19" sourceElement="_BPMNShape_CallActivity_28" targetElement="_BPMNShape_EndEvent_126">
@@ -1075,25 +1169,17 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_3" targetElement="_BPMNShape_ScriptTask_133">
-        <di:waypoint xsi:type="dc:Point" x="1459" y="800" />
-        <di:waypoint xsi:type="dc:Point" x="1561" y="800" />
-        <di:waypoint xsi:type="dc:Point" x="1561" y="989" />
-        <di:waypoint xsi:type="dc:Point" x="99" y="989" />
-        <di:waypoint xsi:type="dc:Point" x="99" y="1091" />
-        <di:waypoint xsi:type="dc:Point" x="126" y="1091" />
+        <di:waypoint xsi:type="dc:Point" x="756" y="1114" />
+        <di:waypoint xsi:type="dc:Point" x="805" y="1114" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1482" y="772.5275881403734" width="12" height="12" />
+          <dc:Bounds x="794" y="1090.1083303171945" width="12" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_053qjfy_di" bpmnElement="SequenceFlow_053qjfy">
         <di:waypoint xsi:type="dc:Point" x="671" y="90" />
-        <di:waypoint xsi:type="dc:Point" x="982" y="90" />
-        <di:waypoint xsi:type="dc:Point" x="982" y="156" />
-        <di:waypoint xsi:type="dc:Point" x="103" y="156" />
-        <di:waypoint xsi:type="dc:Point" x="103" y="237" />
-        <di:waypoint xsi:type="dc:Point" x="131" y="237" />
+        <di:waypoint xsi:type="dc:Point" x="750" y="90" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="543" y="141" width="0" height="0" />
+          <dc:Bounds x="711" y="75" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_08xzuox_di" bpmnElement="Task_1opcb4j">
@@ -1120,7 +1206,7 @@
         <dc:Bounds x="608" y="197" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0sgm9bu_di" bpmnElement="Task_1drglpt">
-        <dc:Bounds x="1058" y="760" width="100" height="80" />
+        <dc:Bounds x="355" y="1074" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_16jtt5t_di" bpmnElement="Task_0vy2zge">
         <dc:Bounds x="131" y="197" width="100" height="80" />
@@ -1147,24 +1233,24 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1uno5rs_di" bpmnElement="SequenceFlow_1uno5rs">
-        <di:waypoint xsi:type="dc:Point" x="223" y="800" />
-        <di:waypoint xsi:type="dc:Point" x="266" y="800" />
+        <di:waypoint xsi:type="dc:Point" x="683" y="800" />
+        <di:waypoint xsi:type="dc:Point" x="726" y="800" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="245" y="785" width="0" height="0" />
+          <dc:Bounds x="706" y="785" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1c79909_di" bpmnElement="SequenceFlow_1c79909">
-        <di:waypoint xsi:type="dc:Point" x="464" y="800" />
-        <di:waypoint xsi:type="dc:Point" x="513" y="800" />
+        <di:waypoint xsi:type="dc:Point" x="924" y="800" />
+        <di:waypoint xsi:type="dc:Point" x="973" y="800" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="489" y="785" width="0" height="0" />
+          <dc:Bounds x="949" y="785" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1xfbwpi_di" bpmnElement="SequenceFlow_1xfbwpi">
-        <di:waypoint xsi:type="dc:Point" x="926" y="800" />
-        <di:waypoint xsi:type="dc:Point" x="955" y="800" />
+        <di:waypoint xsi:type="dc:Point" x="223" y="1114" />
+        <di:waypoint xsi:type="dc:Point" x="252" y="1114" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="941" y="785" width="0" height="0" />
+          <dc:Bounds x="238" y="1099" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_0q323wc_di" bpmnElement="ExclusiveGateway_0q323wc" isMarkerVisible="true">
@@ -1262,41 +1348,41 @@
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1c0vdki_di" bpmnElement="SequenceFlow_1c0vdki">
         <di:waypoint xsi:type="dc:Point" x="785" y="510" />
-        <di:waypoint xsi:type="dc:Point" x="826" y="510" />
+        <di:waypoint xsi:type="dc:Point" x="824" y="510" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="804" y="487" width="12" height="12" />
+          <dc:Bounds x="1024" y="485" width="12" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_02tj4dw_di" bpmnElement="ExclusiveGateway_02tj4dw" isMarkerVisible="true">
-        <dc:Bounds x="266" y="775" width="50" height="50" />
+        <dc:Bounds x="726" y="775" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="247" y="735" width="88" height="24" />
+          <dc:Bounds x="709" y="735" width="84" height="26" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_162mm0m_di" bpmnElement="SequenceFlow_162mm0m">
-        <di:waypoint xsi:type="dc:Point" x="316" y="800" />
-        <di:waypoint xsi:type="dc:Point" x="364" y="800" />
+        <di:waypoint xsi:type="dc:Point" x="776" y="800" />
+        <di:waypoint xsi:type="dc:Point" x="824" y="800" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="333" y="780" width="12" height="12" />
+          <dc:Bounds x="793" y="780" width="12" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_1gn5lab_di" bpmnElement="ExclusiveGateway_1gn5lab" isMarkerVisible="true">
-        <dc:Bounds x="513" y="775" width="50" height="50" />
+        <dc:Bounds x="973" y="775" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="502" y="735" width="72" height="24" />
+          <dc:Bounds x="962" y="735" width="72" height="26" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_0l2z6wc_di" bpmnElement="ExclusiveGateway_0l2z6wc" isMarkerVisible="true">
-        <dc:Bounds x="1195" y="775" width="50" height="50" />
+        <dc:Bounds x="492" y="1089" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1183" y="728" width="73" height="36" />
+          <dc:Bounds x="480" y="1042" width="73" height="36" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_12mfil6_di" bpmnElement="SequenceFlow_12mfil6">
-        <di:waypoint xsi:type="dc:Point" x="1158" y="800" />
-        <di:waypoint xsi:type="dc:Point" x="1195" y="800" />
+        <di:waypoint xsi:type="dc:Point" x="455" y="1114" />
+        <di:waypoint xsi:type="dc:Point" x="492" y="1114" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1178" y="785" width="0" height="0" />
+          <dc:Bounds x="475" y="1099" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_1lb0lk5_di" bpmnElement="Task_1tg549h">
@@ -1322,10 +1408,10 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_19ba94v_di" bpmnElement="SequenceFlow_19ba94v">
-        <di:waypoint xsi:type="dc:Point" x="926" y="510" />
-        <di:waypoint xsi:type="dc:Point" x="955" y="510" />
+        <di:waypoint xsi:type="dc:Point" x="1160" y="510" />
+        <di:waypoint xsi:type="dc:Point" x="1193" y="510" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="941" y="495" width="0" height="0" />
+          <dc:Bounds x="1177" y="495" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1nlqlwn_di" bpmnElement="SequenceFlow_1nlqlwn">
@@ -1488,9 +1574,6 @@
           <dc:Bounds x="1165" y="222" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ScriptTask_1iio503_di" bpmnElement="Task_0n1d5f2">
-        <dc:Bounds x="1046" y="197" width="100" height="80" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_032tm9y_di" bpmnElement="SequenceFlow_032tm9y">
         <di:waypoint xsi:type="dc:Point" x="1096" y="308" />
         <di:waypoint xsi:type="dc:Point" x="1096" y="277" />
@@ -1602,393 +1685,394 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_19an3h2_di" bpmnElement="ExclusiveGateway_19an3h2" isMarkerVisible="true">
-        <dc:Bounds x="955" y="485" width="50" height="50" />
+        <dc:Bounds x="1193" y="485" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="953" y="441" width="53" height="24" />
+          <dc:Bounds x="1191" y="441" width="54" height="26" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1fuaq5k_di" bpmnElement="SequenceFlow_1fuaq5k">
-        <di:waypoint xsi:type="dc:Point" x="1005" y="510" />
-        <di:waypoint xsi:type="dc:Point" x="1064" y="510" />
+        <di:waypoint xsi:type="dc:Point" x="1243" y="510" />
+        <di:waypoint xsi:type="dc:Point" x="1294" y="510" />
+        <di:waypoint xsi:type="dc:Point" x="1294" y="681" />
+        <di:waypoint xsi:type="dc:Point" x="98" y="681" />
+        <di:waypoint xsi:type="dc:Point" x="98" y="800" />
+        <di:waypoint xsi:type="dc:Point" x="124" y="800" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1030" y="485" width="12" height="12" />
+          <dc:Bounds x="1260" y="484.09433477074754" width="12" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="IntermediateCatchEvent_199cotj_di" bpmnElement="IntermediateThrowEvent_0a1s69h">
-        <dc:Bounds x="858" y="581" width="36" height="36" />
+        <dc:Bounds x="1092" y="581" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="844" y="617" width="63" height="13" />
+          <dc:Bounds x="1079" y="617" width="62" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0if6xj4_di" bpmnElement="SequenceFlow_0if6xj4">
-        <di:waypoint xsi:type="dc:Point" x="876" y="581" />
-        <di:waypoint xsi:type="dc:Point" x="876" y="550" />
+        <di:waypoint xsi:type="dc:Point" x="1110" y="581" />
+        <di:waypoint xsi:type="dc:Point" x="1110" y="550" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="891" y="565.5" width="0" height="0" />
+          <dc:Bounds x="1125" y="565.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_04gth9f_di" bpmnElement="SequenceFlow_04gth9f">
-        <di:waypoint xsi:type="dc:Point" x="980" y="535" />
-        <di:waypoint xsi:type="dc:Point" x="980" y="581" />
+        <di:waypoint xsi:type="dc:Point" x="1218" y="535" />
+        <di:waypoint xsi:type="dc:Point" x="1218" y="581" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="986" y="558" width="18" height="12" />
+          <dc:Bounds x="1227" y="546.6958260869565" width="18" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_1ly7m7x_di" bpmnElement="IntermediateThrowEvent_11vs7u4">
-        <dc:Bounds x="962" y="581" width="36" height="36" />
+        <dc:Bounds x="1200" y="581" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="945" y="617" width="69" height="24" />
+          <dc:Bounds x="1184" y="617" width="68" height="26" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1v59be9_di" bpmnElement="SequenceFlow_1v59be9">
-        <di:waypoint xsi:type="dc:Point" x="1114" y="581" />
-        <di:waypoint xsi:type="dc:Point" x="1114" y="550" />
+        <di:waypoint xsi:type="dc:Point" x="414" y="871" />
+        <di:waypoint xsi:type="dc:Point" x="414" y="840" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1129" y="565.5" width="0" height="0" />
+          <dc:Bounds x="429" y="856" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="IntermediateCatchEvent_0gvhqjf_di" bpmnElement="IntermediateThrowEvent_162mb2a">
-        <dc:Bounds x="1096" y="581" width="36" height="36" />
+        <dc:Bounds x="396" y="871" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1084" y="617" width="60" height="25" />
+          <dc:Bounds x="385" y="907" width="58" height="26" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_0ssvndw_di" bpmnElement="ExclusiveGateway_0ssvndw" isMarkerVisible="true">
-        <dc:Bounds x="1195.192" y="485" width="50" height="50" />
+        <dc:Bounds x="495" y="775" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1177" y="439" width="85" height="24" />
+          <dc:Bounds x="478" y="729" width="84" height="26" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_04rprct_di" bpmnElement="SequenceFlow_04rprct">
-        <di:waypoint xsi:type="dc:Point" x="1164" y="510" />
-        <di:waypoint xsi:type="dc:Point" x="1195" y="510" />
+        <di:waypoint xsi:type="dc:Point" x="464" y="800" />
+        <di:waypoint xsi:type="dc:Point" x="495" y="800" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1180" y="495" width="0" height="0" />
+          <dc:Bounds x="480" y="785" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_14s9cw9_di" bpmnElement="IntermediateThrowEvent_1yfd3sz">
-        <dc:Bounds x="1202" y="581" width="36" height="36" />
+        <dc:Bounds x="502" y="871" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1185" y="617" width="69" height="24" />
+          <dc:Bounds x="486" y="907" width="68" height="26" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1uceq96_di" bpmnElement="SequenceFlow_1uceq96">
-        <di:waypoint xsi:type="dc:Point" x="1220" y="535" />
-        <di:waypoint xsi:type="dc:Point" x="1220" y="581" />
+        <di:waypoint xsi:type="dc:Point" x="520" y="825" />
+        <di:waypoint xsi:type="dc:Point" x="520" y="871" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1226" y="548" width="18" height="12" />
+          <dc:Bounds x="526" y="838" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0txgesu_di" bpmnElement="SequenceFlow_0txgesu">
-        <di:waypoint xsi:type="dc:Point" x="1245" y="510" />
-        <di:waypoint xsi:type="dc:Point" x="1286" y="510" />
-        <di:waypoint xsi:type="dc:Point" x="1286" y="676" />
-        <di:waypoint xsi:type="dc:Point" x="95" y="676" />
-        <di:waypoint xsi:type="dc:Point" x="95" y="800" />
-        <di:waypoint xsi:type="dc:Point" x="123" y="800" />
+        <di:waypoint xsi:type="dc:Point" x="545" y="800" />
+        <di:waypoint xsi:type="dc:Point" x="583" y="800" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1259" y="488" width="12" height="12" />
+          <dc:Bounds x="559" y="778" width="12" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0trguug_di" bpmnElement="SequenceFlow_0trguug">
-        <di:waypoint xsi:type="dc:Point" x="701" y="800" />
-        <di:waypoint xsi:type="dc:Point" x="735" y="800" />
+        <di:waypoint xsi:type="dc:Point" x="1161" y="800" />
+        <di:waypoint xsi:type="dc:Point" x="1195" y="800" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="718" y="785" width="0" height="0" />
+          <dc:Bounds x="1178" y="785" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_1ozuicc_di" bpmnElement="ExclusiveGateway_1ozuicc" isMarkerVisible="true">
-        <dc:Bounds x="735.304" y="775" width="50" height="50" />
+        <dc:Bounds x="1195" y="775" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="716" y="735" width="87" height="24" />
+          <dc:Bounds x="1178" y="735" width="84" height="26" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1q3bwlt_di" bpmnElement="SequenceFlow_1q3bwlt">
-        <di:waypoint xsi:type="dc:Point" x="785.304" y="800" />
-        <di:waypoint xsi:type="dc:Point" x="826" y="800" />
+        <di:waypoint xsi:type="dc:Point" x="1245" y="800" />
+        <di:waypoint xsi:type="dc:Point" x="1290" y="800" />
+        <di:waypoint xsi:type="dc:Point" x="1290" y="969" />
+        <di:waypoint xsi:type="dc:Point" x="80" y="969" />
+        <di:waypoint xsi:type="dc:Point" x="80" y="1114" />
+        <di:waypoint xsi:type="dc:Point" x="123" y="1114" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="800" y="775" width="12" height="12" />
+          <dc:Bounds x="1260" y="770.0957837465772" width="12" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_123vjyo_di" bpmnElement="ExclusiveGateway_123vjyo" isMarkerVisible="true">
-        <dc:Bounds x="955" y="775" width="50" height="50" />
+        <dc:Bounds x="252" y="1089" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="946" y="735" width="68" height="24" />
+          <dc:Bounds x="243" y="1049" width="68" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1nr9o85_di" bpmnElement="SequenceFlow_1nr9o85">
-        <di:waypoint xsi:type="dc:Point" x="1005" y="800" />
-        <di:waypoint xsi:type="dc:Point" x="1037" y="800" />
-        <di:waypoint xsi:type="dc:Point" x="1037" y="800" />
-        <di:waypoint xsi:type="dc:Point" x="1058" y="800" />
+        <di:waypoint xsi:type="dc:Point" x="302" y="1114" />
+        <di:waypoint xsi:type="dc:Point" x="334" y="1114" />
+        <di:waypoint xsi:type="dc:Point" x="334" y="1114" />
+        <di:waypoint xsi:type="dc:Point" x="355" y="1114" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1024" y="772" width="12" height="12" />
+          <dc:Bounds x="321" y="1086" width="12" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_11ot6vh_di" bpmnElement="IntermediateThrowEvent_1nij04n">
-        <dc:Bounds x="273" y="886" width="36" height="36" />
+        <dc:Bounds x="733" y="871" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="256" y="921.6089999999999" width="69" height="24" />
+          <dc:Bounds x="716" y="907" width="69" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1gagrha_di" bpmnElement="SequenceFlow_1gagrha">
-        <di:waypoint xsi:type="dc:Point" x="291" y="825" />
-        <di:waypoint xsi:type="dc:Point" x="291" y="886" />
+        <di:waypoint xsi:type="dc:Point" x="751" y="825" />
+        <di:waypoint xsi:type="dc:Point" x="751" y="871" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="297" y="845.5" width="18" height="12" />
+          <dc:Bounds x="757" y="839.1147540983607" width="18" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_16igl7b_di" bpmnElement="SequenceFlow_16igl7b">
-        <di:waypoint xsi:type="dc:Point" x="414" y="886" />
-        <di:waypoint xsi:type="dc:Point" x="414" y="840" />
+        <di:waypoint xsi:type="dc:Point" x="874" y="871" />
+        <di:waypoint xsi:type="dc:Point" x="874" y="840" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="429" y="863" width="0" height="0" />
+          <dc:Bounds x="889" y="855.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="IntermediateCatchEvent_174wgan_di" bpmnElement="IntermediateThrowEvent_0fhmhsk">
-        <dc:Bounds x="396" y="886" width="36" height="36" />
+        <dc:Bounds x="856" y="871" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="384" y="922" width="59" height="24" />
+          <dc:Bounds x="844" y="907" width="60" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1urpp94_di" bpmnElement="SequenceFlow_1urpp94">
-        <di:waypoint xsi:type="dc:Point" x="538" y="825" />
-        <di:waypoint xsi:type="dc:Point" x="538" y="886" />
+        <di:waypoint xsi:type="dc:Point" x="998" y="825" />
+        <di:waypoint xsi:type="dc:Point" x="998" y="871" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="544" y="855.5" width="18" height="12" />
+          <dc:Bounds x="1004" y="846.4451837791199" width="18" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_1vi3wf9_di" bpmnElement="IntermediateThrowEvent_0vf0a28">
-        <dc:Bounds x="520" y="886" width="36" height="36" />
+        <dc:Bounds x="980" y="871" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="503" y="922" width="69" height="24" />
+          <dc:Bounds x="963" y="907" width="69" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1c2xyhk_di" bpmnElement="SequenceFlow_1c2xyhk">
-        <di:waypoint xsi:type="dc:Point" x="563" y="800" />
-        <di:waypoint xsi:type="dc:Point" x="601" y="800" />
+        <di:waypoint xsi:type="dc:Point" x="1023" y="800" />
+        <di:waypoint xsi:type="dc:Point" x="1061" y="800" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="577" y="775" width="12" height="12" />
+          <dc:Bounds x="1037" y="775" width="12" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="IntermediateCatchEvent_165ve6q_di" bpmnElement="IntermediateThrowEvent_0pxvl24">
-        <dc:Bounds x="632" y="886" width="36" height="36" />
+        <dc:Bounds x="1093" y="871" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="607" y="922" width="85" height="13" />
+          <dc:Bounds x="1066" y="907" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0yja56j_di" bpmnElement="SequenceFlow_0yja56j">
-        <di:waypoint xsi:type="dc:Point" x="650" y="886" />
-        <di:waypoint xsi:type="dc:Point" x="651" y="840" />
+        <di:waypoint xsi:type="dc:Point" x="1111" y="871" />
+        <di:waypoint xsi:type="dc:Point" x="1112" y="840" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="651" y="848" width="0" height="0" />
+          <dc:Bounds x="1112" y="840.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1xg6pwh_di" bpmnElement="SequenceFlow_1xg6pwh">
-        <di:waypoint xsi:type="dc:Point" x="760" y="825" />
-        <di:waypoint xsi:type="dc:Point" x="760" y="886" />
+        <di:waypoint xsi:type="dc:Point" x="1220" y="825" />
+        <di:waypoint xsi:type="dc:Point" x="1220" y="871" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="766" y="855.5" width="18" height="12" />
+          <dc:Bounds x="1226" y="846.655737704918" width="18" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_0unfhc9_di" bpmnElement="IntermediateThrowEvent_1vjqksl">
-        <dc:Bounds x="742" y="886" width="36" height="36" />
+        <dc:Bounds x="1202" y="871" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="725" y="922" width="69" height="24" />
+          <dc:Bounds x="1185" y="907" width="69" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="IntermediateCatchEvent_1om2udh_di" bpmnElement="IntermediateThrowEvent_1vwqesb">
-        <dc:Bounds x="859" y="886" width="36" height="36" />
+        <dc:Bounds x="156" y="1200" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="842" y="922" width="70" height="13" />
+          <dc:Bounds x="137" y="1236" width="74" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1hwtq9x_di" bpmnElement="SequenceFlow_1hwtq9x">
-        <di:waypoint xsi:type="dc:Point" x="877" y="886" />
-        <di:waypoint xsi:type="dc:Point" x="876" y="840" />
+        <di:waypoint xsi:type="dc:Point" x="174" y="1200" />
+        <di:waypoint xsi:type="dc:Point" x="173" y="1154" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="877" y="848" width="0" height="0" />
+          <dc:Bounds x="174" y="1162" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0ttowkv_di" bpmnElement="SequenceFlow_0ttowkv">
-        <di:waypoint xsi:type="dc:Point" x="980" y="825" />
-        <di:waypoint xsi:type="dc:Point" x="980" y="886" />
+        <di:waypoint xsi:type="dc:Point" x="277" y="1139" />
+        <di:waypoint xsi:type="dc:Point" x="277" y="1200" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="986" y="855.5" width="18" height="12" />
+          <dc:Bounds x="283" y="1170" width="18" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_1u04oef_di" bpmnElement="IntermediateThrowEvent_0m9jtv2">
-        <dc:Bounds x="962" y="886" width="36" height="36" />
+        <dc:Bounds x="259" y="1200" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="945" y="922" width="69" height="24" />
+          <dc:Bounds x="242" y="1236" width="69" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="IntermediateCatchEvent_1bsxf5o_di" bpmnElement="IntermediateThrowEvent_0pk24h2">
-        <dc:Bounds x="155" y="886" width="36" height="36" />
+        <dc:Bounds x="615" y="871" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="143" y="922" width="59" height="25" />
+          <dc:Bounds x="603" y="907" width="60" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1colra4_di" bpmnElement="SequenceFlow_1colra4">
-        <di:waypoint xsi:type="dc:Point" x="173" y="886" />
-        <di:waypoint xsi:type="dc:Point" x="173" y="863" />
-        <di:waypoint xsi:type="dc:Point" x="173" y="863" />
-        <di:waypoint xsi:type="dc:Point" x="173" y="840" />
+        <di:waypoint xsi:type="dc:Point" x="633" y="871" />
+        <di:waypoint xsi:type="dc:Point" x="633" y="840" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="188" y="863" width="0" height="0" />
+          <dc:Bounds x="648" y="855.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_18j1ow5_di" bpmnElement="ExclusiveGateway_18j1ow5" isMarkerVisible="true">
-        <dc:Bounds x="1409.304" y="775" width="50" height="50" />
+        <dc:Bounds x="706" y="1089" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1396" y="724" width="75" height="36" />
+          <dc:Bounds x="693" y="1038" width="75" height="36" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0u6ho2p_di" bpmnElement="SequenceFlow_0u6ho2p">
-        <di:waypoint xsi:type="dc:Point" x="1245" y="800" />
-        <di:waypoint xsi:type="dc:Point" x="1275" y="800" />
+        <di:waypoint xsi:type="dc:Point" x="542" y="1114" />
+        <di:waypoint xsi:type="dc:Point" x="572" y="1114" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1255" y="775" width="12" height="12" />
+          <dc:Bounds x="552" y="1089" width="12" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_08r89q9_di" bpmnElement="Task_0y1h8go">
-        <dc:Bounds x="1275" y="760" width="100" height="80" />
+        <dc:Bounds x="572" y="1074" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1tzax6l_di" bpmnElement="SequenceFlow_1tzax6l">
-        <di:waypoint xsi:type="dc:Point" x="1375" y="800" />
-        <di:waypoint xsi:type="dc:Point" x="1409" y="800" />
+        <di:waypoint xsi:type="dc:Point" x="672" y="1114" />
+        <di:waypoint xsi:type="dc:Point" x="706" y="1114" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1392" y="775" width="0" height="0" />
+          <dc:Bounds x="689" y="1089" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="IntermediateCatchEvent_06j33fe_di" bpmnElement="IntermediateThrowEvent_0pmevcz">
-        <dc:Bounds x="1090" y="886" width="36" height="36" />
+        <dc:Bounds x="387" y="1200" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1072" y="922" width="72" height="25" />
+          <dc:Bounds x="370" y="1236" width="70" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_16ff86u_di" bpmnElement="SequenceFlow_16ff86u">
-        <di:waypoint xsi:type="dc:Point" x="1108" y="886" />
-        <di:waypoint xsi:type="dc:Point" x="1108" y="840" />
+        <di:waypoint xsi:type="dc:Point" x="405" y="1200" />
+        <di:waypoint xsi:type="dc:Point" x="405" y="1154" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1123" y="853" width="0" height="0" />
+          <dc:Bounds x="420" y="1167" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0k3zxpd_di" bpmnElement="SequenceFlow_0k3zxpd">
-        <di:waypoint xsi:type="dc:Point" x="1220" y="825" />
-        <di:waypoint xsi:type="dc:Point" x="1220" y="886" />
+        <di:waypoint xsi:type="dc:Point" x="517" y="1139" />
+        <di:waypoint xsi:type="dc:Point" x="517" y="1200" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1226" y="855.5" width="18" height="12" />
+          <dc:Bounds x="523" y="1170" width="18" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_105mp22_di" bpmnElement="IntermediateThrowEvent_1awckg7">
-        <dc:Bounds x="1202" y="886" width="36" height="36" />
+        <dc:Bounds x="499" y="1200" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1185" y="922" width="69" height="24" />
+          <dc:Bounds x="482" y="1236" width="69" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="IntermediateCatchEvent_0kglv4e_di" bpmnElement="IntermediateThrowEvent_1b3smly">
-        <dc:Bounds x="1307" y="886" width="36" height="36" />
+        <dc:Bounds x="604" y="1200" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1285" y="922" width="79" height="25" />
+          <dc:Bounds x="581" y="1236" width="82" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_09xxorv_di" bpmnElement="SequenceFlow_09xxorv">
-        <di:waypoint xsi:type="dc:Point" x="1325" y="886" />
-        <di:waypoint xsi:type="dc:Point" x="1325" y="840" />
+        <di:waypoint xsi:type="dc:Point" x="622" y="1200" />
+        <di:waypoint xsi:type="dc:Point" x="622" y="1154" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1340" y="853" width="0" height="0" />
+          <dc:Bounds x="637" y="1167" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0w8mkkn_di" bpmnElement="SequenceFlow_0w8mkkn">
-        <di:waypoint xsi:type="dc:Point" x="1434" y="825" />
-        <di:waypoint xsi:type="dc:Point" x="1434" y="886" />
+        <di:waypoint xsi:type="dc:Point" x="731" y="1139" />
+        <di:waypoint xsi:type="dc:Point" x="731" y="1200" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1440" y="855.5" width="18" height="12" />
+          <dc:Bounds x="737" y="1170" width="18" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_0jwgx1d_di" bpmnElement="IntermediateThrowEvent_1cw8gsw">
-        <dc:Bounds x="1416" y="886" width="36" height="36" />
+        <dc:Bounds x="713" y="1200" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1399" y="922" width="69" height="24" />
+          <dc:Bounds x="696" y="1236" width="69" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="IntermediateCatchEvent_0zw87jy_di" bpmnElement="IntermediateThrowEvent_0x846wp">
-        <dc:Bounds x="158" y="1186" width="36" height="36" />
+        <dc:Bounds x="837" y="1200" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="140" y="1221.609" width="72" height="25" />
+          <dc:Bounds x="819" y="1236" width="72" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_07uuj2d_di" bpmnElement="SequenceFlow_07uuj2d">
-        <di:waypoint xsi:type="dc:Point" x="176" y="1186" />
-        <di:waypoint xsi:type="dc:Point" x="176" y="1160" />
-        <di:waypoint xsi:type="dc:Point" x="176" y="1160" />
-        <di:waypoint xsi:type="dc:Point" x="176" y="1131" />
+        <di:waypoint xsi:type="dc:Point" x="855" y="1200" />
+        <di:waypoint xsi:type="dc:Point" x="855" y="1154" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="191" y="1160" width="0" height="0" />
+          <dc:Bounds x="870" y="1177" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0ueoglv_di" bpmnElement="SequenceFlow_0ueoglv">
         <di:waypoint xsi:type="dc:Point" x="2117" y="490" />
-        <di:waypoint xsi:type="dc:Point" x="2173" y="264" />
+        <di:waypoint xsi:type="dc:Point" x="2168" y="266" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2145" y="362" width="0" height="0" />
+          <dc:Bounds x="2143" y="363" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_15fqlwe_di" bpmnElement="SequenceFlow_15fqlwe">
-        <di:waypoint xsi:type="dc:Point" x="2120" y="493" />
-        <di:waypoint xsi:type="dc:Point" x="2209" y="290" />
+        <di:waypoint xsi:type="dc:Point" x="2119" y="492" />
+        <di:waypoint xsi:type="dc:Point" x="2194" y="302" />
+        <di:waypoint xsi:type="dc:Point" x="2201" y="283" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2165" y="377" width="0" height="0" />
+          <dc:Bounds x="2157" y="382" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0yuj0l5_di" bpmnElement="SequenceFlow_0yuj0l5">
-        <di:waypoint xsi:type="dc:Point" x="2122" y="495" />
-        <di:waypoint xsi:type="dc:Point" x="2247" y="319" />
+        <di:waypoint xsi:type="dc:Point" x="2121" y="494" />
+        <di:waypoint xsi:type="dc:Point" x="2234" y="304" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2185" y="392" width="0" height="0" />
+          <dc:Bounds x="2178" y="384" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1abb030_di" bpmnElement="SequenceFlow_1abb030">
-        <di:waypoint xsi:type="dc:Point" x="2125" y="498" />
-        <di:waypoint xsi:type="dc:Point" x="2284" y="348" />
+        <di:waypoint xsi:type="dc:Point" x="2123" y="496" />
+        <di:waypoint xsi:type="dc:Point" x="2268" y="329" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2205" y="408" width="0" height="0" />
+          <dc:Bounds x="2196" y="397.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0ls3ej5_di" bpmnElement="SequenceFlow_0ls3ej5">
-        <di:waypoint xsi:type="dc:Point" x="2127" y="500" />
-        <di:waypoint xsi:type="dc:Point" x="2313" y="386" />
+        <di:waypoint xsi:type="dc:Point" x="2125" y="498" />
+        <di:waypoint xsi:type="dc:Point" x="2293" y="363" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2220" y="428" width="0" height="0" />
+          <dc:Bounds x="2209" y="415.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1ar6ikk_di" bpmnElement="SequenceFlow_1ar6ikk">
         <di:waypoint xsi:type="dc:Point" x="2133" y="506" />
-        <di:waypoint xsi:type="dc:Point" x="2372" y="460" />
+        <di:waypoint xsi:type="dc:Point" x="2372" y="462" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2253" y="468" width="0" height="0" />
+          <dc:Bounds x="2253" y="469" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_171iq7e_di" bpmnElement="SequenceFlow_171iq7e">
-        <di:waypoint xsi:type="dc:Point" x="2134" y="513" />
-        <di:waypoint xsi:type="dc:Point" x="2372" y="553" />
+        <di:waypoint xsi:type="dc:Point" x="2132" y="515" />
+        <di:waypoint xsi:type="dc:Point" x="2363" y="585" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2253" y="518" width="0" height="0" />
+          <dc:Bounds x="2248" y="535" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1553o9f_di" bpmnElement="SequenceFlow_1553o9f">
-        <di:waypoint xsi:type="dc:Point" x="2129" y="518" />
-        <di:waypoint xsi:type="dc:Point" x="2353" y="595" />
+        <di:waypoint xsi:type="dc:Point" x="2128" y="519" />
+        <di:waypoint xsi:type="dc:Point" x="2335" y="623" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2241" y="541.5" width="0" height="0" />
+          <dc:Bounds x="2232" y="556" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0dmxwel_di" bpmnElement="SequenceFlow_0dmxwel">
-        <di:waypoint xsi:type="dc:Point" x="2125" y="522" />
-        <di:waypoint xsi:type="dc:Point" x="2294" y="685" />
+        <di:waypoint xsi:type="dc:Point" x="2124" y="523" />
+        <di:waypoint xsi:type="dc:Point" x="2281" y="692" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2210" y="588.5" width="0" height="0" />
+          <dc:Bounds x="2203" y="592.5" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1id2p8y_di" bpmnElement="SequenceFlow_1id2p8y">
@@ -2020,52 +2104,52 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_17syve1_di" bpmnElement="IntermediateThrowEvent_0rz6jh4">
-        <dc:Bounds x="2159" y="229" width="36" height="36" />
+        <dc:Bounds x="2150" y="230" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2165" y="189" width="84" height="36" />
+          <dc:Bounds x="2156" y="190" width="84" height="36" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_0nv8aic_di" bpmnElement="IntermediateThrowEvent_1wip9vc">
-        <dc:Bounds x="2199" y="256" width="36" height="36" />
+        <dc:Bounds x="2189" y="249" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2213" y="235" width="89" height="24" />
+          <dc:Bounds x="2203" y="228" width="89" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_1g4pmwc_di" bpmnElement="IntermediateThrowEvent_1hki8xj">
-        <dc:Bounds x="2240" y="287" width="36" height="36" />
+        <dc:Bounds x="2227" y="273" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2280" y="256" width="64" height="36" />
+          <dc:Bounds x="2267" y="242" width="64" height="36" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_1ypnogn_di" bpmnElement="IntermediateThrowEvent_1gfnt9b">
-        <dc:Bounds x="2279" y="319" width="36" height="36" />
+        <dc:Bounds x="2263" y="299" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2325" y="305" width="71" height="24" />
+          <dc:Bounds x="2309" y="285" width="71" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_1i9ttzs_di" bpmnElement="IntermediateThrowEvent_1gzhs1a">
-        <dc:Bounds x="2311" y="359" width="36" height="36" />
+        <dc:Bounds x="2289" y="334" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2357" y="356" width="64" height="12" />
+          <dc:Bounds x="2335" y="331" width="64" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_0840e02_di" bpmnElement="IntermediateThrowEvent_0385ons">
-        <dc:Bounds x="2343" y="392" width="36" height="36" />
+        <dc:Bounds x="2324" y="362" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2393" y="383" width="60" height="24" />
+          <dc:Bounds x="2374" y="353" width="60" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1quapjx_di" bpmnElement="SequenceFlow_1quapjx">
-        <di:waypoint xsi:type="dc:Point" x="2130" y="503" />
-        <di:waypoint xsi:type="dc:Point" x="2345" y="416" />
+        <di:waypoint xsi:type="dc:Point" x="2128" y="501" />
+        <di:waypoint xsi:type="dc:Point" x="2326" y="389" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2239" y="445" width="0" height="0" />
+          <dc:Bounds x="2227" y="430" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_1xq4kx8_di" bpmnElement="IntermediateThrowEvent_1p9i2bi">
-        <dc:Bounds x="2371" y="439" width="36" height="36" />
+        <dc:Bounds x="2371" y="441" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2412" y="440" width="90" height="12" />
+          <dc:Bounds x="2419" y="444" width="62" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_03b4y60_di" bpmnElement="IntermediateThrowEvent_0ee7wot">
@@ -2075,21 +2159,21 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_1ghdnpx_di" bpmnElement="IntermediateThrowEvent_0rp1ax0">
-        <dc:Bounds x="2371" y="538" width="36" height="36" />
+        <dc:Bounds x="2362" y="572" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2424" y="544" width="60" height="24" />
+          <dc:Bounds x="2415" y="578" width="60" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_1nls1oo_di" bpmnElement="IntermediateThrowEvent_01ngkx2">
-        <dc:Bounds x="2352" y="582" width="36" height="36" />
+        <dc:Bounds x="2333" y="612" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2401" y="587" width="60" height="24" />
+          <dc:Bounds x="2382" y="617" width="60" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_0qt249a_di" bpmnElement="IntermediateThrowEvent_0lbd0cs">
-        <dc:Bounds x="2289" y="679" width="36" height="36" />
+        <dc:Bounds x="2276" y="686" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2337" y="706" width="90" height="12" />
+          <dc:Bounds x="2324" y="713" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_0frwxx8_di" bpmnElement="IntermediateThrowEvent_1ycbds3">
@@ -2156,31 +2240,31 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="CallActivity_1y81g09_di" bpmnElement="Task_0eae8go">
-        <dc:Bounds x="826" y="470" width="100" height="80" />
+        <dc:Bounds x="1060" y="470" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_0n20gvh_di" bpmnElement="Task_1dtbnuy">
         <dc:Bounds x="126" y="470" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_08wyi5l_di" bpmnElement="Task_1sove95">
-        <dc:Bounds x="826" y="760" width="100" height="80" />
+        <dc:Bounds x="123" y="1074" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_1a5n5ff_di" bpmnElement="Task_1fj63ov">
         <dc:Bounds x="364" y="470" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_0mp082m_di" bpmnElement="Task_1ca5ctq">
-        <dc:Bounds x="364" y="760" width="100" height="80" />
+        <dc:Bounds x="824" y="760" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_07dp1m8_di" bpmnElement="IntermediateThrowEvent_1kbtw2p">
-        <dc:Bounds x="2324" y="634" width="36" height="36" />
+        <dc:Bounds x="2303" y="648" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2345" y="668" width="60" height="24" />
+          <dc:Bounds x="2324" y="682" width="60" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_021ah63_di" bpmnElement="SequenceFlow_021ah63">
-        <di:waypoint xsi:type="dc:Point" x="2127" y="520" />
-        <di:waypoint xsi:type="dc:Point" x="2327" y="643" />
+        <di:waypoint xsi:type="dc:Point" x="2126" y="521" />
+        <di:waypoint xsi:type="dc:Point" x="2307" y="655" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2227" y="566.5" width="0" height="0" />
+          <dc:Bounds x="2217" y="573" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_1qr054i_di" bpmnElement="ScriptTask_1qr054i">
@@ -2253,13 +2337,13 @@
         <dc:Bounds x="600" y="470" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_1kw9f96_di" bpmnElement="Task_1mdr1nd">
-        <dc:Bounds x="1064" y="470" width="100" height="80" />
+        <dc:Bounds x="364" y="760" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_0d1uai9_di" bpmnElement="Task_1hdg951">
-        <dc:Bounds x="123" y="760" width="100" height="80" />
+        <dc:Bounds x="583" y="760" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_1onqhy5_di" bpmnElement="Task_0h2nq31">
-        <dc:Bounds x="601" y="760" width="100" height="80" />
+        <dc:Bounds x="1061" y="760" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_1slvyx2_di" bpmnElement="ExclusiveGateway_1slvyx2" isMarkerVisible="true">
         <dc:Bounds x="266" y="485" width="50" height="50" />
@@ -2297,6 +2381,147 @@
       <bpmndi:BPMNShape id="ScriptTask_032b6ij_di" bpmnElement="Task_1mt62gu">
         <dc:Bounds x="491" y="1446" width="100" height="80" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_10yw9oj_di" bpmnElement="SequenceFlow_10yw9oj">
+        <di:waypoint xsi:type="dc:Point" x="1006" y="510" />
+        <di:waypoint xsi:type="dc:Point" x="1060" y="510" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1033" y="495" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="IntermediateCatchEvent_0mnk8wv_di" bpmnElement="IntermediateThrowEvent_10hdz40">
+        <dc:Bounds x="856" y="581" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="843" y="617" width="62" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_02zphll_di" bpmnElement="SequenceFlow_02zphll">
+        <di:waypoint xsi:type="dc:Point" x="874" y="581" />
+        <di:waypoint xsi:type="dc:Point" x="874" y="550" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="889" y="565.5" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ExclusiveGateway_0bd79on_di" bpmnElement="ExclusiveGateway_0bd79on" isMarkerVisible="true">
+        <dc:Bounds x="955" y="485" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="946" y="447" width="68" height="24" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0ayfzd3_di" bpmnElement="SequenceFlow_0ayfzd3">
+        <di:waypoint xsi:type="dc:Point" x="924" y="510" />
+        <di:waypoint xsi:type="dc:Point" x="955" y="510" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="940" y="495" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="IntermediateThrowEvent_112p1kw_di" bpmnElement="IntermediateThrowEvent_0u4t4eb">
+        <dc:Bounds x="962" y="581" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="945" y="617" width="69" height="24" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1qdt3ml_di" bpmnElement="SequenceFlow_1qdt3ml">
+        <di:waypoint xsi:type="dc:Point" x="980" y="535" />
+        <di:waypoint xsi:type="dc:Point" x="980" y="581" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="986" y="548" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="CallActivity_04cfhj4_di" bpmnElement="Task_0qa3yfr">
+        <dc:Bounds x="824" y="470" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_015qhj5_di" bpmnElement="SequenceFlow_015qhj5">
+        <di:waypoint xsi:type="dc:Point" x="2130" y="503" />
+        <di:waypoint xsi:type="dc:Point" x="2354" y="422" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="2242" y="447.5" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="IntermediateThrowEvent_1leefua_di" bpmnElement="IntermediateThrowEvent_0utxo48">
+        <dc:Bounds x="2352" y="398" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="2398" y="400.907" width="90" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1xeh8rb_di" bpmnElement="SequenceFlow_1xeh8rb">
+        <di:waypoint xsi:type="dc:Point" x="2134" y="513" />
+        <di:waypoint xsi:type="dc:Point" x="2386" y="551" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="2260" y="517" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="IntermediateThrowEvent_05jik84_di" bpmnElement="IntermediateThrowEvent_034letx">
+        <dc:Bounds x="2385" y="536" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="2431" y="547.9069999999999" width="63" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1c2q423_di" bpmnElement="SequenceFlow_1c2q423">
+        <di:waypoint xsi:type="dc:Point" x="224" y="800" />
+        <di:waypoint xsi:type="dc:Point" x="266" y="800" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="245" y="785" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ExclusiveGateway_1aepvyq_di" bpmnElement="ExclusiveGateway_1aepvyq" isMarkerVisible="true">
+        <dc:Bounds x="266" y="775" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="256" y="733" width="69" height="24" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0ugaydb_di" bpmnElement="SequenceFlow_0ugaydb">
+        <di:waypoint xsi:type="dc:Point" x="316" y="800" />
+        <di:waypoint xsi:type="dc:Point" x="364" y="800" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="334" y="775" width="12" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_12k801c_di" bpmnElement="SequenceFlow_12k801c">
+        <di:waypoint xsi:type="dc:Point" x="174" y="871" />
+        <di:waypoint xsi:type="dc:Point" x="174" y="840" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="189" y="855.5" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_1ouddzv_di" bpmnElement="SequenceFlow_1ouddzv">
+        <di:waypoint xsi:type="dc:Point" x="291" y="825" />
+        <di:waypoint xsi:type="dc:Point" x="291" y="871" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="298" y="842" width="18" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="IntermediateCatchEvent_01iotuk_di" bpmnElement="IntermediateThrowEvent_01xb76a">
+        <dc:Bounds x="156" y="871" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="142" y="907" width="63" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="IntermediateThrowEvent_05f5orq_di" bpmnElement="IntermediateThrowEvent_0d6k86e">
+        <dc:Bounds x="273" y="871" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="256" y="907" width="69" height="24" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="CallActivity_1acjd9q_di" bpmnElement="Task_1j68pc1">
+        <dc:Bounds x="124" y="760" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="ScriptTask_19sq3od_di" bpmnElement="Task_0n1d5f2">
+        <dc:Bounds x="1046" y="197" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1us5byg_di" bpmnElement="SequenceFlow_1us5byg">
+        <di:waypoint xsi:type="dc:Point" x="850" y="90" />
+        <di:waypoint xsi:type="dc:Point" x="982" y="90" />
+        <di:waypoint xsi:type="dc:Point" x="982" y="156" />
+        <di:waypoint xsi:type="dc:Point" x="103" y="156" />
+        <di:waypoint xsi:type="dc:Point" x="103" y="237" />
+        <di:waypoint xsi:type="dc:Point" x="131" y="237" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="543" y="141" width="0" height="0" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ServiceTask_1jatgi1_di" bpmnElement="Task_0op98k0">
+        <dc:Bounds x="750" y="50" width="100" height="80" />
+      </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn2:definitions>
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/CloudSiteCatalogUtils.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/CloudSiteCatalogUtils.java
new file mode 100644
index 0000000..bba883e
--- /dev/null
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/CloudSiteCatalogUtils.java
@@ -0,0 +1,76 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.so.bpmn.infrastructure.flowspecific.tasks;
+
+import java.util.Optional;
+
+import org.camunda.bpm.engine.delegate.DelegateExecution;
+import org.onap.so.client.exception.ExceptionBuilder;
+import org.onap.so.db.catalog.client.CatalogDbClient;
+import org.onap.so.db.catalog.beans.CloudSite;
+import org.onap.so.logger.MsoLogger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CloudSiteCatalogUtils {
+
+	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL, CloudSiteCatalogUtils.class);
+	@Autowired
+	private ExceptionBuilder exceptionUtil;
+	
+	@Autowired
+	private CatalogDbClient catalogDbClient;
+	
+	
+	public void getIdentityUrlFromCloudSite(DelegateExecution execution) {
+		String cloudRegionId = (String) execution.getVariable("lcpCloudRegionId");
+	
+		if (cloudRegionId != null) {
+			Optional<CloudSite> cloudSite = getCloudSite(cloudRegionId);
+			if (!cloudSite.isPresent()) {
+				msoLogger.debug("Cloud Region with cloudRegionId " + cloudRegionId + " not found in Catalog DB");
+				exceptionUtil.buildAndThrowWorkflowException(execution, 404, "Cloud Region with cloudRegionId " + cloudRegionId + " not found in Catalog DB");
+			}
+			
+			if (cloudSite.get().getIdentityService() == null)	 {
+				msoLogger.debug("No identityService found for Cloud Region with cloudRegionId " + cloudRegionId + " in Catalog DB");
+				exceptionUtil.buildAndThrowWorkflowException(execution, 404, "No identityService found for Cloud Region with cloudRegionId " + cloudRegionId + " in Catalog DB");
+			}			
+			String identityUrl = cloudSite.get().getIdentityService().getIdentityUrl();
+			
+			msoLogger.debug("identityUrl from Catalog DB is: " + identityUrl);
+			execution.setVariable("identityUrl", identityUrl);
+		}
+	}
+	
+	protected Optional<CloudSite> getCloudSite(String id) {
+		if (id == null) {
+			return Optional.empty();
+		}
+		CloudSite cloudSite = catalogDbClient.getCloudSite(id);
+
+		if (cloudSite != null) {
+			return Optional.of(cloudSite);
+		} else {
+			return(Optional.of(catalogDbClient.getCloudSiteByClliAndAicVersion(id,"2.5")));			
+		}
+	}
+}
\ No newline at end of file
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/CloudSiteCatalogUtilsTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/CloudSiteCatalogUtilsTest.java
new file mode 100644
index 0000000..125c971
--- /dev/null
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/CloudSiteCatalogUtilsTest.java
@@ -0,0 +1,88 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.so.bpmn.infrastructure.flowspecific.tasks;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.doReturn;
+import java.util.Optional;
+import org.junit.Test;
+import org.mockito.InjectMocks;
+import org.onap.so.bpmn.BaseTaskTest;
+
+import org.onap.so.db.catalog.beans.CloudIdentity;
+import org.onap.so.db.catalog.beans.CloudSite;
+
+public class CloudSiteCatalogUtilsTest extends BaseTaskTest {
+	
+	@InjectMocks
+	private CloudSiteCatalogUtils cloudSiteCatalogUtils = new CloudSiteCatalogUtils();
+	
+	@Test
+	public void testGetCloudSiteGetVersion30Test() throws Exception {
+		CloudSite cloudSite = new CloudSite();
+		String testCloudSiteId = "testCloudSiteId";		
+		cloudSite.setClli(testCloudSiteId);				
+		doReturn(cloudSite).when(catalogDbClient).getCloudSite(testCloudSiteId);		
+		Optional<CloudSite> actualCloudSite = cloudSiteCatalogUtils.getCloudSite(testCloudSiteId);		
+		assertEquals(actualCloudSite.get().getClli(), testCloudSiteId);		
+	}
+	
+	@Test
+	public void testGetCloudSiteGetVersion25Test() throws Exception {
+		CloudSite cloudSite = new CloudSite();
+		String testCloudSiteId = "testCloudSiteId";		
+		cloudSite.setClli(testCloudSiteId);
+		doReturn(null).when(catalogDbClient).getCloudSite(testCloudSiteId);
+		doReturn(cloudSite).when(catalogDbClient).getCloudSiteByClliAndAicVersion(testCloudSiteId, "2.5");		
+		Optional<CloudSite> actualCloudSite = cloudSiteCatalogUtils.getCloudSite(testCloudSiteId);		
+		assertEquals(actualCloudSite.get().getClli(), testCloudSiteId);		
+	}
+	
+	@Test
+	public void testGetIdentityUrlFromCloudSiteSuccessTest() throws Exception {		
+		CloudSite cloudSite = new CloudSite();
+		String testCloudSiteId = "testCloudSiteId";
+		String testIdentityUrl = "testIdentityUrl";
+		delegateExecution.setVariable("lcpCloudRegionId", testCloudSiteId);
+		cloudSite.setClli(testCloudSiteId);
+		CloudIdentity cloudIdentity = new CloudIdentity();
+		cloudIdentity.setIdentityUrl(testIdentityUrl);
+		cloudSite.setIdentityService(cloudIdentity);
+		doReturn(cloudSite).when(catalogDbClient).getCloudSite(testCloudSiteId);		
+		cloudSiteCatalogUtils.getIdentityUrlFromCloudSite(delegateExecution);
+		String actualIdentityUrl = (String) delegateExecution.getVariable("identityUrl");
+		assertEquals(testIdentityUrl, actualIdentityUrl);		
+	}
+	
+	@Test
+	public void testGetIdentityUrlFromCloudSiteNoCloudIdProvidedTest() throws Exception {		
+		CloudSite cloudSite = new CloudSite();
+		String testCloudSiteId = "testCloudSiteId";
+		String testIdentityUrl = "testIdentityUrl";		
+		cloudSite.setClli(testCloudSiteId);
+		CloudIdentity cloudIdentity = new CloudIdentity();
+		cloudIdentity.setIdentityUrl(testIdentityUrl);
+		cloudSite.setIdentityService(cloudIdentity);
+		doReturn(cloudSite).when(catalogDbClient).getCloudSite(testCloudSiteId);		
+		cloudSiteCatalogUtils.getIdentityUrlFromCloudSite(delegateExecution);
+		String actualIdentityUrl = (String) delegateExecution.getVariable("identityUrl");
+		assertEquals(null, actualIdentityUrl);		
+	}
+}