diff --git a/vitrage_dashboard/dashboard/static/dashboard/project/topology/graph.sample.json b/vitrage_dashboard/dashboard/static/dashboard/project/topology/graph.sample.json
index bd6d64e..5e01cbc 100644
--- a/vitrage_dashboard/dashboard/static/dashboard/project/topology/graph.sample.json
+++ b/vitrage_dashboard/dashboard/static/dashboard/project/topology/graph.sample.json
@@ -3,282 +3,303 @@
   "graph": {},
   "nodes": [
     {
-      "category": "RESOURCE",
+      "vitrage_category": "RESOURCE",
       "vitrage_is_placeholder": false,
       "vitrage_is_deleted": false,
       "name": "vm-8",
       "update_timestamp": "2015-12-01T12:46:41Z",
       "state": "ACTIVE",
       "project_id": "0683517e1e354d2ba25cba6937f44e79",
-      "type": "nova.instance",
+      "vitrage_type": "nova.instance",
       "id": "20d12a8a-ea9a-89c6-5947-83bea959362e",
       "vitrage_id": "RESOURCE:nova.instance:20d12a8a-ea9a-89c6-5947-83bea959362e",
-      "vitrage_aggregated_state": "RUNNING"
+      "vitrage_sample_timestamp": "2016-12-01T12:46:41Z"
     },
     {
-      "category": "RESOURCE",
+      "vitrage_category": "RESOURCE",
       "vitrage_is_placeholder": false,
       "vitrage_is_deleted": false,
       "name": "vm-2",
       "update_timestamp": "2015-12-01T12:46:41Z",
       "state": "ACTIVE",
       "project_id": "0683517e1e354d2ba25cba6937f44e79",
-      "type": "nova.instance",
+      "vitrage_type": "nova.instance",
       "id": "dc35fa2f-4515-1653-ef6b-03b471bb395b",
       "vitrage_id": "RESOURCE:nova.instance:dc35fa2f-4515-1653-ef6b-03b471bb395b",
-      "vitrage_aggregated_state": "RUNNING"
+      "vitrage_aggregated_state": "RUNNING",
+      "vitrage_sample_timestamp": "2016-12-01T12:46:41Z"
     },
     {
-      "category": "RESOURCE",
+      "vitrage_category": "RESOURCE",
       "vitrage_is_placeholder": false,
       "vitrage_is_deleted": false,
       "name": "vm-13",
       "update_timestamp": "2015-12-01T12:46:41Z",
       "state": "ACTIVE",
       "project_id": "0683517e1e354d2ba25cba6937f44e79",
-      "type": "nova.instance",
+      "vitrage_type": "nova.instance",
       "id": "9879cf5a-bdcf-3651-3017-961ed887ec86",
       "vitrage_id": "RESOURCE:nova.instance:9879cf5a-bdcf-3651-3017-961ed887ec86",
-      "vitrage_aggregated_state": "RUNNING"
+      "vitrage_aggregated_state": "RUNNING",
+      "vitrage_sample_timestamp": "2016-12-01T12:46:41Z"
     },
     {
-      "category": "RESOURCE",
+      "vitrage_category": "RESOURCE",
       "vitrage_is_placeholder": false,
       "vitrage_is_deleted": false,
       "name": "vm-10",
       "update_timestamp": "2015-12-01T12:46:41Z",
       "state": "ACTIVE",
       "project_id": "0683517e1e354d2ba25cba6937f44e79",
-      "type": "nova.instance",
+      "vitrage_type": "nova.instance",
       "id": "fe124f4b-9ed7-4591-fcd1-803cf5c33cb1",
       "vitrage_id": "RESOURCE:nova.instance:fe124f4b-9ed7-4591-fcd1-803cf5c33cb1",
-      "vitrage_aggregated_state": "RUNNING"
+      "vitrage_aggregated_state": "RUNNING",
+      "vitrage_sample_timestamp": "2016-12-01T12:46:41Z"
     },
     {
-      "category": "RESOURCE",
+      "vitrage_category": "RESOURCE",
       "vitrage_is_placeholder": false,
       "vitrage_is_deleted": false,
       "name": "vm-11",
       "update_timestamp": "2015-12-01T12:46:41Z",
       "state": "ACTIVE",
       "project_id": "0683517e1e354d2ba25cba6937f44e79",
-      "type": "nova.instance",
+      "vitrage_type": "nova.instance",
       "id": "f2e48a97-7350-061e-12d3-84c6dc3e67c0",
       "vitrage_id": "RESOURCE:nova.instance:f2e48a97-7350-061e-12d3-84c6dc3e67c0",
-      "vitrage_aggregated_state": "RUNNING"
+      "vitrage_aggregated_state": "RUNNING",
+      "vitrage_sample_timestamp": "2016-12-01T12:46:41Z"
     },
     {
-      "category": "RESOURCE",
+      "vitrage_category": "RESOURCE",
       "vitrage_is_placeholder": false,
       "vitrage_is_deleted": false,
       "name": "host-2",
       "update_timestamp": "2015-12-01T12:46:41Z",
       "state": "available",
-      "type": "nova.host",
+      "vitrage_type": "nova.host",
       "id": "host-2",
       "vitrage_id": "RESOURCE:nova.host:host-2",
-      "vitrage_aggregated_state": "RUNNING"
+      "vitrage_aggregated_state": "RUNNING",
+      "vitrage_sample_timestamp": "2016-12-01T12:46:41Z"
     },
     {
-      "category": "RESOURCE",
+      "vitrage_category": "RESOURCE",
       "vitrage_is_placeholder": false,
       "vitrage_is_deleted": false,
       "name": "host-3",
       "update_timestamp": "2015-12-01T12:46:41Z",
       "state": "available",
-      "type": "nova.host",
+      "vitrage_type": "nova.host",
       "id": "host-3",
       "vitrage_id": "RESOURCE:nova.host:host-3",
-      "vitrage_aggregated_state": "RUNNING"
+      "vitrage_aggregated_state": "RUNNING",
+      "vitrage_sample_timestamp": "2016-12-01T12:46:41Z"
     },
     {
-      "category": "RESOURCE",
+      "vitrage_category": "RESOURCE",
       "vitrage_is_placeholder": false,
       "vitrage_is_deleted": false,
       "name": "host-0",
       "update_timestamp": "2015-12-01T12:46:41Z",
       "state": "available",
-      "type": "nova.host",
+      "vitrage_type": "nova.host",
       "id": "host-0",
       "vitrage_id": "RESOURCE:nova.host:host-0",
-      "vitrage_aggregated_state": "RUNNING"
+      "vitrage_aggregated_state": "RUNNING",
+      "vitrage_sample_timestamp": "2016-12-01T12:46:41Z"
     },
     {
-      "category": "RESOURCE",
+      "vitrage_category": "RESOURCE",
       "vitrage_is_placeholder": false,
       "vitrage_is_deleted": false,
       "name": "host-1",
       "update_timestamp": "2015-12-01T12:46:41Z",
       "state": "available",
-      "type": "nova.host",
+      "vitrage_type": "nova.host",
       "id": "host-1",
       "vitrage_id": "RESOURCE:nova.host:host-1",
-      "vitrage_aggregated_state": "RUNNING"
+      "vitrage_aggregated_state": "RUNNING",
+      "vitrage_sample_timestamp": "2016-12-01T12:46:41Z"
     },
     {
-      "category": "RESOURCE",
+      "vitrage_category": "RESOURCE",
       "vitrage_is_placeholder": false,
       "vitrage_is_deleted": false,
       "name": "vm-9",
       "update_timestamp": "2015-12-01T12:46:41Z",
       "state": "ACTIVE",
       "project_id": "0683517e1e354d2ba25cba6937f44e79",
-      "type": "nova.instance",
+      "vitrage_type": "nova.instance",
       "id": "275097cf-954e-8e24-b185-9514e24b8591",
       "vitrage_id": "RESOURCE:nova.instance:275097cf-954e-8e24-b185-9514e24b8591",
-      "vitrage_aggregated_state": "RUNNING"
+      "vitrage_aggregated_state": "RUNNING",
+      "vitrage_sample_timestamp": "2016-12-01T12:46:41Z"
     },
     {
-      "category": "RESOURCE",
+      "vitrage_category": "RESOURCE",
       "vitrage_is_placeholder": false,
       "vitrage_is_deleted": false,
       "name": "vm-1",
       "update_timestamp": "2015-12-01T12:46:41Z",
       "state": "ACTIVE",
       "project_id": "0683517e1e354d2ba25cba6937f44e79",
-      "type": "nova.instance",
+      "vitrage_type": "nova.instance",
       "id": "a0f0805f-c804-cffe-c25a-1b38f555ed68",
       "vitrage_id": "RESOURCE:nova.instance:a0f0805f-c804-cffe-c25a-1b38f555ed68",
-      "vitrage_aggregated_state": "RUNNING"
+      "vitrage_aggregated_state": "RUNNING",
+      "vitrage_sample_timestamp": "2016-12-01T12:46:41Z"
     },
     {
-      "category": "RESOURCE",
+      "vitrage_category": "RESOURCE",
       "vitrage_is_placeholder": false,
       "vitrage_is_deleted": false,
       "name": "vm-14",
       "update_timestamp": "2015-12-01T12:46:41Z",
       "state": "ACTIVE",
       "project_id": "0683517e1e354d2ba25cba6937f44e79",
-      "type": "nova.instance",
+      "vitrage_type": "nova.instance",
       "id": "56af57d2-34a4-19b1-5106-b613637a11a7",
       "vitrage_id": "RESOURCE:nova.instance:56af57d2-34a4-19b1-5106-b613637a11a7",
-      "vitrage_aggregated_state": "RUNNING"
+      "vitrage_aggregated_state": "RUNNING",
+      "vitrage_sample_timestamp": "2016-12-01T12:46:41Z"
     },
     {
-      "category": "RESOURCE",
+      "vitrage_category": "RESOURCE",
       "vitrage_is_placeholder": false,
       "vitrage_is_deleted": false,
       "name": "zone-1",
       "update_timestamp": "2015-12-01T12:46:41Z",
       "state": "available",
-      "type": "nova.zone",
+      "vitrage_type": "nova.zone",
       "id": "zone-1",
       "vitrage_id": "RESOURCE:nova.zone:zone-1",
-      "vitrage_aggregated_state": "RUNNING"
+      "vitrage_aggregated_state": "RUNNING",
+      "vitrage_sample_timestamp": "2016-12-01T12:46:41Z"
     },
     {
-      "category": "RESOURCE",
+      "vitrage_category": "RESOURCE",
       "vitrage_is_placeholder": false,
       "vitrage_is_deleted": false,
       "name": "vm-3",
       "update_timestamp": "2015-12-01T12:46:41Z",
       "state": "ACTIVE",
       "project_id": "0683517e1e354d2ba25cba6937f44e79",
-      "type": "nova.instance",
+      "vitrage_type": "nova.instance",
       "id": "16e14c58-d254-2bec-53e4-c766e48810aa",
       "vitrage_id": "RESOURCE:nova.instance:16e14c58-d254-2bec-53e4-c766e48810aa",
-      "vitrage_aggregated_state": "RUNNING"
+      "vitrage_aggregated_state": "RUNNING",
+      "vitrage_sample_timestamp": "2016-12-01T12:46:41Z"
     },
     {
-      "category": "RESOURCE",
+      "vitrage_category": "RESOURCE",
       "vitrage_is_placeholder": false,
       "vitrage_is_deleted": false,
       "name": "vm-7",
       "update_timestamp": "2015-12-01T12:46:41Z",
       "state": "SUSPENDED",
       "project_id": "0683517e1e354d2ba25cba6937f44e79",
-      "type": "nova.instance",
+      "vitrage_type": "nova.instance",
       "id": "f35a1e10-74ff-7332-8edf-83cd6ffcb2de",
       "vitrage_id": "RESOURCE:nova.instance:f35a1e10-74ff-7332-8edf-83cd6ffcb2de",
-      "vitrage_aggregated_state": "SUSPENDED"
+      "vitrage_aggregated_state": "SUSPENDED",
+      "vitrage_sample_timestamp": "2016-12-01T12:46:41Z"
     },
     {
-      "category": "RESOURCE",
+      "vitrage_category": "RESOURCE",
       "vitrage_is_placeholder": false,
       "vitrage_is_deleted": false,
       "name": "vm-4",
       "update_timestamp": "2015-12-01T12:46:41Z",
       "state": "ACTIVE",
       "project_id": "0683517e1e354d2ba25cba6937f44e79",
-      "type": "nova.instance",
+      "vitrage_type": "nova.instance",
       "id": "ea8a450e-cab1-2272-f431-494b40c5c378",
       "vitrage_id": "RESOURCE:nova.instance:ea8a450e-cab1-2272-f431-494b40c5c378",
-      "vitrage_aggregated_state": "RUNNING"
+      "vitrage_aggregated_state": "RUNNING",
+      "vitrage_sample_timestamp": "2016-12-01T12:46:41Z"
     },
     {
-      "category": "RESOURCE",
+      "vitrage_category": "RESOURCE",
       "vitrage_is_placeholder": false,
       "vitrage_is_deleted": false,
       "name": "vm-6",
       "update_timestamp": "2015-12-01T12:46:41Z",
       "state": "ACTIVE",
       "project_id": "0683517e1e354d2ba25cba6937f44e79",
-      "type": "nova.instance",
+      "vitrage_type": "nova.instance",
       "id": "6e42bdc3-b776-1b2c-2c7d-b7a8bb98f721",
       "vitrage_id": "RESOURCE:nova.instance:6e42bdc3-b776-1b2c-2c7d-b7a8bb98f721",
-      "vitrage_aggregated_state": "RUNNING"
+      "vitrage_aggregated_state": "RUNNING",
+      "vitrage_sample_timestamp": "2016-12-01T12:46:41Z"
     },
     {
-      "category": "RESOURCE",
+      "vitrage_category": "RESOURCE",
       "vitrage_is_placeholder": false,
       "vitrage_is_deleted": false,
       "name": "vm-5",
       "update_timestamp": "2015-12-01T12:46:41Z",
       "state": "ACTIVE",
       "project_id": "0683517e1e354d2ba25cba6937f44e79",
-      "type": "nova.instance",
+      "vitrage_type": "nova.instance",
       "id": "8c951613-c660-87c0-c18b-0fa3293ce8d8",
       "vitrage_id": "RESOURCE:nova.instance:8c951613-c660-87c0-c18b-0fa3293ce8d8",
-      "vitrage_aggregated_state": "RUNNING"
+      "vitrage_aggregated_state": "RUNNING",
+      "vitrage_sample_timestamp": "2016-12-01T12:46:41Z"
     },
     {
-      "category": "RESOURCE",
+      "vitrage_category": "RESOURCE",
       "vitrage_is_placeholder": false,
       "vitrage_is_deleted": false,
       "name": "zone-0",
       "update_timestamp": "2015-12-01T12:46:41Z",
       "state": "available",
-      "type": "nova.zone",
+      "vitrage_type": "nova.zone",
       "id": "zone-0",
       "vitrage_id": "RESOURCE:nova.zone:zone-0",
-      "vitrage_aggregated_state": "RUNNING"
+      "vitrage_aggregated_state": "RUNNING",
+      "vitrage_sample_timestamp": "2016-12-01T12:46:41Z"
     },
     {
-      "category": "RESOURCE",
+      "vitrage_category": "RESOURCE",
       "vitrage_is_placeholder": false,
       "vitrage_is_deleted": false,
       "name": "vm-0",
       "update_timestamp": "2015-12-01T12:46:41Z",
       "state": "ERROR",
       "project_id": "0683517e1e354d2ba25cba6937f44e79",
-      "type": "nova.instance",
+      "vitrage_type": "nova.instance",
       "id": "78353ce4-2710-49b5-1341-b8cbb6000ebc",
       "vitrage_id": "RESOURCE:nova.instance:78353ce4-2710-49b5-1341-b8cbb6000ebc",
-      "vitrage_aggregated_state": "ERROR"
+      "vitrage_aggregated_state": "ERROR",
+      "vitrage_sample_timestamp": "2016-12-01T12:46:41Z"
     },
     {
-      "category": "RESOURCE",
+      "vitrage_category": "RESOURCE",
       "vitrage_is_placeholder": false,
       "vitrage_is_deleted": false,
       "name": "vm-12",
       "update_timestamp": "2015-12-01T12:46:41Z",
       "state": "PAUSED",
       "project_id": "0683517e1e354d2ba25cba6937f44e79",
-      "type": "nova.instance",
+      "vitrage_type": "nova.instance",
       "id": "35bf479a-75d9-80a9-874e-d3b50fb2dd2e",
       "vitrage_id": "RESOURCE:nova.instance:35bf479a-75d9-80a9-874e-d3b50fb2dd2e",
-      "vitrage_aggregated_state": "SUSPENDED"
+      "vitrage_aggregated_state": "SUSPENDED",
+      "vitrage_sample_timestamp": "2016-12-01T12:46:41Z"
     },
     {
-      "category": "RESOURCE",
+      "vitrage_category": "RESOURCE",
       "vitrage_is_placeholder": false,
       "vitrage_is_deleted": false,
       "name": "openstack.node",
-      "type": "openstack.node",
+      "vitrage_type": "openstack.node",
       "id": "openstack.node",
       "vitrage_id": "RESOURCE:openstack.node",
       "state": "available",
-      "vitrage_aggregated_state": "RUNNING"
+      "vitrage_aggregated_state": "RUNNING",
+      "vitrage_sample_timestamp": "2016-12-01T12:46:41Z"
     }
   ],
   "links": [