diff --git a/features/data/102.ld.working_with_context/102.ld.05.response.json b/features/data/102.ld.working_with_context/102.ld.05.response.json
index cc769f1..da21d80 100644
--- a/features/data/102.ld.working_with_context/102.ld.05.response.json
+++ b/features/data/102.ld.working_with_context/102.ld.05.response.json
@@ -1,8 +1,5 @@
 {
-    "@context": [
-        "http://context/ngsi-context.jsonld",
-        "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
-    ],
+    "@context": "http://context/ngsi-context.jsonld",
     "id": "urn:ngsi-ld:Building:farm001",
     "type": "Building",
     "category": {
diff --git a/features/data/102.ld.working_with_context/102.ld.06.response.json b/features/data/102.ld.working_with_context/102.ld.06.response.json
index 1df44fe..abc19d1 100644
--- a/features/data/102.ld.working_with_context/102.ld.06.response.json
+++ b/features/data/102.ld.working_with_context/102.ld.06.response.json
@@ -1,9 +1,6 @@
 [
     {
-        "@context": [
-            "http://context/ngsi-context.jsonld",
-            "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
-            ],
+        "@context": "http://context/ngsi-context.jsonld",
         "id": "urn:ngsi-ld:Building:farm001",
         "type": "Building",
         "address": {
@@ -20,10 +17,7 @@
         }
     },
     {
-        "@context": [
-            "http://context/ngsi-context.jsonld",
-            "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
-        ],
+        "@context": "http://context/ngsi-context.jsonld",
         "id": "urn:ngsi-ld:Building:barn002",
         "type": "Building",
         "address": {
diff --git a/features/data/102.ld.working_with_context/102.ld.07.response.json b/features/data/102.ld.working_with_context/102.ld.07.response.json
index e3a2920..a4ec281 100644
--- a/features/data/102.ld.working_with_context/102.ld.07.response.json
+++ b/features/data/102.ld.working_with_context/102.ld.07.response.json
@@ -12,8 +12,8 @@
             "addressLocality": "Tiergarten",
             "postalCode": "10557"
         },
-        "name": "Big Red Barn",
-        "category": "barn",
+        "https://schema.org/name": "Big Red Barn",
+        "https://uri.fiware.org/ns/dataModels#category": "barn",
         "location": {
             "type": "Point",
             "coordinates": [13.3698, 52.5163]
diff --git a/features/data/102.ld.working_with_context/102.ld.09.response.json b/features/data/102.ld.working_with_context/102.ld.09.response.json
index cbe93c9..277a41b 100644
--- a/features/data/102.ld.working_with_context/102.ld.09.response.json
+++ b/features/data/102.ld.working_with_context/102.ld.09.response.json
@@ -1,9 +1,6 @@
 [
     {
-        "@context": [
-            "http://context/ngsi-context.jsonld",
-            "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
-        ],
+        "@context": "http://context/ngsi-context.jsonld",
         "id": "urn:ngsi-ld:Building:barn002",
         "type": "Building",
         "address": {
diff --git a/features/data/102.ld.working_with_context/102.ld.10.response.json b/features/data/102.ld.working_with_context/102.ld.10.response.json
index 3320da1..30531e2 100644
--- a/features/data/102.ld.working_with_context/102.ld.10.response.json
+++ b/features/data/102.ld.working_with_context/102.ld.10.response.json
@@ -12,8 +12,8 @@
             "addressLocality": "Tiergarten",
             "postalCode": "10557"
         },
-        "name": "Victory Farm",
-        "category": "farm",
+        "https://schema.org/name": "Victory Farm",
+        "https://uri.fiware.org/ns/dataModels#category": "farm",
         "location": {
             "type": "Point",
             "coordinates": [13.3505, 52.5144]
@@ -32,8 +32,8 @@
             "addressLocality": "Tiergarten",
             "postalCode": "10557"
         },
-        "name": "Big Red Barn",
-        "category": "barn",
+        "https://schema.org/name": "Big Red Barn",
+        "https://uri.fiware.org/ns/dataModels#category": "barn",
         "location": {
             "type": "Point",
             "coordinates": [13.3698, 52.5163]
diff --git a/features/data/102.ld.working_with_context/102.ld.11.response.json b/features/data/102.ld.working_with_context/102.ld.11.response.json
index 3320da1..30531e2 100644
--- a/features/data/102.ld.working_with_context/102.ld.11.response.json
+++ b/features/data/102.ld.working_with_context/102.ld.11.response.json
@@ -12,8 +12,8 @@
             "addressLocality": "Tiergarten",
             "postalCode": "10557"
         },
-        "name": "Victory Farm",
-        "category": "farm",
+        "https://schema.org/name": "Victory Farm",
+        "https://uri.fiware.org/ns/dataModels#category": "farm",
         "location": {
             "type": "Point",
             "coordinates": [13.3505, 52.5144]
@@ -32,8 +32,8 @@
             "addressLocality": "Tiergarten",
             "postalCode": "10557"
         },
-        "name": "Big Red Barn",
-        "category": "barn",
+        "https://schema.org/name": "Big Red Barn",
+        "https://uri.fiware.org/ns/dataModels#category": "barn",
         "location": {
             "type": "Point",
             "coordinates": [13.3698, 52.5163]
diff --git a/features/data/102.ld.working_with_context/102.ld.12.response.json b/features/data/102.ld.working_with_context/102.ld.12.response.json
index 4d61145..da6eccd 100644
--- a/features/data/102.ld.working_with_context/102.ld.12.response.json
+++ b/features/data/102.ld.working_with_context/102.ld.12.response.json
@@ -8,8 +8,8 @@
             "addressLocality": "Tiergarten",
             "postalCode": "10557"
         },
-        "name": "Big Red Barn",
-        "category": "barn",
+        "https://schema.org/name": "Big Red Barn",
+        "https://uri.fiware.org/ns/dataModels#category": "barn",
         "location": {
             "type": "Point",
             "coordinates": [13.3698, 52.5163]