diff --git a/misc/waku-messages-global/process_model.json b/misc/waku-messages-global/process_model.json
index e25ff69f..2b6cae43 100644
--- a/misc/waku-messages-global/process_model.json
+++ b/misc/waku-messages-global/process_model.json
@@ -7,5 +7,5 @@
     "files": [],
     "metadata_extraction_paths": null,
     "primary_file_name": "waku-message-global.bpmn",
-    "primary_process_id": "Get_Waku_Message_Footer"
+    "primary_process_id": "Shared_Waku_Messages_Global"
 }
\ No newline at end of file
diff --git a/misc/waku-messages-global/waku-message-global.bpmn b/misc/waku-messages-global/waku-message-global.bpmn
index 41ddfbd9..22fd5438 100644
--- a/misc/waku-messages-global/waku-message-global.bpmn
+++ b/misc/waku-messages-global/waku-message-global.bpmn
@@ -1,6 +1,6 @@
 <?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:process id="Get_Waku_Message_Footer" name="Get Waku Message Footer" isExecutable="true">
+  <bpmn:process id="Shared_Waku_Messages_Global" name="Shared: Waku Messages Global" isExecutable="true">
     <bpmn:startEvent id="StartEvent_1">
       <bpmn:outgoing>Flow_0mhmqog</bpmn:outgoing>
     </bpmn:startEvent>
@@ -13,12 +13,22 @@
       <bpmn:outgoing>Flow_0gmwrim</bpmn:outgoing>
     </bpmn:businessRuleTask>
     <bpmn:endEvent id="Event_1l5lalr">
-      <bpmn:incoming>Flow_0gmwrim</bpmn:incoming>
+      <bpmn:incoming>Flow_0ed5hag</bpmn:incoming>
     </bpmn:endEvent>
-    <bpmn:sequenceFlow id="Flow_0gmwrim" sourceRef="Activity_0elwnuk" targetRef="Event_1l5lalr" />
+    <bpmn:sequenceFlow id="Flow_0gmwrim" sourceRef="Activity_0elwnuk" targetRef="Activity_0rz4emr" />
+    <bpmn:task id="Activity_0whqoqp" name="Set Timestamp">
+      <bpmn:incoming>Flow_1y9wdf2</bpmn:incoming>
+      <bpmn:outgoing>Flow_0ed5hag</bpmn:outgoing>
+    </bpmn:task>
+    <bpmn:sequenceFlow id="Flow_0ed5hag" sourceRef="Activity_0whqoqp" targetRef="Event_1l5lalr" />
+    <bpmn:sequenceFlow id="Flow_1y9wdf2" sourceRef="Activity_0rz4emr" targetRef="Activity_0whqoqp" />
+    <bpmn:callActivity id="Activity_0rz4emr" name="Call Shared: Local Date Time">
+      <bpmn:incoming>Flow_0gmwrim</bpmn:incoming>
+      <bpmn:outgoing>Flow_1y9wdf2</bpmn:outgoing>
+    </bpmn:callActivity>
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Get_Waku_Message_Footer">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Shared_Waku_Messages_Global">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
         <dc:Bounds x="179" y="159" width="36" height="36" />
       </bpmndi:BPMNShape>
@@ -26,7 +36,14 @@
         <dc:Bounds x="270" y="137" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_1l5lalr_di" bpmnElement="Event_1l5lalr">
-        <dc:Bounds x="432" y="159" width="36" height="36" />
+        <dc:Bounds x="802" y="159" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_12atk39_di" bpmnElement="Activity_0rz4emr">
+        <dc:Bounds x="450" y="137" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0whqoqp_di" bpmnElement="Activity_0whqoqp">
+        <dc:Bounds x="630" y="137" width="100" height="80" />
+        <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_0mhmqog_di" bpmnElement="Flow_0mhmqog">
         <di:waypoint x="215" y="177" />
@@ -34,7 +51,15 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0gmwrim_di" bpmnElement="Flow_0gmwrim">
         <di:waypoint x="370" y="177" />
-        <di:waypoint x="432" y="177" />
+        <di:waypoint x="450" y="177" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0ed5hag_di" bpmnElement="Flow_0ed5hag">
+        <di:waypoint x="730" y="177" />
+        <di:waypoint x="802" y="177" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1y9wdf2_di" bpmnElement="Flow_1y9wdf2">
+        <di:waypoint x="550" y="177" />
+        <di:waypoint x="630" y="177" />
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>