diff --git a/spec/updated/entity-attrs-spec.json b/spec/updated/entity-attrs-spec.json
index c0efc412821eb4c331f9e107266c9e6e15245d57..908cbea4ee52b8df8ce5c6bb80e80185bd99f47f 100644
--- a/spec/updated/entity-attrs-spec.json
+++ b/spec/updated/entity-attrs-spec.json
@@ -57,7 +57,7 @@
           "content": {
             "application/json;application/ld+json": {
               "schema": {
-                "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/Entity.json#"
+                "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/Entity.json#/definitions/EntityFragment"
               }
             }
           }
@@ -111,7 +111,7 @@
           "content": {
             "application/json;application/ld+json": {
               "schema": {
-                "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/Entity.json#"
+                "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/Entity.json#/definitions/EntityFragment"
               }
             }
           }
@@ -170,7 +170,7 @@
           "content": {
             "application/json;application/ld+json": {
               "schema": {
-                "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/Entity.json#"
+                "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/Entity.json#/definitions/EntityFragment"
               }
             }
           }
diff --git a/spec/updated/full_api.json b/spec/updated/full_api.json
index 577132f2cbb0423981c67c2a63c0f8f35dc546b2..e82f7555bc0778fea61f1564d165e6406dba5738 100644
--- a/spec/updated/full_api.json
+++ b/spec/updated/full_api.json
@@ -195,6 +195,19 @@
               "type": "integer",
               "minimum": 1
             }
+          },
+          {
+            "name": "options",
+            "description": "Options dictionary",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "keyValues",
+                "sysAttrs"
+              ]
+            }
           }
         ],
         "responses": {
@@ -203,23 +216,10 @@
             "content": {
               "application/json;application/ld+json": {
                 "schema": {
-                  "$schema": "http://json-schema.org/schema#",
-                  "id": "https://uri.etsi.org/ngsi-ld/schema/EntityList.json",
-                  "title": "NGSI-LD EntityList",
-                  "description": "NGSI-LD EntityList",
-                  "definitions": {
-                    "EntityList": {
-                      "type": "array",
-                      "items": {
-                        "$ref": "#/paths/~1entities~1%7BentityId%7D~1attrs~1/post/requestBody/content/application~1json%3Bapplication~1ld%2Bjson/schema/definitions/Entity"
-                      }
-                    }
-                  },
-                  "allOf": [
-                    {
-                      "$ref": "#/paths/~1entities~1/get/responses/200/content/application~1json%3Bapplication~1ld%2Bjson/schema/definitions/EntityList"
-                    }
-                  ]
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/paths/~1entities~1%7BentityId%7D~1attrs~1/post/requestBody/content/application~1json%3Bapplication~1ld%2Bjson/schema/definitions/Entity"
+                  }
                 },
                 "examples": {
                   "simple": {
@@ -342,6 +342,9 @@
               "minLength": 1,
               "description": "NGSI-LD Name"
             }
+          },
+          {
+            "$ref": "#/paths/~1entities~1/get/parameters/11"
           }
         ],
         "responses": {
@@ -350,7 +353,7 @@
             "content": {
               "application/json;application/ld+json": {
                 "schema": {
-                  "$ref": "#/paths/~1entities~1%7BentityId%7D~1attrs~1/post/requestBody/content/application~1json%3Bapplication~1ld%2Bjson/schema"
+                  "$ref": "#/paths/~1entities~1%7BentityId%7D~1attrs~1/post/requestBody/content/application~1json%3Bapplication~1ld%2Bjson/schema/definitions/Entity"
                 },
                 "examples": {
                   "simple": {