diff --git a/schema/Subscription.json b/schema/Subscription.json
index cca99e732b973569188d7be4eca86dd0c7aa0491..903ce451e7ecdf9521e449352baed284c451b9a1 100644
--- a/schema/Subscription.json
+++ b/schema/Subscription.json
@@ -48,9 +48,6 @@
         "endpoint"
       ]
     },
-    "EntityInfo": {
-      "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/EntityInfo"
-    },
     "GeoQuery": {
       "type": "object",
       "required": [
@@ -122,7 +119,11 @@
       "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/LdContext"
     },
     "entities": {
-      "$ref": "#/definitions/EntityInfo"
+      "type": "array",
+      "items": {
+        "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/EntityInfo"
+      },
+      "minItems": 1
     },
     "name": {
       "type": "string",
diff --git a/schema/common.json b/schema/common.json
index 9f6279e1b891e96fa08b3f9137ecdfc423f82aff..14091d0b062ef5e6f356126cf27e3664b20e8b53 100644
--- a/schema/common.json
+++ b/schema/common.json
@@ -1,8 +1,8 @@
 {
   "$schema": "http://json-schema.org/schema#",
   "id": "https://uri.etsi.org/ngsi-ld/schema/common.json",
-  "title": "NGSI-LD Entity",
-  "description": "NGSI-LD Entity",
+  "title": "NGSI-LD Common Definitions",
+  "description": "NGSI-LD Common",
   "definitions": {
     "LdContext": {
       "anyOf": [