diff --git a/playground/safran-federal-systems/daemonbuilder2/DaemonBuilder2.bpmn b/playground/safran-federal-systems/daemonbuilder2/DaemonBuilder2.bpmn
index 93accafd..aeb1790c 100644
--- a/playground/safran-federal-systems/daemonbuilder2/DaemonBuilder2.bpmn
+++ b/playground/safran-federal-systems/daemonbuilder2/DaemonBuilder2.bpmn
@@ -32,8 +32,8 @@
       <bpmn:incoming>Flow_1gpktfn</bpmn:incoming>
     </bpmn:endEvent>
     <bpmn:sequenceFlow id="Flow_1gpktfn" sourceRef="Activity_1kr3hc0" targetRef="Event_10hbj99" />
-    <bpmn:dataStoreReference id="DataStoreReference_InitialData" name="InitialData" />
     <bpmn:dataObject id="DataObject_1j4p2gz" />
+    <bpmn:dataObjectReference id="DataStoreReference_InitialData" name="Data Object 1 J 4 P 2 Gz" dataObjectRef="DataObject_1j4p2gz" />
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_nvap9xz">
@@ -49,12 +49,6 @@
       <bpmndi:BPMNShape id="Event_10hbj99_di" bpmnElement="Event_10hbj99">
         <dc:Bounds x="302" y="-8" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="DataStoreReference_1nsrs8g_di" bpmnElement="DataStoreReference_InitialData">
-        <dc:Bounds x="215" y="125" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="236" y="182" width="50" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_08pt8pm_di" bpmnElement="Flow_08pt8pm">
         <di:waypoint x="-72" y="10" />
         <di:waypoint x="-20" y="10" />
@@ -63,14 +57,20 @@
         <di:waypoint x="80" y="10" />
         <di:waypoint x="140" y="10" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1gpktfn_di" bpmnElement="Flow_1gpktfn">
-        <di:waypoint x="240" y="10" />
-        <di:waypoint x="302" y="10" />
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="DataInputAssociation_1axwolr_di" bpmnElement="DataInputAssociation_1axwolr">
         <di:waypoint x="238" y="125" />
         <di:waypoint x="231" y="50" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1gpktfn_di" bpmnElement="Flow_1gpktfn">
+        <di:waypoint x="240" y="10" />
+        <di:waypoint x="302" y="10" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="DataObjectReference_1dg5nfa_di" bpmnElement="DataStoreReference_InitialData">
+        <dc:Bounds x="222" y="125" width="36" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="236" y="182" width="85" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>