diff --git a/README.ja.md b/README.ja.md
index 089d412..fe809b6 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -820,7 +820,10 @@ _properties-of-properties_ 要素は含まれていません。リクエスト
 ```json
 [
     {
-        "@context": "https://fiware.github.io/data-models/context.jsonld",
+        "@context": [
+            "https://smart-data-models.github.io/dataModel.Building/context.jsonld",
+            "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        ],
         "id": "urn:ngsi-ld:Building:store001",
         "type": "Building",
         "address": {
@@ -842,7 +845,10 @@ _properties-of-properties_ 要素は含まれていません。リクエスト
         }
     },
     {
-        "@context": "https://fiware.github.io/data-models/context.jsonld",
+        "@context": [
+            "https://smart-data-models.github.io/dataModel.Building/context.jsonld",
+            "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        ],
         "id": "urn:ngsi-ld:Building:store002",
         "type": "Building",
         "address": {
@@ -907,7 +913,10 @@ curl -G -X GET \
 ```json
 [
     {
-        "@context": "https://fiware.github.io/data-models/context.jsonld",
+        "@context": [
+            "https://smart-data-models.github.io/dataModel.Building/context.jsonld",
+            "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        ],
         "id": "urn:ngsi-ld:Building:store002",
         "type": "Building",
         "address": {
@@ -958,7 +967,10 @@ curl -G -X GET \
 ```json
 [
     {
-        "@context": "https://fiware.github.io/data-models/context.jsonld",
+        "@context": [
+            "https://smart-data-models.github.io/dataModel.Building/context.jsonld",
+            "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        ],
         "id": "urn:ngsi-ld:Building:store001",
         "type": "Building",
         "address": {
@@ -980,7 +992,10 @@ curl -G -X GET \
         }
     },
     {
-        "@context": "https://fiware.github.io/data-models/context.jsonld",
+        "@context": [
+            "https://smart-data-models.github.io/dataModel.Building/context.jsonld",
+            "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        ],
         "id": "urn:ngsi-ld:Building:store002",
         "type": "Building",
         "address": {
@@ -1032,7 +1047,10 @@ curl -G -X GET \
 ```json
 [
     {
-        "@context": "https://fiware.github.io/data-models/context.jsonld",
+        "@context": [
+            "https://smart-data-models.github.io/dataModel.Building/context.jsonld",
+            "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        ],
         "id": "urn:ngsi-ld:Building:store002",
         "type": "Building",
         "address": {
@@ -1086,7 +1104,10 @@ Accept HTTP ヘッダと一緒に `options=keyValues` を使用しているた
 ```json
 [
     {
-        "@context": "https://fiware.github.io/data-models/context.jsonld",
+        "@context": [
+            "https://smart-data-models.github.io/dataModel.Building/context.jsonld",
+            "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        ],
         "id": "urn:ngsi-ld:Building:store001",
         "type": "Building",
         "address": {
@@ -1167,7 +1188,10 @@ Accept HTTP ヘッダと一緒に `options=keyValues` を使用しているた
 ```json
 [
     {
-        "@context": "https://fiware.github.io/data-models/context.jsonld",
+        "@context": [
+            "https://smart-data-models.github.io/dataModel.Building/context.jsonld",
+            "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        ],
         "id": "urn:ngsi-ld:Building:store002",
         "type": "Building",
         "address": {
diff --git a/README.md b/README.md
index ac1d528..3146af3 100644
--- a/README.md
+++ b/README.md
@@ -784,7 +784,10 @@ used as the `@context` returned in the response.
 ```json
 [
     {
-        "@context": "https://smart-data-models.github.io/dataModel.Building/context.jsonld",
+        "@context": [
+            "https://smart-data-models.github.io/dataModel.Building/context.jsonld",
+            "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        ],
         "id": "urn:ngsi-ld:Building:store001",
         "type": "Building",
         "address": {
@@ -803,7 +806,10 @@ used as the `@context` returned in the response.
         }
     },
     {
-        "@context": "https://smart-data-models.github.io/dataModel.Building/context.jsonld",
+        "@context": [
+            "https://smart-data-models.github.io/dataModel.Building/context.jsonld",
+            "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        ],
         "id": "urn:ngsi-ld:Building:store002",
         "type": "Building",
         "address": {
@@ -853,7 +859,10 @@ JSON-LD as shown:
 ```json
 [
     {
-        "@context": "https://smart-data-models.github.io/dataModel.Building/context.jsonld",
+        "@context": [
+            "https://smart-data-models.github.io/dataModel.Building/context.jsonld",
+            "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        ],
         "id": "urn:ngsi-ld:Building:store002",
         "type": "Building",
         "address": {
@@ -906,7 +915,10 @@ The response is returned in JSON-LD format with short form attribute names:
 ```json
 [
     {
-        "@context": "https://smart-data-models.github.io/dataModel.Building/context.jsonld",
+        "@context": [
+            "https://smart-data-models.github.io/dataModel.Building/context.jsonld",
+            "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        ],
         "id": "urn:ngsi-ld:Building:store001",
         "type": "Building",
         "address": {
@@ -925,7 +937,10 @@ The response is returned in JSON-LD format with short form attribute names:
         }
     },
     {
-        "@context": "https://smart-data-models.github.io/dataModel.Building/context.jsonld",
+        "@context": [
+            "https://smart-data-models.github.io/dataModel.Building/context.jsonld",
+            "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        ],
         "id": "urn:ngsi-ld:Building:store002",
         "type": "Building",
         "address": {
@@ -972,7 +987,10 @@ Use of the `Link` header and the `options=keyValues` parameter reduces the respo
 ```json
 [
     {
-        "@context": "https://smart-data-models.github.io/dataModel.Building/context.jsonld",
+        "@context": [
+            "https://smart-data-models.github.io/dataModel.Building/context.jsonld",
+            "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        ],
         "id": "urn:ngsi-ld:Building:store002",
         "type": "Building",
         "address": {
@@ -1021,7 +1039,6 @@ consists of JSON only without the attribute `type` and `metadata` elements.
 ```json
 [
     {
-        "@context": "https://smart-data-models.github.io/dataModel.Building/context.jsonld",
         "id": "urn:ngsi-ld:Building:store001",
         "type": "Building",
         "address": {
@@ -1040,7 +1057,6 @@ consists of JSON only without the attribute `type` and `metadata` elements.
         }
     },
     {
-        "@context": "https://smart-data-models.github.io/dataModel.Building/context.jsonld",
         "id": "urn:ngsi-ld:Building:store002",
         "type": "Building",
         "address": {
@@ -1095,7 +1111,6 @@ consists of JSON only without the attribute `type` and `metadata` elements.
 ```json
 [
     {
-        "@context": "https://smart-data-models.github.io/dataModel.Building/context.jsonld",
         "id": "urn:ngsi-ld:Building:store002",
         "type": "Building",
         "address": {