diff --git a/bpmn-js-spiffworkflow/app/spiffworkflow/InputOutput/IoInterceptor.js b/bpmn-js-spiffworkflow/app/spiffworkflow/InputOutput/IoInterceptor.js
index 05c9ea94..b7977db8 100644
--- a/bpmn-js-spiffworkflow/app/spiffworkflow/InputOutput/IoInterceptor.js
+++ b/bpmn-js-spiffworkflow/app/spiffworkflow/InputOutput/IoInterceptor.js
@@ -38,6 +38,7 @@ export default class IoInterceptor extends CommandInterceptor {
         di.bpmnElement = dataIO;
         di.id = dataIO.id + 'DI';
         bpmnUpdater.updateBounds(context.shape);
+
         if (type == 'bpmn:DataInput') {
           collectionAdd(ioSpecification.get('dataInputs'), dataIO);
         } else {
@@ -60,6 +61,10 @@ export default class IoInterceptor extends CommandInterceptor {
         if (context.shape.di.$parent) {
           collectionRemove(context.shape.di.$parent.planeElement, context.shape.di);
         }
+        console.log("inputs/outputs", ioSpec.dataInputs, ioSpec.dataOutputs)
+        if (ioSpec.dataInputs.length === 0 && ioSpec.dataOutputs.length === 0) {
+          process.ioSpecification = null;
+        }
       }
     });
 
@@ -88,13 +93,15 @@ function assureIOSpecificationExists(process, bpmnFactory) {
   let ioSpecification = process.get('ioSpecification');
 
   if (!ioSpecification) {
+    let inputSet = bpmnFactory.create('bpmn:InputSet');
+    let outputSet = bpmnFactory.create('bpmn:OutputSet');
 
     // Create the BPMN
     ioSpecification = bpmnFactory.create('bpmn:InputOutputSpecification', {
       dataInputs: [],
-      inputSets: [],
+      inputSets: [inputSet],
       dataOutputs: [],
-      outputSets: []
+      outputSets: [outputSet],
     });
     ioSpecification.$parent = process;
     process.ioSpecification = ioSpecification;
@@ -102,5 +109,7 @@ function assureIOSpecificationExists(process, bpmnFactory) {
   return ioSpecification;
 }
 
+
+
 IoInterceptor.$inject = [ 'eventBus', 'bpmnFactory', 'bpmnUpdater' ];
 
diff --git a/bpmn-js-spiffworkflow/app/spiffworkflow/messages/propertiesPanel/MessageCorrelationPropertiesArray.js b/bpmn-js-spiffworkflow/app/spiffworkflow/messages/propertiesPanel/MessageCorrelationPropertiesArray.js
index bd62c693..68a79379 100644
--- a/bpmn-js-spiffworkflow/app/spiffworkflow/messages/propertiesPanel/MessageCorrelationPropertiesArray.js
+++ b/bpmn-js-spiffworkflow/app/spiffworkflow/messages/propertiesPanel/MessageCorrelationPropertiesArray.js
@@ -82,7 +82,7 @@ export function MessageCorrelationPropertiesArray(props) {
         'bpmn:CorrelationPropertyRetrievalExpression'
       );
       const messageRefElement = getMessageRefElement(element);
-      const newFormalExpression = moddle.create('bpmn:FormalExpression');
+      const newFormalExpression = moddle.create('bpmn:messagePath');
       newFormalExpression.body = '';
 
       newRetrievalExpressionElement.messageRef = messageRefElement;
diff --git a/bpmn-js-spiffworkflow/test/spec/bpmn/basic_message.bpmn b/bpmn-js-spiffworkflow/test/spec/bpmn/basic_message.bpmn
index 08c6145c..3f141643 100644
--- a/bpmn-js-spiffworkflow/test/spec/bpmn/basic_message.bpmn
+++ b/bpmn-js-spiffworkflow/test/spec/bpmn/basic_message.bpmn
@@ -14,10 +14,10 @@
   </bpmn:collaboration>
   <bpmn:correlationProperty id="message_correlation_property" name="Message Correlation Property">
     <bpmn:correlationPropertyRetrievalExpression messageRef="message_send">
-      <bpmn:formalExpression>to</bpmn:formalExpression>
+      <bpmn:messagePath>to</bpmn:messagePath>
     </bpmn:correlationPropertyRetrievalExpression>
     <bpmn:correlationPropertyRetrievalExpression messageRef="message_response">
-      <bpmn:formalExpression>from.name</bpmn:formalExpression>
+      <bpmn:messagePath>from.name</bpmn:messagePath>
     </bpmn:correlationPropertyRetrievalExpression>
   </bpmn:correlationProperty>
   <bpmn:process id="message_send_process" name="Message Send Process" isExecutable="true">
@@ -68,7 +68,7 @@
   </bpmn:process>
   <bpmn:correlationProperty id="correlation_property_one" name="Correlation Property One">
     <bpmn:correlationPropertyRetrievalExpression messageRef="message_send">
-      <bpmn:formalExpression>new</bpmn:formalExpression>
+      <bpmn:messagePath>new</bpmn:messagePath>
     </bpmn:correlationPropertyRetrievalExpression>
   </bpmn:correlationProperty>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
diff --git a/bpmn-js-spiffworkflow/test/spec/bpmn/collaboration.bpmn b/bpmn-js-spiffworkflow/test/spec/bpmn/collaboration.bpmn
index fbc941a5..a193fd3a 100644
--- a/bpmn-js-spiffworkflow/test/spec/bpmn/collaboration.bpmn
+++ b/bpmn-js-spiffworkflow/test/spec/bpmn/collaboration.bpmn
@@ -26,26 +26,26 @@
   <bpmn:message id="love_letter_response" name="Love Letter Response" />
   <bpmn:correlationProperty id="lover_instrument" name="Lover&#39;s Instrument">
     <bpmn:correlationPropertyRetrievalExpression messageRef="love_letter">
-      <bpmn:formalExpression>lover.instrument</bpmn:formalExpression>
+      <bpmn:messagePath>lover.instrument</bpmn:messagePath>
     </bpmn:correlationPropertyRetrievalExpression>
     <bpmn:correlationPropertyRetrievalExpression messageRef="love_letter_response">
-      <bpmn:formalExpression>from.instrument</bpmn:formalExpression>
+      <bpmn:messagePath>from.instrument</bpmn:messagePath>
     </bpmn:correlationPropertyRetrievalExpression>
   </bpmn:correlationProperty>
   <bpmn:correlationProperty id="lover_name" name="Lover&#39;s Name">
     <bpmn:correlationPropertyRetrievalExpression messageRef="love_letter">
-      <bpmn:formalExpression>lover.name</bpmn:formalExpression>
+      <bpmn:messagePath>lover.name</bpmn:messagePath>
     </bpmn:correlationPropertyRetrievalExpression>
     <bpmn:correlationPropertyRetrievalExpression messageRef="love_letter_response">
-      <bpmn:formalExpression>from.name</bpmn:formalExpression>
+      <bpmn:messagePath>from.name</bpmn:messagePath>
     </bpmn:correlationPropertyRetrievalExpression>
     <bpmn:correlationPropertyRetrievalExpression>
-      <bpmn:formalExpression>heartbreaker</bpmn:formalExpression>
+      <bpmn:messagePath>heartbreaker</bpmn:messagePath>
     </bpmn:correlationPropertyRetrievalExpression>
   </bpmn:correlationProperty>
   <bpmn:correlationProperty id="singer_name" name="Singer&#39;s Name">
     <bpmn:correlationPropertyRetrievalExpression messageRef="love_letter_response">
-      <bpmn:formalExpression>to.name</bpmn:formalExpression>
+      <bpmn:messagePath>to.name</bpmn:messagePath>
     </bpmn:correlationPropertyRetrievalExpression>
   </bpmn:correlationProperty>
   <bpmn:process id="process_buddy" name="Process Buddy" isExecutable="true">
diff --git a/bpmn-js-spiffworkflow/test/spec/bpmn/simple_collab.bpmn b/bpmn-js-spiffworkflow/test/spec/bpmn/simple_collab.bpmn
index c4fb1463..aae67e99 100644
--- a/bpmn-js-spiffworkflow/test/spec/bpmn/simple_collab.bpmn
+++ b/bpmn-js-spiffworkflow/test/spec/bpmn/simple_collab.bpmn
@@ -46,46 +46,46 @@
 
     <bpmn:correlationProperty id="invoice_id" name="Invoice ID">
         <bpmn:correlationPropertyRetrievalExpression messageRef="send_invoice">
-            <bpmn:formalExpression>invoice.invoice_id</bpmn:formalExpression>
+            <bpmn:messagePath>invoice.invoice_id</bpmn:messagePath>
         </bpmn:correlationPropertyRetrievalExpression>
         <bpmn:correlationPropertyRetrievalExpression messageRef="send_payment">
-            <bpmn:formalExpression>payment.invoice_id</bpmn:formalExpression>
+            <bpmn:messagePath>payment.invoice_id</bpmn:messagePath>
         </bpmn:correlationPropertyRetrievalExpression>
     </bpmn:correlationProperty>
 
     <bpmn:correlationProperty id="invoice_total" name="Invoice Total">
         <bpmn:correlationPropertyRetrievalExpression messageRef="send_invoice">
-            <bpmn:formalExpression>invoice.total</bpmn:formalExpression>
+            <bpmn:messagePath>invoice.total</bpmn:messagePath>
         </bpmn:correlationPropertyRetrievalExpression>
         <bpmn:correlationPropertyRetrievalExpression messageRef="send_payment">
-            <bpmn:formalExpression>payment.invoice_amount</bpmn:formalExpression>
+            <bpmn:messagePath>payment.invoice_amount</bpmn:messagePath>
         </bpmn:correlationPropertyRetrievalExpression>
     </bpmn:correlationProperty>
 
     <bpmn:correlationProperty id="invoice_date" name="Invoice Date">
         <bpmn:correlationPropertyRetrievalExpression messageRef="send_invoice">
-            <bpmn:formalExpression>invoice.date</bpmn:formalExpression>
+            <bpmn:messagePath>invoice.date</bpmn:messagePath>
         </bpmn:correlationPropertyRetrievalExpression>
         <bpmn:correlationPropertyRetrievalExpression messageRef="send_payment">
-            <bpmn:formalExpression>payment.invoice_date</bpmn:formalExpression>
+            <bpmn:messagePath>payment.invoice_date</bpmn:messagePath>
         </bpmn:correlationPropertyRetrievalExpression>
     </bpmn:correlationProperty>
 
     <bpmn:correlationProperty id="payment_date" name="Payment Date">
         <bpmn:correlationPropertyRetrievalExpression messageRef="send_payment">
-            <bpmn:formalExpression>payment.date</bpmn:formalExpression>
+            <bpmn:messagePath>payment.date</bpmn:messagePath>
         </bpmn:correlationPropertyRetrievalExpression>
     </bpmn:correlationProperty>
 
     <bpmn:correlationProperty id="payment_total" name="Payment Total">
         <bpmn:correlationPropertyRetrievalExpression messageRef="send_payment">
-            <bpmn:formalExpression>payment.total</bpmn:formalExpression>
+            <bpmn:messagePath>payment.total</bpmn:messagePath>
         </bpmn:correlationPropertyRetrievalExpression>
     </bpmn:correlationProperty>
 
     <bpmn:correlationProperty id="payment_id" name="Payment ID">
         <bpmn:correlationPropertyRetrievalExpression messageRef="send_payment">
-            <bpmn:formalExpression>payment.id</bpmn:formalExpression>
+            <bpmn:messagePath>payment.id</bpmn:messagePath>
         </bpmn:correlationPropertyRetrievalExpression>
     </bpmn:correlationProperty>