diff --git a/schema/common.json b/schema/common.json
index 14091d0b062ef5e6f356126cf27e3664b20e8b53..30a2ccde8efe14cac3f9fe48586d60bce8f7fae8 100644
--- a/schema/common.json
+++ b/schema/common.json
@@ -63,41 +63,20 @@
       }
     },
     "EntityInfo": {
-      "anyOf": [
-        {
-          "type": "object",
-          "required": [
-            "id"
-          ],
-          "properties": {
-            "id": {
-              "type": "string"
-            }
-          }
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "format": "uri"
         },
-        {
-          "type": "object",
-          "required": [
-            "idPattern"
-          ],
-          "properties": {
-            "idPattern": {
-              "type": "string"
-            }
-          }
+        "type": {
+          "type": "string",
+          "minLength": 1
         },
-        {
-          "type": "object",
-          "required": [
-            "type"
-          ],
-          "properties": {
-            "type": {
-              "type": "string"
-            }
-          }
+        "idPattern": {
+          "type": "string",
+          "format": "regex"
         }
-      ]
+      }
     }
-  }
 }