diff --git a/Documentation/FlowDiagram.puml b/Documentation/FlowDiagram.puml
index f76f10a411b37204994a182d90866898eaa76336..e525f325a239fa42e9b62abe4854f2a140e6238f 100644
--- a/Documentation/FlowDiagram.puml
+++ b/Documentation/FlowDiagram.puml
@@ -12,13 +12,13 @@ osom    -> osom: PROCESS ORDER
 osom    -> tmf_api: CREATE: service instance of monitoring aaS (CFS)
 osom    -> tmf_api: CREATE: service instance of monitoring aaS (RFS)
 
-osom    -> amq: CREATE: TMF628 Measurement Collection Job \n<color:red>queue:? \n<color:red>payload: ???
-amq     -> tmf_api: CREATE: TMF628 Measurement Collection Job \n<color:orange>queue: MEASUREMENT_COLLECTION_JOB.CREATED \n<color:red>payload: ???
-tmf_api -> amq: PUBLISH EVENT: Monitoring Job Created\n<color:orange>queue: MEASUREMENT_COLLECTION_JOB.CREATED \n<color:red>payload: ???
-amq     -> metrico: RECEIVE EVENT: Monitoring Job Created\n<color:orange>queue: MEASUREMENT_COLLECTION_JOB.CREATED \n<color:red>payload: ???
-metrico    -> metrico: create job
-metrico    -> amq: UPDATE TMF628 Measurement Collection Job\n<color:orange>queue: MEASUREMENT_COLLECTION_JOB.UPDATE \n<color:red>payload: ??? (maybe previous payload + JOB_ID)
-amq     -> tmf_api: UPDATE TMF628 Measurement Collection Job\n<color:orange>queue: MEASUREMENT_COLLECTION_JOB.UPDATE \n<color:red>payload: ??? (maybe previous payload + JOB_ID)
+osom    -> amq: CREATE: TMF628 Measurement Collection Job \n<color:green>queue:PM_MEASUREMENT_COLLECTION_JOB_ADD \n<color:orange>payload: Service Order / Service Specification
+amq     -> tmf_api: CREATE: TMF628 Measurement Collection Job \n<color:green>queue:PM_MEASUREMENT_COLLECTION_JOB_ADD \n<color:orange>payload: Service Order / Service Specification
+tmf_api -> amq: PUBLISH EVENT: Monitoring Job Created\n<color:green>queue: PM_MEASUREMENT_COLLECTION_JOB_CREATED\n<color:green>payload: Measurement Collection Job
+amq     -> metrico: RECEIVE EVENT: Monitoring Job Created\n<color:green>queue: PM_MEASUREMENT_COLLECTION_JOB_CREATED\n<color:green>payload: Measurement Collection Job
+metrico    -> metrico: create METRICO job
+metrico    -> amq: RESPONSE TO EVENT Monitoring Job Created\n<color:green>queue: PM_MEASUREMENT_COLLECTION_JOB_CREATED\n<color:green>payload: Measurement Collection Job with METRICO JOB_ID
+amq     -> tmf_api: RESPONSE TO EVENT Monitoring Job Created\n<color:green>queue: PM_MEASUREMENT_COLLECTION_JOB_CREATED\n<color:green>payload: Measurement Collection Job with METRICO JOB_ID
 
 metrico -> metrico: Create a java job with refresh rate
 group "java job" 
@@ -26,8 +26,8 @@ group "java job"
     metrico -> prom   : send prom req
     prom -> metrico   : reply to prom req
     metrico -> metrico   : parse data from reply and cast them to performance indicator
-    metrico -> amq    : UPDATE TMF628 Measurement Collection Job\n<color:orange>queue: MEASUREMENT_COLLECTION_JOB.UPDATE \n<color:red>payload: ??? (maybe previous payload + METRICS)
-    amq  -> tmf_api: UPDATE TMF628 Measurement Collection Job\n<color:orange>queue: MEASUREMENT_COLLECTION_JOB.UPDATE \n<color:red>payload: ??? (maybe previous payload + METRICS)
+    metrico -> amq    : UPDATE TMF628 Measurement Collection Job\n<color:green>queue: PM_MEASUREMENT_COLLECTION_JOB_UPDATE\n<color:green>payload: Measurement Collection Job with METRICO JOB_ID and METRICS
+    amq  -> tmf_api: UPDATE TMF628 Measurement Collection Job\n<color:green>queue: PM_MEASUREMENT_COLLECTION_JOB_UPDATE\n<color:green>payload: Measurement Collection Job with METRICO JOB_ID and METRICS
     metrico -> amq    : UPDATE: Related service to the Service Inventory\n<color:red>queue:? \n<color:red>payload: ???
     amq  -> tmf_api: UPDATE: Related service to the Service Inventory\n<color:red>queue:? \n<color:red>payload: ??? 
 end