diff --git a/schema/registrations/ContextSourceRegistration.json b/schema/registrations/ContextSourceRegistration.json
index 74ff4e7b6d655dee24f7a360e8a2497206e5208e..75ee7bf90c97334d921067d14ea7d6ffff972885 100644
--- a/schema/registrations/ContextSourceRegistration.json
+++ b/schema/registrations/ContextSourceRegistration.json
@@ -6,8 +6,10 @@
   "definitions": {
     "RegistrationInfo": {
       "type": "object",
-      "required": [
-        "entities"
+	  "anyOf": [
+		{"required": ["entities"]},
+		{"required": ["properties"]},
+		{"required": ["relationships"]}
       ],
       "properties": {
         "entities": {
@@ -64,15 +66,20 @@
             "$ref": "#/definitions/RegistrationInfo"
           }
         },
-        "timestamp": {
-          "type": "array",
-          "minItems": 1,
-          "items": {
-            "$ref": "#/definitions/TimeInterval"
-          }
+        "observationInterval": {
+          "$ref": "#/definitions/TimeInterval"
+        },
+        "managementInterval": {
+          "$ref": "#/definitions/TimeInterval"
         },
         "location": {
           "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/geometry-schema.json#"
+        },
+		"observationSpace": {
+          "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/geometry-schema.json#"
+        },
+		"operationSpace": {
+          "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/geometry-schema.json#"
         },
         "expires": {
           "type": "string",
@@ -139,4 +146,4 @@
       "$ref": "#/definitions/ContextSourceRegistration"
     }
   ]
-}
\ No newline at end of file
+}