diff --git a/playground/dinithi/signal-catch-event-issue-test2/signal_boundary_event.bpmn b/playground/dinithi/signal-catch-event-issue-test2/signal_boundary_event.bpmn
index 649df544..ddc01b91 100644
--- a/playground/dinithi/signal-catch-event-issue-test2/signal_boundary_event.bpmn
+++ b/playground/dinithi/signal-catch-event-issue-test2/signal_boundary_event.bpmn
@@ -4,37 +4,44 @@
     <bpmn:startEvent id="StartEvent_1">
       <bpmn:outgoing>Flow_13uy159</bpmn:outgoing>
     </bpmn:startEvent>
-    <bpmn:sequenceFlow id="Flow_13uy159" sourceRef="StartEvent_1" targetRef="Manual_Task" />
+    <bpmn:sequenceFlow id="Flow_13uy159" sourceRef="StartEvent_1" targetRef="User_Task" />
     <bpmn:endEvent id="Event_1rl9pce">
       <bpmn:extensionElements>
         <spiffworkflow:instructionsForEndUser>End Signal Boundary Event Unit Test</spiffworkflow:instructionsForEndUser>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_0wc2n1z</bpmn:incoming>
     </bpmn:endEvent>
-    <bpmn:sequenceFlow id="Flow_0wc2n1z" sourceRef="Manual_Task" targetRef="Event_1rl9pce" />
+    <bpmn:sequenceFlow id="Flow_0wc2n1z" sourceRef="User_Task" targetRef="Event_1rl9pce" />
     <bpmn:endEvent id="Event_09cctxi">
       <bpmn:extensionElements>
-        <spiffworkflow:instructionsForEndUser>Cancelled and End Signal Boundary Event Unit Test</spiffworkflow:instructionsForEndUser>
+        <spiffworkflow:instructionsForEndUser>Cancelled and End Signal Boundary Event Unit Test. Name: {{name}}</spiffworkflow:instructionsForEndUser>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_07btd5z</bpmn:incoming>
     </bpmn:endEvent>
     <bpmn:sequenceFlow id="Flow_07btd5z" sourceRef="Event_1o7fk5i" targetRef="Event_09cctxi" />
-    <bpmn:manualTask id="Manual_Task" name="Manual Task">
-      <bpmn:extensionElements>
-        <spiffworkflow:instructionsForEndUser>Click Continue or Cancel</spiffworkflow:instructionsForEndUser>
-      </bpmn:extensionElements>
-      <bpmn:incoming>Flow_13uy159</bpmn:incoming>
-      <bpmn:outgoing>Flow_0wc2n1z</bpmn:outgoing>
-    </bpmn:manualTask>
-    <bpmn:boundaryEvent id="Event_1o7fk5i" attachedToRef="Manual_Task">
+    <bpmn:boundaryEvent id="Event_1o7fk5i" attachedToRef="User_Task">
       <bpmn:extensionElements>
         <spiffworkflow:signalButtonLabel>Cancel</spiffworkflow:signalButtonLabel>
       </bpmn:extensionElements>
       <bpmn:outgoing>Flow_07btd5z</bpmn:outgoing>
-      <bpmn:signalEventDefinition id="SignalEventDefinition_0dm1utc" />
+      <bpmn:signalEventDefinition id="SignalEventDefinition_0dm1utc" signalRef="isCancelled" />
     </bpmn:boundaryEvent>
+    <bpmn:userTask id="User_Task" name="User Task">
+      <bpmn:extensionElements>
+        <spiffworkflow:instructionsForEndUser>Click Continue or Cancel</spiffworkflow:instructionsForEndUser>
+        <spiffworkflow:properties>
+          <spiffworkflow:property name="formJsonSchemaFilename" value="get-name-schema.json" />
+        </spiffworkflow:properties>
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_13uy159</bpmn:incoming>
+      <bpmn:outgoing>Flow_0wc2n1z</bpmn:outgoing>
+    </bpmn:userTask>
   </bpmn:process>
-  <bpmn:signal id="isCancelled" name="isCancelled" />
+  <bpmn:signal id="isCancelled" name="isCancelled">
+    <bpmn:extensionElements>
+      <spiffworkflow:variableName>name</spiffworkflow:variableName>
+    </bpmn:extensionElements>
+  </bpmn:signal>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Signal_Boundary_Event">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
@@ -43,13 +50,13 @@
       <bpmndi:BPMNShape id="Event_1rl9pce_di" bpmnElement="Event_1rl9pce">
         <dc:Bounds x="112" y="132" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1lz10el_di" bpmnElement="Manual_Task">
-        <dc:Bounds x="-40" y="110" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_09cctxi_di" bpmnElement="Event_09cctxi">
         <dc:Bounds x="112" y="252" width="36" height="36" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0clwk6a_di" bpmnElement="User_Task">
+        <dc:Bounds x="-40" y="110" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_150hqfz_di" bpmnElement="Event_1o7fk5i">
         <dc:Bounds x="-8" y="172" width="36" height="36" />
       </bpmndi:BPMNShape>