diff --git a/schema/Entity.json b/schema/Entity.json
index 492b652e749a65c3e1ab17283e29cd635ef14777..6e2339e2a12015f9e2bd85c0a59c1965cac72444 100644
--- a/schema/Entity.json
+++ b/schema/Entity.json
@@ -20,7 +20,13 @@
           "const": "Property"
         },
         "value": {
-          "type": ["string","number","boolean","array","object"]
+          "type": [
+            "string",
+            "number",
+            "boolean",
+            "array",
+            "object"
+          ]
         },
         "observedAt": {
           "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/observedAt"
@@ -135,55 +141,62 @@
           }
         ]
       }
-    }
-  },
-  "type": "object",
-  "properties": {
-    "id": {
-      "type": "string",
-      "format": "uri"
-    },
-    "type": {
-      "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/Name"
-    },
-    "@context": {
-      "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/LdContext"
     },
-    "location": {
-      "$ref": "#/definitions/GeoProperty"
-    },
-    "observationSpace": {
-      "$ref": "#/definitions/GeoProperty"
-    },
-    "operationSpace": {
-      "$ref": "#/definitions/GeoProperty"
-    },
-    "createdAt": {
-      "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/createdAt"
-    },
-    "modifiedAt": {
-      "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/modifiedAt"
-    }
-  },
-  "required": [
-    "id",
-    "type"
-  ],
-  "additionalProperties": {
-    "anyOf": [
-      {
-        "$ref": "#/definitions/Property"
+    "Entity": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "format": "uri"
+        },
+        "type": {
+          "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/Name"
+        },
+        "@context": {
+          "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/LdContext"
+        },
+        "location": {
+          "$ref": "#/definitions/GeoProperty"
+        },
+        "observationSpace": {
+          "$ref": "#/definitions/GeoProperty"
+        },
+        "operationSpace": {
+          "$ref": "#/definitions/GeoProperty"
+        },
+        "createdAt": {
+          "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/createdAt"
+        },
+        "modifiedAt": {
+          "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/modifiedAt"
+        }
       },
-      {
-        "$ref": "#/definitions/Relationship"
+      "required": [
+        "id",
+        "type"
+      ],
+      "additionalProperties": {
+        "anyOf": [
+          {
+            "$ref": "#/definitions/Property"
+          },
+          {
+            "$ref": "#/definitions/Relationship"
+          },
+          {
+            "$ref": "#/definitions/GeoProperty"
+          }
+        ]
       },
+      "propertyNames": {
+        "type": "string",
+        "pattern": "^((\\d|[a-zA-Z]|_)+(#\\d+)?)$|^(@context)$"
+      }
+    }
+  },
+    "allOf": [
       {
-        "$ref": "#/definitions/GeoProperty"
+        "$ref": "#/definitions/Entity"
       }
     ]
-  },
-  "propertyNames": {
-    "type": "string",
-    "pattern": "^((\\d|[a-zA-Z]|_)+(#\\d+)?)$|^(@context)$"
-  }
-}
+}
\ No newline at end of file