diff --git a/README.md b/README.md
index 20569d435f3..521f447f704 100644
--- a/README.md
+++ b/README.md
@@ -91,6 +91,8 @@ Where pod.json contains something like:
 ```
 {
   "id": "php",
+  "kind": "Pod",
+  "apiVersion": "v1beta1",
   "desiredState": {
     "manifest": {
       "version": "v1beta1",
diff --git a/api/examples/controller-list.json b/api/examples/controller-list.json
index c3c1d969d2c..4cadf176865 100644
--- a/api/examples/controller-list.json
+++ b/api/examples/controller-list.json
@@ -1,4 +1,6 @@
 {
+    "kind": "ReplicationControllerList",
+    "apiVersion": "v1beta1",
     "items": [
         {
             "id": "testRun",
@@ -30,4 +32,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/api/examples/controller.json b/api/examples/controller.json
index ea04e69d283..d385569898b 100644
--- a/api/examples/controller.json
+++ b/api/examples/controller.json
@@ -1,6 +1,7 @@
   {
     "id": "nginxController",
     "apiVersion": "v1beta1",
+    "kind": "ReplicationController",
     "desiredState": {
       "replicas": 2,
       "replicaSelector": {"name": "nginx"},
diff --git a/api/examples/external-service.json b/api/examples/external-service.json
index e841b2e946b..95d796e5049 100644
--- a/api/examples/external-service.json
+++ b/api/examples/external-service.json
@@ -1,5 +1,7 @@
 {
   "id": "example",
+  "kind": "Service",
+  "apiVersion": "v1beta1",
   "port": 8000,
   "labels": {
      "name": "nginx"
diff --git a/api/examples/pod-list.json b/api/examples/pod-list.json
index e9259424929..ea6f9f874e9 100644
--- a/api/examples/pod-list.json
+++ b/api/examples/pod-list.json
@@ -1,4 +1,6 @@
 {
+    "kind": "PodList",
+    "apiVersion": "v1beta1",
     "items": [
         {
             "id": "my-pod-1",
diff --git a/api/examples/pod.json b/api/examples/pod.json
index 5ab5bc461ae..f3157ad3f31 100644
--- a/api/examples/pod.json
+++ b/api/examples/pod.json
@@ -1,4 +1,6 @@
 {
+  "kind": "Pod",
+  "apiVersion": "v1beta1",
   "id": "php",
   "desiredState": {
     "manifest": {
diff --git a/api/examples/service-list.json b/api/examples/service-list.json
index 87aff593817..1ac2963b164 100644
--- a/api/examples/service-list.json
+++ b/api/examples/service-list.json
@@ -1,4 +1,6 @@
 {
+    "kind": "ServiceList",
+    "apiVersion": "v1beta1",
     "items": [
         {
             "id": "example1",
diff --git a/api/examples/service.json b/api/examples/service.json
index f9616e62813..f4ae8993db3 100644
--- a/api/examples/service.json
+++ b/api/examples/service.json
@@ -1,4 +1,6 @@
 {
+  "kind": "Service",
+  "apiVersion": "v1beta1",
   "id": "example",
   "port": 8000,
   "labels": {
diff --git a/examples/guestbook/frontend-controller.json b/examples/guestbook/frontend-controller.json
index 9302f560a43..c98c26b0731 100644
--- a/examples/guestbook/frontend-controller.json
+++ b/examples/guestbook/frontend-controller.json
@@ -1,5 +1,7 @@
   {
     "id": "frontendController",
+    "kind": "ReplicationController",
+    "apiVersion": "v1beta1",
     "desiredState": {
       "replicas": 3,
       "replicaSelector": {"name": "frontend"},
diff --git a/examples/guestbook/frontend-service.json b/examples/guestbook/frontend-service.json
index 11d4bba1777..3c49cc59d35 100644
--- a/examples/guestbook/frontend-service.json
+++ b/examples/guestbook/frontend-service.json
@@ -1,5 +1,7 @@
 {
   "id": "frontend",
+  "kind": "Service",
+  "apiVersion": "v1beta1",
   "port": 9998,
   "selector": {
     "name": "frontend"
diff --git a/examples/guestbook/redis-master-service.json b/examples/guestbook/redis-master-service.json
index 5d79ea37fdd..a66dd9be7bc 100644
--- a/examples/guestbook/redis-master-service.json
+++ b/examples/guestbook/redis-master-service.json
@@ -1,5 +1,7 @@
 {
   "id": "redismaster",
+  "kind": "Service",
+  "apiVersion": "v1beta1",
   "port": 10000,
   "selector": {
     "name": "redis-master"
diff --git a/examples/guestbook/redis-master.json b/examples/guestbook/redis-master.json
index 355f4413458..313f9c4e06c 100644
--- a/examples/guestbook/redis-master.json
+++ b/examples/guestbook/redis-master.json
@@ -1,5 +1,7 @@
 {
   "id": "redis-master-2",
+  "kind": "Pod",
+  "apiVersion": "v1beta1",
   "desiredState": {
     "manifest": {
       "version": "v1beta1",
diff --git a/examples/guestbook/redis-slave-controller.json b/examples/guestbook/redis-slave-controller.json
index cfee708a99a..1f0db5f06f5 100644
--- a/examples/guestbook/redis-slave-controller.json
+++ b/examples/guestbook/redis-slave-controller.json
@@ -1,5 +1,7 @@
   {
     "id": "redisSlaveController",
+    "kind": "ReplicationController",
+    "apiVersion": "v1beta1",
     "desiredState": {
       "replicas": 2,
       "replicaSelector": {"name": "redisslave"},
diff --git a/examples/guestbook/redis-slave-service.json b/examples/guestbook/redis-slave-service.json
index b317ae856e6..5525b6314ce 100644
--- a/examples/guestbook/redis-slave-service.json
+++ b/examples/guestbook/redis-slave-service.json
@@ -1,5 +1,7 @@
 {
   "id": "redisslave",
+  "kind": "Service",
+  "apiVersion": "v1beta1",
   "port": 10001,
   "labels": {
     "name": "redisslave"