diff --git a/docs/monitoring.md b/docs/monitoring.md
index c5f1fc2c1f9b5dafd056f2a920014714290ca6bc..19b958434f7f8840e0ebf08e9125cffeeb647104 100644
--- a/docs/monitoring.md
+++ b/docs/monitoring.md
@@ -20,13 +20,6 @@ Configuration includes:
 * Allocation (Media Service Instance, Service Function Instance, Surrogate Instance)
 * Basic State (up, down, etc.)
 
-Usage and performance includes:
-
-* cpu/s
-* throughput
-* response time
-* etc.
-
 #### Monitoring Data
 
 Briefly descirbe:
@@ -36,12 +29,20 @@ Briefly descirbe:
 * the lifecycle of monitoring data within the platform and how it is used
 * the type of monitoring data
 
-Monitoring includes the following aspects
+Monitoring includes usage metrics
 
 * network resource usage
 * host resource usage
 * service usage
 
+
+Monitoring includes performance metrics:
+
+* cpu/sec
+* throughput
+* response time
+* etc.
+
 #### Measurements Principles and Model
 
 ##### General 
@@ -202,18 +203,24 @@ If the agent is deployed in a VM/container that a tenant has root access then a
 * Generate a hash from the agent configuration file that's checked within the monitoring message. Probably too costly and not part of the telegraf protocol
 * Use unix permissions (e.g. surrogates are deployed within root access to them)
 
-## Measurements
+## Configuration Measurements
 
-|Decision Context|Measurement|Description
+|Context|Measurement|Description
 |---|---|---|
 |Capacity|host_resource|the compute infrastructure allocation to the platform|
 |Capacity|network_resource|the network infrastructure allocation to the platform|
 |Platform|topology_manager|tbd|
+|Media Service|sfc_config|tbd|
+|Media Service|sf_config|tbd|
+|Media Service|vm_host_config|compute resources allocated to a VM|
+|Media Service|net_port_config|networking constraints on port on a VM|
+
+## Monitoring Measurements
+
 |Platform|nap_data_io|nap data io at byte, ip and http levels|
 |Platform|nap_fqdn_perf|fqdn request rate and latency|
-|Platform|orchestrator|---|
-|Platform|clmc|---|
-|Media Service|vm_host_config|compute resources allocated to a VM|
+|Platform|orchestrator|tbd|
+|Platform|clmc|tbd|
 |Media Service|cpu_usage|vm desc|
 |Media Service|disk_usage|vm desc|
 |Media Service|disk_IO|vm desc|
@@ -222,7 +229,6 @@ If the agent is deployed in a VM/container that a tenant has root access then a
 |Media Service|process_status|vm desc|
 |Media Service|swap_memory_usage|vm desc|
 |Media Service|system_load_uptime|vm desc|
-|Media Service|net_port_config|networking constraints on port on a VM|
 |Media Service|net_port_io|vm port network io and error at L2|
 |Media Service|service|vm service perf|