diff --git a/execute-procure-to-pay/cc-invoice-approval-process/Submit-the-invoice_JSONSchema.json b/execute-procure-to-pay/cc-invoice-approval-process/Submit-the-invoice_JSONSchema.json
index 2dcc726a..a612d6f5 100644
--- a/execute-procure-to-pay/cc-invoice-approval-process/Submit-the-invoice_JSONSchema.json
+++ b/execute-procure-to-pay/cc-invoice-approval-process/Submit-the-invoice_JSONSchema.json
@@ -5,9 +5,9 @@
   "required": [
     "contributorName",
     "contributorId",
-	"invoiceId",
-	"invoiceAmount",
-	"dueDate"
+  	"invoiceId",
+  	"invoiceAmount",
+  	"dueDate"
   ],
   "properties": {
     "contributorName": {
diff --git a/execute-procure-to-pay/cc-invoice-approval-process/cc-invoice-approval-process-v2.bpmn b/execute-procure-to-pay/cc-invoice-approval-process/cc-invoice-approval-process-v2.bpmn
index bc890403..107f392f 100644
--- a/execute-procure-to-pay/cc-invoice-approval-process/cc-invoice-approval-process-v2.bpmn
+++ b/execute-procure-to-pay/cc-invoice-approval-process/cc-invoice-approval-process-v2.bpmn
@@ -57,7 +57,6 @@
         <bpmn:flowNodeRef>Event_1egoehb</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_02lq9lo</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_1lgiv0q</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Event_0gxn1v4</bpmn:flowNodeRef>
       </bpmn:lane>
       <bpmn:lane id="Lane_1so23vf" name="Finance Team">
         <bpmn:flowNodeRef>Activity_0cdgqi0</bpmn:flowNodeRef>
@@ -79,7 +78,7 @@
           <spiffworkflow:property name="formUiSchemaFilename" value="Submit-the-invoice_UISchema.json" />
         </spiffworkflow:properties>
         <spiffworkflow:postScript>invoice = {
-	"contributorName":contributorName
+	"contributorName":contributorName,
 	"contributorId":contributorId,
 	"invoiceId":invoiceId,
 	"invoiceAmount":invoiceAmount,
@@ -88,6 +87,9 @@
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_11b24we</bpmn:incoming>
       <bpmn:outgoing>Flow_02moyg7</bpmn:outgoing>
+      <bpmn:dataOutputAssociation id="DataOutputAssociation_1myrn23">
+        <bpmn:targetRef>DataObjectReference_Invoice</bpmn:targetRef>
+      </bpmn:dataOutputAssociation>
     </bpmn:userTask>
     <bpmn:sequenceFlow id="Flow_11b24we" sourceRef="Gateway_16gxu6s" targetRef="Submit_the_invoice" />
     <bpmn:sequenceFlow id="Flow_1ex5hfx" sourceRef="Event_15y55nw" targetRef="Activity_0gkejaj" />
@@ -113,7 +115,7 @@
     <bpmn:sequenceFlow id="Flow_18cic3h" sourceRef="Activity_02lq9lo" targetRef="Gateway_16gxu6s" />
     <bpmn:exclusiveGateway id="Gateway_16gxu6s">
       <bpmn:incoming>Flow_18cic3h</bpmn:incoming>
-      <bpmn:incoming>Flow_1m70ywr</bpmn:incoming>
+      <bpmn:incoming>Flow_12bfyqx</bpmn:incoming>
       <bpmn:outgoing>Flow_11b24we</bpmn:outgoing>
     </bpmn:exclusiveGateway>
     <bpmn:sequenceFlow id="Flow_02moyg7" sourceRef="Submit_the_invoice" targetRef="SubProcess_Data_validation_rules" />
@@ -226,6 +228,11 @@
     <bpmn:subProcess id="SubProcess_Data_validation_rules" name="2b. Data validation rules">
       <bpmn:incoming>Flow_02moyg7</bpmn:incoming>
       <bpmn:outgoing>Flow_1ck27i7</bpmn:outgoing>
+      <bpmn:property id="Property_137rqqj" name="__targetRef_placeholder" />
+      <bpmn:dataInputAssociation id="DataInputAssociation_1kpgeww">
+        <bpmn:sourceRef>DataObjectReference_Invoice</bpmn:sourceRef>
+        <bpmn:targetRef>Property_137rqqj</bpmn:targetRef>
+      </bpmn:dataInputAssociation>
       <bpmn:startEvent id="Event_1qkuk5g">
         <bpmn:outgoing>Flow_1avkxpe</bpmn:outgoing>
       </bpmn:startEvent>
@@ -305,15 +312,13 @@ Please fix.
       <bpmn:incoming>Flow_13ng1f4</bpmn:incoming>
       <bpmn:outgoing>Flow_18cic3h</bpmn:outgoing>
     </bpmn:manualTask>
-    <bpmn:startEvent id="Event_1lgiv0q">
-      <bpmn:messageEventDefinition id="MessageEventDefinition_0c23q9z" messageRef="Message_Submit_Invoice" />
-    </bpmn:startEvent>
-    <bpmn:startEvent id="Event_0gxn1v4">
-      <bpmn:outgoing>Flow_1m70ywr</bpmn:outgoing>
-    </bpmn:startEvent>
-    <bpmn:sequenceFlow id="Flow_1m70ywr" sourceRef="Event_0gxn1v4" targetRef="Gateway_16gxu6s" />
     <bpmn:dataObjectReference id="DataObjectReference_Invoice" name="invoice" dataObjectRef="invoice" />
     <bpmn:dataObject id="invoice" />
+    <bpmn:startEvent id="Event_1lgiv0q">
+      <bpmn:outgoing>Flow_12bfyqx</bpmn:outgoing>
+      <bpmn:messageEventDefinition id="MessageEventDefinition_0c23q9z" messageRef="Message_Submit_Invoice" />
+    </bpmn:startEvent>
+    <bpmn:sequenceFlow id="Flow_12bfyqx" sourceRef="Event_1lgiv0q" targetRef="Gateway_16gxu6s" />
     <bpmn:textAnnotation id="TextAnnotation_07oqnmr">
       <bpmn:text>Please check your invoice data</bpmn:text>
     </bpmn:textAnnotation>
@@ -404,6 +409,9 @@ Please fix.
           <dc:Bounds x="2732" y="402" width="54" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_0fufj5j_di" bpmnElement="Event_1lgiv0q">
+        <dc:Bounds x="362" y="504" width="36" height="36" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1rn2mgi_di" bpmnElement="Activity_0gkejaj">
         <dc:Bounds x="1979" y="482" width="100" height="80" />
       </bpmndi:BPMNShape>
@@ -474,12 +482,6 @@ Please fix.
       <bpmndi:BPMNShape id="Activity_0qtkhpi_di" bpmnElement="Activity_02lq9lo">
         <dc:Bounds x="750" y="320" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_0fufj5j_di" bpmnElement="Event_1lgiv0q">
-        <dc:Bounds x="362" y="412" width="36" height="36" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_0gxn1v4_di" bpmnElement="Event_0gxn1v4">
-        <dc:Bounds x="382" y="504" width="36" height="36" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="DataObjectReference_1ueltxu_di" bpmnElement="DataObjectReference_Invoice">
         <dc:Bounds x="782" y="645" width="36" height="50" />
         <bpmndi:BPMNLabel>
@@ -642,14 +644,14 @@ Please fix.
         <di:waypoint x="940" y="522" />
         <di:waypoint x="1015" y="522" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1m70ywr_di" bpmnElement="Flow_1m70ywr">
-        <di:waypoint x="418" y="522" />
-        <di:waypoint x="535" y="522" />
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Association_170uhu5_di" bpmnElement="Association_170uhu5">
         <di:waypoint x="1147" y="306" />
         <di:waypoint x="1137" y="274" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_12bfyqx_di" bpmnElement="Flow_12bfyqx">
+        <di:waypoint x="398" y="522" />
+        <di:waypoint x="535" y="522" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="Participant_0a8arrz_di" bpmnElement="Participant_0a8arrz" isHorizontal="true">
         <dc:Bounds x="1103" y="1040" width="320" height="80" />
       </bpmndi:BPMNShape>
@@ -662,6 +664,14 @@ Please fix.
       <bpmndi:BPMNShape id="TextAnnotation_1uaw1w7_di" bpmnElement="TextAnnotation_1uaw1w7">
         <dc:Bounds x="490" y="-170" width="400" height="30" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="DataOutputAssociation_1myrn23_di" bpmnElement="DataOutputAssociation_1myrn23">
+        <di:waypoint x="731" y="562" />
+        <di:waypoint x="785" y="645" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="DataInputAssociation_1kpgeww_di" bpmnElement="DataInputAssociation_1kpgeww">
+        <di:waypoint x="818" y="645" />
+        <di:waypoint x="876" y="562" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Association_1eygti7_di" bpmnElement="Association_1eygti7">
         <di:waypoint x="1855" y="-1415" />
         <di:waypoint x="690" y="-190" />
diff --git a/execute-procure-to-pay/cc-invoice-approval-process/workflow.json b/execute-procure-to-pay/cc-invoice-approval-process/workflow.json
index 940ba512..4f355881 100644
--- a/execute-procure-to-pay/cc-invoice-approval-process/workflow.json
+++ b/execute-procure-to-pay/cc-invoice-approval-process/workflow.json
@@ -1,17 +1,17 @@
 {
-    "is_master_spec": false,
-    "display_name": "CCC Invoice Approval Process",
-    "library": false,
-    "process_group_id": "execute-procure-to-pay",
-    "standalone": false,
-    "primary_process_id": "Process_1gw0plw",
-    "libraries": [],
-    "id": "cc-invoice-approval-process",
-    "display_order": 0,
     "description": "CC Invoice Approval Process",
-    "files": [],
-    "fault_or_suspend_on_exception": "fault",
-    "exception_notification_addresses": [],
+    "primary_file_name": "cc-invoice-approval-process-v2.bpmn",
+    "primary_process_id": "Process_1gw0plw",
     "is_review": true,
-    "primary_file_name": "cc-invoice-approval-process-v2.bpmn"
+    "exception_notification_addresses": [],
+    "is_master_spec": false,
+    "display_order": 0,
+    "standalone": false,
+    "process_group_id": "execute-procure-to-pay",
+    "library": false,
+    "libraries": [],
+    "files": [],
+    "display_name": "CCC Invoice Approval Process",
+    "fault_or_suspend_on_exception": "fault",
+    "id": "cc-invoice-approval-process"
 }
\ No newline at end of file
diff --git a/execute-procure-to-pay/core-contributor-portal/workflow.json b/execute-procure-to-pay/core-contributor-portal/workflow.json
deleted file mode 100644
index 0d93af67..00000000
--- a/execute-procure-to-pay/core-contributor-portal/workflow.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "exception_notification_addresses": [],
-    "primary_file_name": "",
-    "is_review": false,
-    "standalone": false,
-    "id": "core-contributor-portal",
-    "display_order": 1,
-    "is_master_spec": false,
-    "primary_process_id": "",
-    "display_name": "Core Contributor Portal",
-    "library": false,
-    "fault_or_suspend_on_exception": "fault",
-    "description": "Core Contributor Portal",
-    "libraries": [],
-    "files": [],
-    "process_group_id": "execute-procure-to-pay"
-}
\ No newline at end of file
diff --git a/test/tc-611-message-receiver-f/TC-6.1.1.bpmn b/test/tc-611-message-receiver-f/TC-6.1.1.bpmn
index 66994c8a..21d4c28d 100644
--- a/test/tc-611-message-receiver-f/TC-6.1.1.bpmn
+++ b/test/tc-611-message-receiver-f/TC-6.1.1.bpmn
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:spiffworkflow="http://spiffworkflow.org/bpmn/schema/1.0/core" id="Definitions_96f6665" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.0.0-dev">
   <bpmn:collaboration id="Collaboration_02tdhks">
-    <bpmn:participant id="Participant_0m549h4" processRef="Process_bd2e724" />
+    <bpmn:participant id="Participant_0m549h4" processRef="Process_TC611" />
     <bpmn:correlationKey name="CorrelationKey_1">
       <bpmn:correlationPropertyRef>mcp_topica_one</bpmn:correlationPropertyRef>
     </bpmn:correlationKey>
   </bpmn:collaboration>
-  <bpmn:process id="Process_bd2e724" isExecutable="true">
+  <bpmn:process id="Process_TC611" isExecutable="true">
     <bpmn:sequenceFlow id="Flow_0gy9seo" sourceRef="StartEvent_1" targetRef="Event_0bocxa1" />
     <bpmn:endEvent id="Event_0bocxa1">
       <bpmn:incoming>Flow_0gy9seo</bpmn:incoming>
diff --git a/test/tc-611-message-receiver-f/workflow.json b/test/tc-611-message-receiver-f/workflow.json
index ea9ce9c7..377b6b98 100644
--- a/test/tc-611-message-receiver-f/workflow.json
+++ b/test/tc-611-message-receiver-f/workflow.json
@@ -1,17 +1,17 @@
 {
     "description": "TC-6.1.1 - Message receiver F",
+    "primary_file_name": "TC-6.1.1.bpmn",
+    "primary_process_id": "Process_TC611",
     "is_review": false,
+    "exception_notification_addresses": [],
+    "is_master_spec": false,
+    "display_order": 45,
+    "standalone": false,
+    "process_group_id": "test",
     "library": false,
     "libraries": [],
-    "process_group_id": "test",
-    "display_order": 45,
+    "files": [],
     "display_name": "TC-6.1.1 - Message receiver F",
     "fault_or_suspend_on_exception": "fault",
-    "primary_file_name": "TC-6.1.1.bpmn",
-    "is_master_spec": false,
-    "standalone": false,
-    "files": [],
-    "id": "tc-611-message-receiver-f",
-    "primary_process_id": "Process_bd2e724",
-    "exception_notification_addresses": []
-}
+    "id": "tc-611-message-receiver-f"
+}
\ No newline at end of file