diff --git a/Documentation/FlowDiagram.puml b/Documentation/FlowDiagram.puml
index 10dc57e0558e088b99ca36a6228ac747dcc984f8..f76f10a411b37204994a182d90866898eaa76336 100644
--- a/Documentation/FlowDiagram.puml
+++ b/Documentation/FlowDiagram.puml
@@ -3,7 +3,7 @@ actor        "ACTOR"              as actor
 participant  "OSOM"               as osom
 participant  "TMF API"            as tmf_api
 queue        amq                  as amq
-participant  "Monitoring Service" as smon
+participant  "METRICO" as metrico
 participant  prometheus           as prom
 
 
@@ -12,23 +12,24 @@ 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
-amq     -> tmf_api: CREATE: TMF628 Measurement Collection Job
-tmf_api -> amq: PUBLISH EVENT: Monitoring Job Created
-amq     -> smon: RECEIVE EVENT: Monitoring Job Created
-smon    -> smon: create job
-smon    -> amq: UPDATE TMF628 Performance Indicator Job
-amq     -> tmf_api: UPDATE TMF628 object
+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)
 
-smon -> smon: Create a java job with refresh rate
-group "java job"
-    smon -> smon   : set how often job is done
-    smon -> prom   : send prom req
-    prom -> smon   : reply to prom req
-    smon -> smon   : parse data from reply and cast them to performance indicator
-    smon -> amq    : "UPDATE: TMF628 object"
-    amq  -> tmf_api: "UPDATE: TMF628 object"
-    smon -> amq    : "UPDATE: Related service to the Service Inventory"
-    amq  -> tmf_api: "UPDATE: Related service to the Service Inventory"    
+metrico -> metrico: Create a java job with refresh rate
+group "java job" 
+    metrico -> metrico   : set how often job is done
+    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: 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
-@enduml
+
+@enduml
\ No newline at end of file