diff --git a/packet_references/data_packet.json b/packet_references/data_packet.json
index 76ef994..65ab16c 100644
--- a/packet_references/data_packet.json
+++ b/packet_references/data_packet.json
@@ -1,28 +1,33 @@
 {
-    "type": "data",
-    "id": "000000000",
-    "timestamp": "1549829742",
-    "payload": {
-        "oil.temp": [
-            { "1549829742": "21" },
-            { "1549829802": "24" },
-            { "1549829862": "18" },
-            { "1549829922": "30" },
-            { "1549829982": "25" }
-        ],
-        "air.temp": [
-            { "1549829742": "21" },
-            { "1549829802": "24" },
-            { "1549829862": "18" },
-            { "1549829922": "30" },
-            { "1549829982": "25" }
-        ],
-        "fuel.temp": [
-            { "1549829742": "21" },
-            { "1549829802": "24" },
-            { "1549829862": "18" },
-            { "1549829922": "30" },
-            { "1549829982": "25" }
-        ]
+    "url": "data",
+    "headers": {
+        "serial": "123abc456def",
+        "timestamp": "1549829742"
+    },
+    "body": {
+        "metrics": ["oil.temp", "air.temp", "fuel.temp"],
+        "data": {
+            "oil.temp": [
+                { "1549829742": "21" },
+                { "1549829802": "24" },
+                { "1549829862": "18" },
+                { "1549829922": "30" },
+                { "1549829982": "25" }
+            ],
+            "air.temp": [
+                { "1549829742": "21" },
+                { "1549829802": "24" },
+                { "1549829862": "18" },
+                { "1549829922": "30" },
+                { "1549829982": "25" }
+            ],
+            "fuel.temp": [
+                { "1549829742": "21" },
+                { "1549829802": "24" },
+                { "1549829862": "18" },
+                { "1549829922": "30" },
+                { "1549829982": "25" }
+            ]
+        }
     }
 }
\ No newline at end of file
diff --git a/packet_references/data_response.json b/packet_references/data_response.json
index b3ee4bf..39b211b 100644
--- a/packet_references/data_response.json
+++ b/packet_references/data_response.json
@@ -1,8 +1,8 @@
 {
-    "type": "data",
-    "id": "000000000",
-    "timestamp": "1549829742",
-    "response": {
-        "status": "accepted"
-    }
+    "url": "data",
+    "params": {
+        "serial": "123abc456def",
+        "timestamp": "1549829742"
+    },
+    "body": "ingested"
 }
\ No newline at end of file
diff --git a/packet_references/heartbeat_packet.json b/packet_references/heartbeat_packet.json
index c469a49..c2adfc4 100644
--- a/packet_references/heartbeat_packet.json
+++ b/packet_references/heartbeat_packet.json
@@ -1,8 +1,8 @@
 {
-    "type": "heartbeat",
-    "id": "000000000",
-    "timestamp": "1549829742",
-    "payload": {
-        "message": "marco"
-    }
+    "url": "heartbeat",
+    "headers": {
+        "serial": "123abc456def",
+        "timestamp": "1549829742"
+    },
+    "body": "marco"
 }
\ No newline at end of file
diff --git a/packet_references/heartbeat_response.json b/packet_references/heartbeat_response.json
index 3798bce..6fbabe1 100644
--- a/packet_references/heartbeat_response.json
+++ b/packet_references/heartbeat_response.json
@@ -1,8 +1,8 @@
 {
-    "type": "heartbeat",
-    "id": "000000000",
-    "timestamp": "1549829742",
-    "response": {
-        "message": "polo"
-    }
+    "url": "heartbeat",
+    "headers": {
+        "serial": "123abc456def",
+        "timestamp": "1549829742"
+    },
+    "body": "polo"
 }
\ No newline at end of file
diff --git a/packet_references/notification_packet.json b/packet_references/notification_packet.json
index 8f2f334..692d1d9 100644
--- a/packet_references/notification_packet.json
+++ b/packet_references/notification_packet.json
@@ -1,12 +1,10 @@
 {
-    "type": "notification",
-    "id": "000000000",
-    "timestamp": "1549829742",
-    "identity": {
-        "owner_id": "1",
-        "region": "east"
+    "url": "notification",
+    "headers": {
+        "serial": "123abc456def",
+        "timestamp": "1549829742"
     },
-    "payload": {
+    "body": {
         "code": 0,
         "severity": 3,
         "message": "Notification Text"
diff --git a/packet_references/notification_response.json b/packet_references/notification_response.json
index 9c3ec8e..fe5061a 100644
--- a/packet_references/notification_response.json
+++ b/packet_references/notification_response.json
@@ -1,8 +1,8 @@
 {
-    "type": "notification",
-    "id": "000000000",
-    "timestamp": "1549829742",
-    "response": {
-        "status": "accepted"
-    }
+    "url": "notification",
+    "headers": {
+        "serial": "123abc456def",
+        "timestamp": "1549829742"
+    },
+    "body": "acknowledged"
 }
\ No newline at end of file
diff --git a/packet_references/registration_packet.json b/packet_references/registration_packet.json
index a7a4fa5..b5733cc 100644
--- a/packet_references/registration_packet.json
+++ b/packet_references/registration_packet.json
@@ -1,7 +1,8 @@
 {
-    "type": "registration",
-    "timestamp": "1549829742",
-    "payload": {
-        "serial": "123abc456def"
-    }
+    "url": "registration",
+    "headers": {
+        "serial": "123abc456def",
+        "timestamp": "1549829742"
+    },
+    "body": {}
 }
\ No newline at end of file
diff --git a/packet_references/registration_response.json b/packet_references/registration_response.json
index d645fed..b01a9c8 100644
--- a/packet_references/registration_response.json
+++ b/packet_references/registration_response.json
@@ -1,10 +1,8 @@
 {
-    "type": "registration",
-    "id": "000000000",
-    "timestamp": "1549829742",
-    "response": {
-        "region": "east",
-        "generator_id": "000000000",
-        "owner_id": "1"
-    }
+    "url": "registration",
+    "headers": {
+        "serial": "123abc456def",
+        "timestamp": "1549829742"
+    },
+    "body": "mapped"
 }
\ No newline at end of file