diff --git a/playground/matplus/marco-thom/marco-thom.bpmn b/playground/matplus/marco-thom/marco-thom.bpmn
index 1e5ee8a5..0d4bded9 100644
--- a/playground/matplus/marco-thom/marco-thom.bpmn
+++ b/playground/matplus/marco-thom/marco-thom.bpmn
@@ -1,5 +1,5 @@
 <?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:spiffworkflow="http://spiffworkflow.org/bpmn/schema/1.0/core" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_96f6665" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.0.0-dev">
+<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:spiffworkflow="http://spiffworkflow.org/bpmn/schema/1.0/core" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_96f6665" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.0.0-dev">
   <bpmn:process id="Process_marco_thom_4l3bjoe" isExecutable="true">
     <bpmn:ioSpecification>
       <bpmn:dataInput id="DataInput-395044944-1" name="Credit Card Nr." />
@@ -11,9 +11,6 @@
         <bpmn:dataOutputRefs>DataOutput-210094895-1</bpmn:dataOutputRefs>
       </bpmn:outputSet>
     </bpmn:ioSpecification>
-    <bpmn:startEvent id="StartEvent_1">
-      <bpmn:outgoing>Flow_17db3yp</bpmn:outgoing>
-    </bpmn:startEvent>
     <bpmn:sequenceFlow id="Flow_17db3yp" sourceRef="StartEvent_1" targetRef="Gateway_0z17b9n" />
     <bpmn:endEvent id="EndEvent_1">
       <bpmn:extensionElements>
@@ -75,13 +72,15 @@ You can also change the text you are reading here by updating the *Instructions*
     <bpmn:sequenceFlow id="Flow_0cg5j3j" sourceRef="Activity_146chlu" targetRef="Activity_0eei6u6" />
     <bpmn:dataObject id="DataObject_0ecllxl" name="Data Object 0 Ecllxl" />
     <bpmn:dataObjectReference id="DataObjectReference_1tlymxi" dataObjectRef="DataObject_0ecllxl" />
-    <bpmn:dataStoreReference id="DataStoreReference_1anh8yy" />
+    <bpmn:startEvent id="StartEvent_1">
+      <bpmn:outgoing>Flow_17db3yp</bpmn:outgoing>
+      <bpmn:timerEventDefinition id="TimerEventDefinition_1g2wlad">
+        <bpmn:timeCycle xsi:type="bpmn:tFormalExpression" />
+      </bpmn:timerEventDefinition>
+    </bpmn:startEvent>
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_marco_thom_4l3bjoe">
-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
-        <dc:Bounds x="132" y="159" width="36" height="36" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_14za570_di" bpmnElement="EndEvent_1">
         <dc:Bounds x="842" y="159" width="36" height="36" />
       </bpmndi:BPMNShape>
@@ -96,8 +95,8 @@ You can also change the text you are reading here by updating the *Instructions*
       <bpmndi:BPMNShape id="Gateway_07ry2w8_di" bpmnElement="Gateway_0z17b9n">
         <dc:Bounds x="215" y="152" width="50" height="50" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="DataStoreReference_1anh8yy_di" bpmnElement="DataStoreReference_1anh8yy">
-        <dc:Bounds x="-35" y="325" width="50" height="50" />
+      <bpmndi:BPMNShape id="Event_1iarx74_di" bpmnElement="StartEvent_1">
+        <dc:Bounds x="132" y="159" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1sp7inl_di" bpmnElement="Activity_1m4ums8">
         <dc:Bounds x="420" y="270" width="100" height="80" />