diff --git a/FIWARE IoT Agent.postman_collection.json b/FIWARE IoT Agent.postman_collection.json
index b9ecf43..9b5f712 100644
--- a/FIWARE IoT Agent.postman_collection.json	
+++ b/FIWARE IoT Agent.postman_collection.json	
@@ -92,7 +92,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\n \"devices\": [\n   {\n     \"device_id\":   \"motion001\",\n     \"entity_name\": \"urn:ngsi-ld:Motion:001\",\n     \"entity_type\": \"Motion\",\n     \"timezone\":    \"Europe/Berlin\",\n     \"attributes\": [\n       { \"object_id\": \"c\", \"name\": \"count\", \"type\": \"Integer\" }\n     ],\n     \"static_attributes\": [\n       { \"name\":\"refStore\", \"type\": \"Relationship\", \"value\": \"urn:ngsi-ld:Store:001\"}\n     ]\n   }\n ]\n}"
+							"raw": "{\n \"devices\": [\n   {\n     \"device_id\":   \"motion001\",\n     \"entity_name\": \"urn:ngsi-ld:Motion:001\",\n     \"entity_type\": \"Motion\",\n     \"apikey\":      \"4jggokgpepnvsb2uv4s40d59ov\",\n     \"timezone\":    \"Europe/Berlin\",\n     \"attributes\": [\n       { \"object_id\": \"c\", \"name\": \"count\", \"type\": \"Integer\" }\n     ],\n     \"static_attributes\": [\n       { \"name\":\"refStore\", \"type\": \"Relationship\", \"value\": \"urn:ngsi-ld:Store:001\"}\n     ]\n   }\n ]\n}"
 						},
 						"url": {
 							"raw": "http://{{iot-agent}}/iot/devices",
@@ -199,7 +199,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\n  \"devices\": [\n    {\n      \"device_id\": \"bell001\",\n      \"entity_name\": \"urn:ngsi-ld:Bell:001\",\n      \"entity_type\": \"Bell\",\n      \"protocol\": \"PDI-IoTA-UltraLight\",\n      \"transport\": \"HTTP\",\n      \"endpoint\": \"http://context-provider:3001/iot/bell001\",\n      \"commands\": [ \n        {\n          \"name\": \"ring\",\n          \"type\": \"command\"\n        }\n       ],\n       \"static_attributes\": [\n         {\"name\":\"refStore\", \"type\": \"Relationship\",\"value\": \"urn:ngsi-ld:Store:001\"}\n    \t]\n    }\n  ]\n}\n"
+							"raw": "{\n  \"devices\": [\n    {\n      \"device_id\": \"bell001\",\n      \"entity_name\": \"urn:ngsi-ld:Bell:001\",\n      \"entity_type\": \"Bell\",\n      \"apikey\":      \"4jggokgpepnvsb2uv4s40d59ov\",\n      \"protocol\": \"PDI-IoTA-UltraLight\",\n      \"transport\": \"HTTP\",\n      \"endpoint\": \"http://context-provider:3001/iot/bell001\",\n      \"commands\": [ \n        {\n          \"name\": \"ring\",\n          \"type\": \"command\"\n        }\n       ],\n       \"static_attributes\": [\n         {\"name\":\"refStore\", \"type\": \"Relationship\",\"value\": \"urn:ngsi-ld:Store:001\"}\n    \t]\n    }\n  ]\n}\n"
 						},
 						"url": {
 							"raw": "http://{{iot-agent}}/iot/devices",
@@ -236,7 +236,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\n    \"devices\": [\n        {\n            \"device_id\": \"bell002\",\n            \"entity_name\": \"urn:ngsi-ld:Bell:002\",\n            \"entity_type\": \"Bell\",\n            \"protocol\": \"PDI-IoTA-UltraLight\",\n            \"transport\": \"HTTP\",\n            \"endpoint\": \"http://context-provider:3001/iot/bell002\",\n            \"attributes\": [\n                {\n                    \"name\": \"ring\",\n                    \"type\": \"Text\",\n                    \"expression\": \"ring\",\n                    \"reverse\": [\n                        {\n                            \"object_id\": \"ring\",\n                            \"type\": \"Text\",\n                            \"expression\": \"ring | toString()\"\n                        }\n                    ]\n                }\n            ],\n            \"static_attributes\": [\n                {\n                    \"name\": \"refStore\",\n                    \"type\": \"Relationship\",\n                    \"value\": \"urn:ngsi-ld:Store:002\"\n                }\n            ]\n        }\n    ]\n}"
+							"raw": "{\n    \"devices\": [\n        {\n            \"device_id\": \"bell002\",\n            \"entity_name\": \"urn:ngsi-ld:Bell:002\",\n            \"entity_type\": \"Bell\",\n            \"apikey\":      \"4jggokgpepnvsb2uv4s40d59ov\",\n            \"protocol\": \"PDI-IoTA-UltraLight\",\n            \"transport\": \"HTTP\",\n            \"endpoint\": \"http://context-provider:3001/iot/bell002\",\n            \"attributes\": [\n                {\n                    \"name\": \"ring\",\n                    \"type\": \"Text\",\n                    \"expression\": \"ring\",\n                    \"reverse\": [\n                        {\n                            \"object_id\": \"ring\",\n                            \"type\": \"Text\",\n                            \"expression\": \"ring | toString()\"\n                        }\n                    ]\n                }\n            ],\n            \"static_attributes\": [\n                {\n                    \"name\": \"refStore\",\n                    \"type\": \"Relationship\",\n                    \"value\": \"urn:ngsi-ld:Store:002\"\n                }\n            ]\n        }\n    ]\n}"
 						},
 						"url": {
 							"raw": "http://{{iot-agent}}/iot/devices",
@@ -351,7 +351,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\n  \"devices\": [\n    {\n      \"device_id\": \"door001\",\n      \"entity_name\": \"urn:ngsi-ld:Door:001\",\n      \"entity_type\": \"Door\",\n      \"protocol\": \"PDI-IoTA-UltraLight\",\n      \"transport\": \"HTTP\",\n      \"endpoint\": \"http://context-provider:3001/iot/door001\",\n      \"commands\": [ \n        {\"name\": \"unlock\",\"type\": \"command\"},\n        {\"name\": \"open\",\"type\": \"command\"},\n        {\"name\": \"close\",\"type\": \"command\"},\n        {\"name\": \"lock\",\"type\": \"command\"}\n       ],\n       \"attributes\": [\n       \t{\"object_id\": \"s\", \"name\": \"state\", \"type\":\"Text\"}\n       ],\n       \"static_attributes\": [\n         {\"name\":\"refStore\", \"type\": \"Relationship\",\"value\": \"urn:ngsi-ld:Store:001\"}\n       ]\n    }\n  ]\n}\n"
+							"raw": "{\n  \"devices\": [\n    {\n      \"device_id\": \"door001\",\n      \"entity_name\": \"urn:ngsi-ld:Door:001\",\n      \"entity_type\": \"Door\",\n      \"apikey\":      \"4jggokgpepnvsb2uv4s40d59ov\",\n      \"protocol\": \"PDI-IoTA-UltraLight\",\n      \"transport\": \"HTTP\",\n      \"endpoint\": \"http://context-provider:3001/iot/door001\",\n      \"commands\": [ \n        {\"name\": \"unlock\",\"type\": \"command\"},\n        {\"name\": \"open\",\"type\": \"command\"},\n        {\"name\": \"close\",\"type\": \"command\"},\n        {\"name\": \"lock\",\"type\": \"command\"}\n       ],\n       \"attributes\": [\n       \t{\"object_id\": \"s\", \"name\": \"state\", \"type\":\"Text\"}\n       ],\n       \"static_attributes\": [\n         {\"name\":\"refStore\", \"type\": \"Relationship\",\"value\": \"urn:ngsi-ld:Store:001\"}\n       ]\n    }\n  ]\n}\n"
 						},
 						"url": {
 							"raw": "http://{{iot-agent}}/iot/devices",
@@ -388,7 +388,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\n  \"devices\": [\n    {\n      \"device_id\": \"lamp001\",\n      \"entity_name\": \"urn:ngsi-ld:Lamp:001\",\n      \"entity_type\": \"Lamp\",\n      \"protocol\": \"PDI-IoTA-UltraLight\",\n      \"transport\": \"HTTP\",\n      \"endpoint\": \"http://context-provider:3001/iot/lamp001\",\n      \"commands\": [ \n        {\"name\": \"on\",\"type\": \"command\"},\n        {\"name\": \"off\",\"type\": \"command\"}\n       ],\n       \"attributes\": [\n       \t{\"object_id\": \"s\", \"name\": \"state\", \"type\":\"Text\"},\n        {\"object_id\": \"l\", \"name\": \"luminosity\", \"type\":\"Integer\"}\n       ],\n       \"static_attributes\": [\n         {\"name\":\"refStore\", \"type\": \"Relationship\",\"value\": \"urn:ngsi-ld:Store:001\"}\n    \t]\n    }\n  ]\n}\n"
+							"raw": "{\n  \"devices\": [\n    {\n      \"device_id\": \"lamp001\",\n      \"entity_name\": \"urn:ngsi-ld:Lamp:001\",\n      \"entity_type\": \"Lamp\",\n      \"apikey\":      \"4jggokgpepnvsb2uv4s40d59ov\",\n      \"protocol\": \"PDI-IoTA-UltraLight\",\n      \"transport\": \"HTTP\",\n      \"endpoint\": \"http://context-provider:3001/iot/lamp001\",\n      \"commands\": [ \n        {\"name\": \"on\",\"type\": \"command\"},\n        {\"name\": \"off\",\"type\": \"command\"}\n       ],\n       \"attributes\": [\n       \t{\"object_id\": \"s\", \"name\": \"state\", \"type\":\"Text\"},\n        {\"object_id\": \"l\", \"name\": \"luminosity\", \"type\":\"Integer\"}\n       ],\n       \"static_attributes\": [\n         {\"name\":\"refStore\", \"type\": \"Relationship\",\"value\": \"urn:ngsi-ld:Store:001\"}\n    \t]\n    }\n  ]\n}\n"
 						},
 						"url": {
 							"raw": "http://{{iot-agent}}/iot/devices",
@@ -1020,8 +1020,8 @@
 							},
 							{
 								"key": "Content-Type",
-								"name": "Content-Type",
 								"value": "application/x-www-form-urlencoded",
+								"name": "Content-Type",
 								"type": "text"
 							}
 						],
@@ -1217,7 +1217,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\n  \"devices\": [\n    {\n      \"device_id\": \"bell002\",\n      \"entity_name\": \"urn:ngsi-ld:Bell:002\",\n      \"entity_type\": \"Bell\",\n      \"protocol\": \"PDI-IoTA-UltraLight\",\n      \"transport\": \"HTTP\",\n      \"endpoint\": \"http://context-provider:3001/iot/bell002\",\n      \"commands\": [ \n        {\n          \"name\": \"ring\",\n          \"type\": \"command\"\n        }\n       ],\n       \"static_attributes\": [\n         {\"name\":\"refStore\", \"type\": \"Relationship\",\"value\": \"urn:ngsi-ld:Store:002\"}\n    \t]\n    }\n  ]\n}\n"
+							"raw": "{\n    \"devices\": [\n        {\n            \"device_id\": \"bell002\",\n            \"entity_name\": \"urn:ngsi-ld:Bell:002\",\n            \"entity_type\": \"Bell\",\n            \"apikey\": \"4jggokgpepnvsb2uv4s40d59ov\",\n            \"protocol\": \"PDI-IoTA-UltraLight\",\n            \"transport\": \"HTTP\",\n            \"endpoint\": \"http://context-provider:3001/iot/bell002\",\n            \"commands\": [\n                {\n                    \"name\": \"ring\",\n                    \"type\": \"command\"\n                }\n            ],\n            \"static_attributes\": [\n                {\n                    \"name\": \"refStore\",\n                    \"type\": \"Relationship\",\n                    \"value\": \"urn:ngsi-ld:Store:002\"\n                }\n            ]\n        }\n    ]\n}"
 						},
 						"url": {
 							"raw": "http://{{iot-agent}}/iot/devices",
diff --git a/README.ja.md b/README.ja.md
index 6a7220b..4d6b4b7 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -656,6 +656,7 @@ curl -iX POST \
      "device_id":   "motion001",
      "entity_name": "urn:ngsi-ld:Motion:001",
      "entity_type": "Motion",
+     "apikey":      "4jggokgpepnvsb2uv4s40d59ov",
      "timezone":    "Europe/Berlin",
      "attributes": [
        { "object_id": "c", "name": "count", "type": "Integer" }
@@ -800,6 +801,7 @@ curl -iX POST \
       "device_id": "bell001",
       "entity_name": "urn:ngsi-ld:Bell:001",
       "entity_type": "Bell",
+      "apikey":      "4jggokgpepnvsb2uv4s40d59ov",
       "protocol": "PDI-IoTA-UltraLight",
       "transport": "HTTP",
       "endpoint": "http://iot-sensors:3001/iot/bell001",
@@ -838,6 +840,7 @@ curl -L -X POST 'http://localhost:4041/iot/devices' \
       "device_id": "bell002",
       "entity_name": "urn:ngsi-ld:Bell:002",
       "entity_type": "Bell",
+      "apikey":      "4jggokgpepnvsb2uv4s40d59ov",
       "protocol": "PDI-IoTA-UltraLight",
       "transport": "HTTP",
       "endpoint": "http://iot-sensors:3001/iot/bell002",
@@ -949,6 +952,7 @@ curl -iX POST \
       "device_id": "door001",
       "entity_name": "urn:ngsi-ld:Door:001",
       "entity_type": "Door",
+      "apikey":      "4jggokgpepnvsb2uv4s40d59ov",
       "protocol": "PDI-IoTA-UltraLight",
       "transport": "HTTP",
       "endpoint": "http://iot-sensors:3001/iot/door001",
@@ -991,6 +995,7 @@ curl -iX POST \
       "device_id": "lamp001",
       "entity_name": "urn:ngsi-ld:Lamp:001",
       "entity_type": "Lamp",
+      "apikey":      "4jggokgpepnvsb2uv4s40d59ov",
       "protocol": "PDI-IoTA-UltraLight",
       "transport": "HTTP",
       "endpoint": "http://iot-sensors:3001/iot/lamp001",
@@ -1312,6 +1317,7 @@ curl -iX POST \
       "device_id": "bell002",
       "entity_name": "urn:ngsi-ld:Bell:002",
       "entity_type": "Bell",
+      "apikey":      "4jggokgpepnvsb2uv4s40d59ov",
       "protocol": "PDI-IoTA-UltraLight",
       "transport": "HTTP",
       "endpoint": "http://iot-sensors:3001/iot/bell002",
@@ -1413,6 +1419,7 @@ curl -X GET \
           "service_path": "/",
           "entity_name": "urn:ngsi",
           "entity_type": "Bell",
+          "apikey":      "4jggokgpepnvsb2uv4s40d59ov",
           "endpoint": "http://iot-sensors:3001/iot/bell002",
           "transport": "HTTP",
           "attributes": [],
diff --git a/README.md b/README.md
index 83eabf6..8e4a251 100644
--- a/README.md
+++ b/README.md
@@ -569,6 +569,7 @@ curl -iX POST \
      "entity_name": "urn:ngsi-ld:Motion:001",
      "entity_type": "Motion",
      "timezone":    "Europe/Berlin",
+     "apikey":      "4jggokgpepnvsb2uv4s40d59ov",
      "attributes": [
        { "object_id": "c", "name": "count", "type": "Integer" }
      ],
@@ -704,6 +705,7 @@ curl -iX POST \
       "device_id": "bell001",
       "entity_name": "urn:ngsi-ld:Bell:001",
       "entity_type": "Bell",
+      "apikey":      "4jggokgpepnvsb2uv4s40d59ov",
       "protocol": "PDI-IoTA-UltraLight",
       "transport": "HTTP",
       "endpoint": "http://iot-sensors:3001/iot/bell001",
@@ -741,6 +743,7 @@ curl -L -X POST 'http://localhost:4041/iot/devices' \
       "device_id": "bell002",
       "entity_name": "urn:ngsi-ld:Bell:002",
       "entity_type": "Bell",
+      "apikey":      "4jggokgpepnvsb2uv4s40d59ov",
       "protocol": "PDI-IoTA-UltraLight",
       "transport": "HTTP",
       "endpoint": "http://iot-sensors:3001/iot/bell002",
@@ -847,6 +850,7 @@ curl -iX POST \
       "device_id": "door001",
       "entity_name": "urn:ngsi-ld:Door:001",
       "entity_type": "Door",
+      "apikey":      "4jggokgpepnvsb2uv4s40d59ov",
       "protocol": "PDI-IoTA-UltraLight",
       "transport": "HTTP",
       "endpoint": "http://iot-sensors:3001/iot/door001",
@@ -886,6 +890,7 @@ curl -iX POST \
       "device_id": "lamp001",
       "entity_name": "urn:ngsi-ld:Lamp:001",
       "entity_type": "Lamp",
+      "apikey":      "4jggokgpepnvsb2uv4s40d59ov",
       "protocol": "PDI-IoTA-UltraLight",
       "transport": "HTTP",
       "endpoint": "http://iot-sensors:3001/iot/lamp001",
@@ -1176,6 +1181,7 @@ curl -iX POST \
       "device_id": "bell002",
       "entity_name": "urn:ngsi-ld:Bell:002",
       "entity_type": "Bell",
+      "apikey":      "4jggokgpepnvsb2uv4s40d59ov",
       "protocol": "PDI-IoTA-UltraLight",
       "transport": "HTTP",
       "endpoint": "http://iot-sensors:3001/iot/bell002",
@@ -1219,6 +1225,7 @@ The response includes all the commands and attributes mappings associated with t
     "service_path": "/",
     "entity_name": "urn:ngsi",
     "entity_type": "Bell",
+    "apikey":      "4jggokgpepnvsb2uv4s40d59ov",
     "endpoint": "http://iot-sensors:3001/iot/bell002",
     "transport": "HTTP",
     "attributes": [],
@@ -1268,6 +1275,7 @@ The response includes all the commands and attributes mappings associated with a
           "service_path": "/",
           "entity_name": "urn:ngsi",
           "entity_type": "Bell",
+          "apikey":      "4jggokgpepnvsb2uv4s40d59ov",
           "endpoint": "http://iot-sensors:3001/iot/bell002",
           "transport": "HTTP",
           "attributes": [],