diff --git a/views/ngXosViews/diagnostic/mocks/data/meterstatistics.json b/views/ngXosViews/diagnostic/mocks/data/meterstatistics.json
index 7be26c4..8678222 100644
--- a/views/ngXosViews/diagnostic/mocks/data/meterstatistics.json
+++ b/views/ngXosViews/diagnostic/mocks/data/meterstatistics.json
@@ -1,310 +1,242 @@
 [
     {
-        "resource_name": "mysite_vsg-1", 
-        "description": "Existence of instance", 
-        "resource": "075a3ae4-9e76-4198-8e6b-67c67b996745", 
-        "meter": "instance", 
-        "unit": "instance", 
-        "category": "Nova", 
+        "resource_name": "vcpe-222-432", 
+        "resource": "vcpe-222-432", 
+        "description": "Existence of vcpe instance", 
+        "resource_id": "vcpe-222-432", 
+        "meter": "vcpe", 
+        "unit": "vcpe", 
+        "category": "VCPE", 
         "slice": "mysite_vsg", 
         "name": "none", 
         "service": "service_vsg", 
         "value": 1.0, 
-        "time": "2016-02-17T22:19:00", 
+        "time": "2016-02-24T00:21:28", 
         "project_id": "718dd78532a24a74b0491437bbef398c"
     }, 
     {
-        "resource_name": "mysite_vsg-1", 
+        "resource_name": "vcpe-222-432", 
+        "resource": "vcpe-222-432", 
+        "description": "Number of entries in DNS cache", 
+        "resource_id": "vcpe-222-432", 
+        "meter": "vcpe.dns.cache.size", 
+        "unit": "entries", 
+        "category": "VCPE", 
+        "slice": "mysite_vsg", 
+        "name": "none", 
+        "service": "service_vsg", 
+        "value": 150.0, 
+        "time": "2016-02-24T00:21:28", 
+        "project_id": "718dd78532a24a74b0491437bbef398c"
+    }, 
+    {
+        "resource_name": "vcpe-222-432", 
+        "resource": "vcpe-222-432", 
+        "description": "Unexpired entries that were thrown out of cache", 
+        "resource_id": "vcpe-222-432", 
+        "meter": "vcpe.dns.replaced_unexpired_entries", 
+        "unit": "entries", 
+        "category": "VCPE", 
+        "slice": "mysite_vsg", 
+        "name": "none", 
+        "service": "service_vsg", 
+        "value": 0.0, 
+        "time": "2016-02-24T00:21:28", 
+        "project_id": "718dd78532a24a74b0491437bbef398c"
+    }, 
+    {
+        "resource_name": "vcpe-222-432", 
+        "resource": "vcpe-222-432", 
+        "description": "Number of cache hits", 
+        "resource_id": "vcpe-222-432", 
+        "meter": "vcpe.dns.queries_answered_locally", 
+        "unit": "queries", 
+        "category": "VCPE", 
+        "slice": "mysite_vsg", 
+        "name": "none", 
+        "service": "service_vsg", 
+        "value": 0.0, 
+        "time": "2016-02-24T00:21:28", 
+        "project_id": "718dd78532a24a74b0491437bbef398c"
+    }, 
+    {
+        "resource_name": "vcpe-222-432", 
+        "resource": "vcpe-222-432", 
+        "description": "Number of cache misses", 
+        "resource_id": "vcpe-222-432", 
+        "meter": "vcpe.dns.queries_forwarded", 
+        "unit": "queries", 
+        "category": "VCPE", 
+        "slice": "mysite_vsg", 
+        "name": "none", 
+        "service": "service_vsg", 
+        "value": 0.0, 
+        "time": "2016-02-24T00:21:28", 
+        "project_id": "718dd78532a24a74b0491437bbef398c"
+    }, 
+    {
+        "resource_name": "vcpe-222-432", 
+        "resource": "vcpe-222-432", 
         "description": "Volume of RAM", 
-        "resource": "075a3ae4-9e76-4198-8e6b-67c67b996745", 
+        "resource_id": "vcpe-222-432", 
         "meter": "memory", 
         "unit": "MB", 
         "category": "Nova", 
         "slice": "mysite_vsg", 
         "name": "none", 
         "service": "service_vsg", 
-        "value": 2048.0, 
-        "time": "2016-02-17T22:19:00", 
+        "value": 2099.0, 
+        "time": "2016-02-24T00:21:28", 
         "project_id": "718dd78532a24a74b0491437bbef398c"
     }, 
     {
-        "resource_name": "mysite_vsg-1", 
+        "resource_name": "vcpe-222-432", 
+        "resource": "vcpe-222-432", 
         "description": "Volume of RAM used", 
-        "resource": "075a3ae4-9e76-4198-8e6b-67c67b996745", 
+        "resource_id": "vcpe-222-432", 
         "meter": "memory.usage", 
         "unit": "MB", 
         "category": "Nova", 
         "slice": "mysite_vsg", 
         "name": "none", 
         "service": "service_vsg", 
-        "value": 1754.0, 
-        "time": "2016-02-17T22:19:00", 
+        "value": 31.1625, 
+        "time": "2016-02-24T00:21:28", 
         "project_id": "718dd78532a24a74b0491437bbef398c"
     }, 
     {
-        "resource_name": "mysite_vsg-1", 
-        "description": "CPU time used", 
-        "resource": "075a3ae4-9e76-4198-8e6b-67c67b996745", 
-        "meter": "cpu", 
-        "unit": "ns", 
+        "resource_name": "vcpe-222-432", 
+        "resource": "vcpe-222-432", 
+        "description": "Average CPU utilization", 
+        "resource_id": "vcpe-222-432", 
+        "meter": "cpu_util", 
+        "unit": "%", 
         "category": "Nova", 
         "slice": "mysite_vsg", 
         "name": "none", 
         "service": "service_vsg", 
-        "value": 179260000000.0, 
-        "time": "2016-02-17T22:19:00", 
-        "project_id": "718dd78532a24a74b0491437bbef398c"
-    }, 
-    {
-        "resource_name": "mysite_vsg-1", 
-        "description": "Number of VCPUs", 
-        "resource": "075a3ae4-9e76-4198-8e6b-67c67b996745", 
-        "meter": "vcpus", 
-        "unit": "vcpu", 
-        "category": "Nova", 
-        "slice": "mysite_vsg", 
-        "name": "none", 
-        "service": "service_vsg", 
-        "value": 1.0, 
-        "time": "2016-02-17T22:19:00", 
-        "project_id": "718dd78532a24a74b0491437bbef398c"
-    }, 
-    {
-        "resource_name": "mysite_vsg-1", 
-        "description": "Number of read requests", 
-        "resource": "075a3ae4-9e76-4198-8e6b-67c67b996745", 
-        "meter": "disk.read.requests", 
-        "unit": "request", 
-        "category": "Nova", 
-        "slice": "mysite_vsg", 
-        "name": "none", 
-        "service": "service_vsg", 
-        "value": 10444.0, 
-        "time": "2016-02-17T22:19:00", 
-        "project_id": "718dd78532a24a74b0491437bbef398c"
-    }, 
-    {
-        "resource_name": "mysite_vsg-1", 
-        "description": "Number of write requests", 
-        "resource": "075a3ae4-9e76-4198-8e6b-67c67b996745", 
-        "meter": "disk.write.requests", 
-        "unit": "request", 
-        "category": "Nova", 
-        "slice": "mysite_vsg", 
-        "name": "none", 
-        "service": "service_vsg", 
-        "value": 58370.0, 
-        "time": "2016-02-17T22:19:00", 
-        "project_id": "718dd78532a24a74b0491437bbef398c"
-    }, 
-    {
-        "resource_name": "mysite_vsg-1", 
-        "description": "Volume of reads", 
-        "resource": "075a3ae4-9e76-4198-8e6b-67c67b996745", 
-        "meter": "disk.read.bytes", 
-        "unit": "B", 
-        "category": "Nova", 
-        "slice": "mysite_vsg", 
-        "name": "none", 
-        "service": "service_vsg", 
-        "value": 317620030.0, 
-        "time": "2016-02-17T22:19:00", 
-        "project_id": "718dd78532a24a74b0491437bbef398c"
-    }, 
-    {
-        "resource_name": "mysite_vsg-1", 
-        "description": "Volume of writes", 
-        "resource": "075a3ae4-9e76-4198-8e6b-67c67b996745", 
-        "meter": "disk.write.bytes", 
-        "unit": "B", 
-        "category": "Nova", 
-        "slice": "mysite_vsg", 
-        "name": "none", 
-        "service": "service_vsg", 
-        "value": 2818024448.0, 
-        "time": "2016-02-17T22:19:00", 
-        "project_id": "718dd78532a24a74b0491437bbef398c"
-    }, 
-    {
-        "resource_name": "mysite_vsg-1", 
-        "description": "Size of root disk", 
-        "resource": "075a3ae4-9e76-4198-8e6b-67c67b996745", 
-        "meter": "disk.root.size", 
-        "unit": "GB", 
-        "category": "Nova", 
-        "slice": "mysite_vsg", 
-        "name": "none", 
-        "service": "service_vsg", 
-        "value": 20.0, 
-        "time": "2016-02-17T22:19:00", 
-        "project_id": "718dd78532a24a74b0491437bbef398c"
-    }, 
-    {
-        "resource_name": "mysite_vsg-1", 
-        "description": "Size of ephemeral disk", 
-        "resource": "075a3ae4-9e76-4198-8e6b-67c67b996745", 
-        "meter": "disk.ephemeral.size", 
-        "unit": "GB", 
-        "category": "Nova", 
-        "slice": "mysite_vsg", 
-        "name": "none", 
-        "service": "service_vsg", 
-        "value": 0.0, 
-        "time": "2016-02-17T22:19:00", 
+        "value": 4.845000000000001, 
+        "time": "2016-02-24T00:21:28", 
         "project_id": "718dd78532a24a74b0491437bbef398c"
     },
     {
-        "resource_name": "mysite_vsg-2", 
-        "description": "Existence of instance", 
-        "resource": "075a3ae4-9e76-4198-8e6b-67c67b996746", 
-        "meter": "instance", 
-        "unit": "instance", 
-        "category": "Nova", 
-        "slice": "mysite_vsg", 
-        "name": "none", 
-        "service": "service_vsg", 
-        "value": 1.0, 
-        "time": "2016-02-17T22:19:00", 
-        "project_id": "718dd78532a24a74b0491437bbef398c"
-    }, 
-    {
-        "resource_name": "mysite_vsg-2", 
-        "description": "Volume of RAM", 
-        "resource": "075a3ae4-9e76-4198-8e6b-67c67b996746", 
-        "meter": "memory", 
-        "unit": "MB", 
-        "category": "Nova", 
-        "slice": "mysite_vsg", 
-        "name": "none", 
-        "service": "service_vsg", 
-        "value": 2048.0, 
-        "time": "2016-02-17T22:19:00", 
-        "project_id": "718dd78532a24a74b0491437bbef398c"
-    }, 
-    {
-        "resource_name": "mysite_vsg-2", 
-        "description": "Volume of RAM used", 
-        "resource": "075a3ae4-9e76-4198-8e6b-67c67b996746", 
-        "meter": "memory.usage", 
-        "unit": "MB", 
-        "category": "Nova", 
-        "slice": "mysite_vsg", 
-        "name": "none", 
-        "service": "service_vsg", 
-        "value": 1534.0, 
-        "time": "2016-02-17T22:19:00", 
-        "project_id": "718dd78532a24a74b0491437bbef398c"
-    }, 
-    {
-        "resource_name": "mysite_vsg-2", 
-        "description": "CPU time used", 
-        "resource": "075a3ae4-9e76-4198-8e6b-67c67b996746", 
-        "meter": "cpu", 
-        "unit": "ns", 
-        "category": "Nova", 
-        "slice": "mysite_vsg", 
-        "name": "none", 
-        "service": "service_vsg", 
-        "value": 134920000000.0, 
-        "time": "2016-02-17T22:19:00", 
-        "project_id": "718dd78532a24a74b0491437bbef398c"
-    }, 
-    {
-        "resource_name": "mysite_vsg-2", 
-        "description": "Number of VCPUs", 
-        "resource": "075a3ae4-9e76-4198-8e6b-67c67b996746", 
-        "meter": "vcpus", 
-        "unit": "vcpu", 
-        "category": "Nova", 
-        "slice": "mysite_vsg", 
-        "name": "none", 
-        "service": "service_vsg", 
-        "value": 1.0, 
-        "time": "2016-02-17T22:19:00", 
-        "project_id": "718dd78532a24a74b0491437bbef398c"
-    }, 
-    {
-        "resource_name": "mysite_vsg-2", 
-        "description": "Number of read requests", 
-        "resource": "075a3ae4-9e76-4198-8e6b-67c67b996746", 
-        "meter": "disk.read.requests", 
-        "unit": "request", 
-        "category": "Nova", 
-        "slice": "mysite_vsg", 
-        "name": "none", 
-        "service": "service_vsg", 
-        "value": 10222.0, 
-        "time": "2016-02-17T22:19:00", 
-        "project_id": "718dd78532a24a74b0491437bbef398c"
-    }, 
-    {
-        "resource_name": "mysite_vsg-2", 
-        "description": "Number of write requests", 
-        "resource": "075a3ae4-9e76-4198-8e6b-67c67b996746", 
-        "meter": "disk.write.requests", 
-        "unit": "request", 
-        "category": "Nova", 
-        "slice": "mysite_vsg", 
-        "name": "none", 
-        "service": "service_vsg", 
-        "value": 38570.0, 
-        "time": "2016-02-17T22:19:00", 
-        "project_id": "718dd78532a24a74b0491437bbef398c"
-    }, 
-    {
-        "resource_name": "mysite_vsg-2", 
-        "description": "Volume of reads", 
-        "resource": "075a3ae4-9e76-4198-8e6b-67c67b996746", 
-        "meter": "disk.read.bytes", 
-        "unit": "B", 
-        "category": "Nova", 
-        "slice": "mysite_vsg", 
-        "name": "none", 
-        "service": "service_vsg", 
-        "value": 326340030.0, 
-        "time": "2016-02-17T22:19:00", 
-        "project_id": "718dd78532a24a74b0491437bbef398c"
-    }, 
-    {
-        "resource_name": "mysite_vsg-2", 
-        "description": "Volume of writes", 
-        "resource": "075a3ae4-9e76-4198-8e6b-67c67b996746", 
-        "meter": "disk.write.bytes", 
-        "unit": "B", 
-        "category": "Nova", 
-        "slice": "mysite_vsg", 
-        "name": "none", 
-        "service": "service_vsg", 
-        "value": 2818024448.0, 
-        "time": "2016-02-17T22:19:00", 
-        "project_id": "718dd78532a24a74b0491437bbef398c"
-    }, 
-    {
-        "resource_name": "mysite_vsg-2", 
-        "description": "Size of root disk", 
-        "resource": "075a3ae4-9e76-4198-8e6b-67c67b996746", 
-        "meter": "disk.root.size", 
-        "unit": "GB", 
-        "category": "Nova", 
-        "slice": "mysite_vsg", 
-        "name": "none", 
-        "service": "service_vsg", 
-        "value": 20.0, 
-        "time": "2016-02-17T22:19:00", 
-        "project_id": "718dd78532a24a74b0491437bbef398c"
-    }, 
-    {
-        "resource_name": "mysite_vsg-2", 
-        "description": "Size of ephemeral disk", 
-        "resource": "075a3ae4-9e76-4198-8e6b-67c67b996746", 
-        "meter": "disk.ephemeral.size", 
-        "unit": "GB", 
+        "resource_name": "vcpe-222-432-eth0", 
+        "resource": "vcpe-222-432-eth0", 
+        "description": "Average rate per sec of incoming bytes on a VM network interface", 
+        "resource_id": "vcpe-222-432-eth0", 
+        "meter": "network.incoming.bytes.rate", 
+        "unit": "B/s", 
         "category": "Nova", 
         "slice": "mysite_vsg", 
         "name": "none", 
         "service": "service_vsg", 
         "value": 0.0, 
-        "time": "2016-02-17T22:19:00", 
+        "time": "2016-02-24T01:19:25", 
+        "project_id": "718dd78532a24a74b0491437bbef398c"
+    }, 
+    {
+        "resource_name": "vcpe-222-432-eth0", 
+        "resource": "vcpe-222-432-eth0", 
+        "description": "Average rate per sec of outgoing bytes on a VM network interface", 
+        "resource_id": "vcpe-222-432-eth0", 
+        "meter": "network.outgoing.bytes.rate", 
+        "unit": "B/s", 
+        "category": "Nova", 
+        "slice": "mysite_vsg", 
+        "name": "none", 
+        "service": "service_vsg", 
+        "value": 0.00030304561114446413, 
+        "time": "2016-02-24T01:19:25", 
+        "project_id": "718dd78532a24a74b0491437bbef398c"
+    }, 
+    {
+        "resource_name": "vcpe-222-432-eth0", 
+        "resource": "vcpe-222-432-eth0", 
+        "description": "Average rate per sec of incoming packets on a VM network interface", 
+        "resource_id": "vcpe-222-432-eth0", 
+        "meter": "network.incoming.packets.rate", 
+        "unit": "packet/s", 
+        "category": "Nova", 
+        "slice": "mysite_vsg", 
+        "name": "none", 
+        "service": "service_vsg", 
+        "value": 0.0, 
+        "time": "2016-02-24T01:19:25", 
+        "project_id": "718dd78532a24a74b0491437bbef398c"
+    }, 
+    {
+        "resource_name": "vcpe-222-432-eth0", 
+        "resource": "vcpe-222-432-eth0", 
+        "description": "Average rate per sec of outgoing packets on a VM network interface", 
+        "resource_id": "vcpe-222-432-eth0", 
+        "meter": "network.outgoing.packets.rate", 
+        "unit": "packet/s", 
+        "category": "Nova", 
+        "slice": "mysite_vsg", 
+        "name": "none", 
+        "service": "service_vsg", 
+        "value": 4.714042840024997e-06, 
+        "time": "2016-02-24T01:19:25", 
+        "project_id": "718dd78532a24a74b0491437bbef398c"
+    },
+     {
+        "resource_name": "vcpe-222-432-eth1", 
+        "resource": "vcpe-222-432-eth1", 
+        "description": "Average rate per sec of incoming bytes on a VM network interface", 
+        "resource_id": "vcpe-222-432-eth1", 
+        "meter": "network.incoming.bytes.rate", 
+        "unit": "B/s", 
+        "category": "Nova", 
+        "slice": "mysite_vsg", 
+        "name": "none", 
+        "service": "service_vsg", 
+        "value": 0.0, 
+        "time": "2016-02-24T01:19:25", 
+        "project_id": "718dd78532a24a74b0491437bbef398c"
+    }, 
+    {
+        "resource_name": "vcpe-222-432-eth1", 
+        "resource": "vcpe-222-432-eth1", 
+        "description": "Average rate per sec of outgoing bytes on a VM network interface", 
+        "resource_id": "vcpe-222-432-eth1", 
+        "meter": "network.outgoing.bytes.rate", 
+        "unit": "B/s", 
+        "category": "Nova", 
+        "slice": "mysite_vsg", 
+        "name": "none", 
+        "service": "service_vsg", 
+        "value": 0.00030304561114446413, 
+        "time": "2016-02-24T01:19:25", 
+        "project_id": "718dd78532a24a74b0491437bbef398c"
+    }, 
+    {
+        "resource_name": "vcpe-222-432-eth1", 
+        "resource": "vcpe-222-432-eth1", 
+        "description": "Average rate per sec of incoming packets on a VM network interface", 
+        "resource_id": "vcpe-222-432-eth1", 
+        "meter": "network.incoming.packets.rate", 
+        "unit": "packet/s", 
+        "category": "Nova", 
+        "slice": "mysite_vsg", 
+        "name": "none", 
+        "service": "service_vsg", 
+        "value": 0.0, 
+        "time": "2016-02-24T01:19:25", 
+        "project_id": "718dd78532a24a74b0491437bbef398c"
+    }, 
+    {
+        "resource_name": "vcpe-222-432-eth1", 
+        "resource": "vcpe-222-432-eth1", 
+        "description": "Average rate per sec of outgoing packets on a VM network interface", 
+        "resource_id": "vcpe-222-432-eth1", 
+        "meter": "network.outgoing.packets.rate", 
+        "unit": "packet/s", 
+        "category": "Nova", 
+        "slice": "mysite_vsg", 
+        "name": "none", 
+        "service": "service_vsg", 
+        "value": 4.714042840024997e-06, 
+        "time": "2016-02-24T01:19:25", 
         "project_id": "718dd78532a24a74b0491437bbef398c"
     }
-]
\ No newline at end of file
+]