From 1f443de2a7692d747bcc65d48f0c1d6e5ffd7f1f Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Sun, 7 Feb 2021 12:50:03 +0100
Subject: [PATCH] Updated datamodel for MEC013

---
 SRV/RLOCLOOK/PlatRadioNodeLocation.robot      |   4 +-
 .../schemas/AccessPointInfo.schema.json       | 245 ++++++
 .../schemas/AccessPointList.schema.json       | 279 ++++++-
 .../jsons/CircleNotificationSubscription.json |  28 +-
 .../CircleNotificationSubscriptionError.json  |  28 +-
 ...CircleNotificationSubscription.schema.json | 184 ++++-
 .../NotificationSubscriptionList.schema.json  | 715 ++++++++++++++++++
 .../schemas/TerminalDistance.schema.json      |  57 +-
 ...stanceNotificationSubscription.schema.json | 181 ++++-
 .../NotificationSubscriptionList.schema.json  | 715 ++++++++++++++++++
 SRV/UEINFOLOOK/PlatUeInformationLookup.robot  |   2 +-
 .../NotificationSubscriptionList.schema.json  | 715 ++++++++++++++++++
 .../ZonalTrafficSubscription.schema.json      |  99 ++-
 SRV/UELOCLOOK/schemas/UserInfo.schema.json    | 395 ++++++----
 SRV/UELOCLOOK/schemas/UserList.schema.json    | 395 ++++++----
 .../NotificationSubscriptionList.schema.json  | 715 ++++++++++++++++++
 .../UserTrackingSubscription.schema.json      |  81 +-
 .../NotificationSubscriptionList.schema.json  | 715 ++++++++++++++++++
 ...riodicNotificationSubscription.schema.json | 121 ++-
 SRV/ZOINFOLOOK/PlatZoneInfoLocation.robot     |  62 ++
 SRV/ZOINFOLOOK/README.md                      |   0
 SRV/ZOINFOLOOK/environment/variables.txt      |  14 +
 SRV/ZOINFOLOOK/schemas/ZoneInfo.schema.json   |  48 ++
 SRV/ZOINFOLOOK/schemas/ZoneList.schema.json   |  48 ++
 24 files changed, 5463 insertions(+), 383 deletions(-)
 create mode 100644 SRV/RLOCLOOK/schemas/AccessPointInfo.schema.json
 create mode 100644 SRV/UEAREASUB/schemas/NotificationSubscriptionList.schema.json
 create mode 100644 SRV/UEDISTSUB/schemas/NotificationSubscriptionList.schema.json
 create mode 100644 SRV/UEINFOSUB/schemas/NotificationSubscriptionList.schema.json
 create mode 100644 SRV/UELOCSUB/schemas/NotificationSubscriptionList.schema.json
 create mode 100644 SRV/UETRACKSUB/schemas/NotificationSubscriptionList.schema.json
 create mode 100644 SRV/ZOINFOLOOK/PlatZoneInfoLocation.robot
 create mode 100644 SRV/ZOINFOLOOK/README.md
 create mode 100644 SRV/ZOINFOLOOK/environment/variables.txt
 create mode 100644 SRV/ZOINFOLOOK/schemas/ZoneInfo.schema.json
 create mode 100644 SRV/ZOINFOLOOK/schemas/ZoneList.schema.json

diff --git a/SRV/RLOCLOOK/PlatRadioNodeLocation.robot b/SRV/RLOCLOOK/PlatRadioNodeLocation.robot
index aaa807f..33979d3 100644
--- a/SRV/RLOCLOOK/PlatRadioNodeLocation.robot
+++ b/SRV/RLOCLOOK/PlatRadioNodeLocation.robot
@@ -25,7 +25,7 @@ TC_MEC_SRV_RLOCLOOK_001_OK
     Get the access points list        ${ZONE_ID}
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    AccessPointList
-    Should Be Equal As Strings    ${response['body']['accessPointList']['zoneId']}	${ZONE_ID}
+    Should Be Equal As Strings    ${response['body']['accessPointList']['zoneId']}    ${ZONE_ID}
 
 
 TC_MEC_SRV_RLOCLOOK_001_NF
@@ -45,7 +45,7 @@ Get the access points list
     [Arguments]    ${zoneId}
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/zones/${zoneId}/accessPoints
+    Get    ${apiRoot}/${apiName}/${apiVersion}/queries/zones/${zoneId}/accessPoints
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
diff --git a/SRV/RLOCLOOK/schemas/AccessPointInfo.schema.json b/SRV/RLOCLOOK/schemas/AccessPointInfo.schema.json
new file mode 100644
index 0000000..9f7ddf5
--- /dev/null
+++ b/SRV/RLOCLOOK/schemas/AccessPointInfo.schema.json
@@ -0,0 +1,245 @@
+{
+	"type": "object",
+	"properties": {
+		"accessPointInfo": {
+			"description": "A type containing access point information.",
+			"properties": {
+				"accessPointId": {
+					"description": "Identifier of access point.",
+					"type": "string",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "string"
+				},
+				"connectionType": {
+					"description": "The connection type for the access point",
+					"enum": [
+						"Femto",
+						"LTE-femto",
+						"Smallcell",
+						"LTE-smallcell",
+						"Wifi",
+						"Pico",
+						"Micro",
+						"Macro",
+						"Wimax",
+						"Unknown"
+					],
+					"type": "string"
+				},
+				"interestRealm": {
+					"description": "Interest realm of access point.",
+					"type": "string",
+					"x-etsi-mec-cardinality": "0..1",
+					"x-etsi-mec-origin-type": "string"
+				},
+				"locationInfo": {
+					"properties": {
+						"accuracy": {
+							"description": "Horizontal accuracy / (semi-major) uncertainty of location provided in meters, as defined in [14]. Present only if \"shape\" equals 4, 5 or 6",
+							"type": "integer",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "UnsignedInt"
+						},
+						"accuracyAltitude": {
+							"description": "Altitude accuracy / uncertainty of location provided in meters, as defined in [14]. Present only if \"shape\" equals 3 or 4",
+							"type": "integer",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "UnsignedInt"
+						},
+						"accuracySemiMinor": {
+							"description": "Horizontal accuracy / (semi-major) uncertainty of location provided in meters, as defined in [14]. Present only if \"shape\" equals 4, 5 or 6",
+							"type": "integer",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "UnsignedInt"
+						},
+						"altitude": {
+							"description": "Location altitude relative to the WGS84 ellipsoid surface.",
+							"format": "float",
+							"type": "number",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "Float"
+						},
+						"confidence": {
+							"description": "Confidence by which the position of a target entity is known to be within the shape description, expressed as a percentage and defined in [14]. Present only if \"shape\" equals 1, 4 or 6",
+							"type": "integer",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "UnsignedInt"
+						},
+						"includedAngle": {
+							"description": "Present only if \"shape\" equals 6",
+							"type": "integer",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "UnsignedInt"
+						},
+						"innerRadius": {
+							"description": "Present only if \"shape\" equals 6",
+							"type": "integer",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "UnsignedInt"
+						},
+						"latitude": {
+							"description": "Location latitude, expressed in the range -90° to +90°. Cardinality greater than one only if \"shape\" equals 7.",
+							"items": {
+								"format": "float",
+								"type": "number"
+							},
+							"minItems": 1,
+							"type": "array",
+							"x-etsi-mec-cardinality": "1..N",
+							"x-etsi-mec-origin-type": "Float"
+						},
+						"longitude": {
+							"description": "Location longitude, expressed in the range -180° to +180°. Cardinality greater than one only if \"shape\" equals 7.",
+							"items": {
+								"format": "float",
+								"type": "number"
+							},
+							"minItems": 1,
+							"type": "array",
+							"x-etsi-mec-cardinality": "1..N",
+							"x-etsi-mec-origin-type": "Float"
+						},
+						"offsetAngle": {
+							"description": "Present only if \"shape\" equals 6",
+							"type": "integer",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "UnsignedInt"
+						},
+						"orientationMajorAxis": {
+							"description": "Angle of orientation of the major axis, expressed in the range 0° to 180°, as defined in [14]. Present only if \"shape\" equals 4 or 6",
+							"type": "integer",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "UnsignedInt"
+						},
+						"shape": {
+							"description": "Shape information, as detailed in [14], associated with the reported location coordinate: <p>1 = ELLIPSOID_ARC <p>2 = ELLIPSOID_POINT <p>3 = ELLIPSOID_POINT_ALTITUDE <p>4 = ELLIPSOID_POINT_ALTITUDE_UNCERT_ELLIPSOID <p>5 = ELLIPSOID_POINT_UNCERT_CIRCLE <p>6 = ELLIPSOID_POINT_UNCERT_ELLIPSE <p>7 = POLYGON",
+							"type": "integer",
+							"x-etsi-mec-cardinality": "1",
+							"x-etsi-mec-origin-type": "Enum_inlined"
+						},
+						"timestamp": {
+							"properties": {
+								"nanoSeconds": {
+									"description": "The nanoseconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.",
+									"format": "int32",
+									"type": "integer",
+									"x-etsi-mec-cardinality": "1",
+									"x-etsi-mec-origin-type": "Uint32"
+								},
+								"seconds": {
+									"description": "The seconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.",
+									"format": "int32",
+									"type": "integer",
+									"x-etsi-mec-cardinality": "1",
+									"x-etsi-mec-origin-type": "Uint32"
+								}
+							},
+							"required": [
+								"seconds",
+								"nanoSeconds"
+							],
+							"type": "object",
+							"x-etsi-ref": "6.5.2"
+						},
+						"uncertaintyRadius": {
+							"description": "Present only if \"shape\" equals 6",
+							"type": "integer",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "UnsignedInt"
+						},
+						"velocity": {
+							"description": "Structure with attributes relating to the target entity’s velocity, as defined in [14].",
+							"properties": {
+								"bearing": {
+									"description": "Bearing, expressed in the range 0° to 360°, as defined in [14].",
+									"type": "integer",
+									"x-etsi-mec-cardinality": "1",
+									"x-etsi-mec-origin-type": "UnsignedInt"
+								},
+								"horizontalSpeed": {
+									"description": "Horizontal speed, expressed in km/h and defined in [14].",
+									"type": "integer",
+									"x-etsi-mec-cardinality": "1",
+									"x-etsi-mec-origin-type": "UnsignedInt"
+								},
+								"uncertainty": {
+									"description": "Horizontal uncertainty, as defined in [14]. Present only if \"velocityType\" equals 3 or 4",
+									"type": "integer",
+									"x-etsi-mec-cardinality": "0..1",
+									"x-etsi-mec-origin-type": "UnsignedInt"
+								},
+								"velocityType": {
+									"description": "Velocity information, as detailed in [14], associated with the reported location coordinate: <p>1 = HORIZONTAL <p>2 = HORIZONTAL_VERTICAL <p>3 = HORIZONTAL_UNCERT <p>4 = HORIZONTAL_VERTICAL_UNCERT",
+									"type": "integer",
+									"x-etsi-mec-cardinality": "1",
+									"x-etsi-mec-origin-type": "Enum_inlined"
+								},
+								"verticalSpeed": {
+									"description": "Vertical speed, expressed in km/h and defined in [14]. Present only if \"velocityType\" equals 2 or 4",
+									"type": "integer",
+									"x-etsi-mec-cardinality": "0..1",
+									"x-etsi-mec-origin-type": "Int"
+								},
+								"verticalUncertainty": {
+									"description": "Vertical uncertainty, as defined in [14]. Present only if \"velocityType\" equals 4",
+									"type": "integer",
+									"x-etsi-mec-cardinality": "0..1",
+									"x-etsi-mec-origin-type": "UnsignedInt"
+								}
+							},
+							"required": [
+								"velocityType",
+								"bearing",
+								"horizontalSpeed"
+							],
+							"type": "object",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "Structure (inlined)"
+						}
+					},
+					"required": [
+						"latitude",
+						"longitude",
+						"shape"
+					],
+					"type": "object",
+					"x-etsi-ref": "6.5.3"
+				},
+				"numberOfUsers": {
+					"description": "Number of users currently on the access point.",
+					"type": "integer",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "integer"
+				},
+				"operationStatus": {
+					"enum": [
+						"Serviceable",
+						"Unserviceable",
+						"Unknown"
+					],
+					"type": "string"
+				},
+				"resourceURL": {
+					"description": "Self referring URL",
+					"type": "string",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "anyURI"
+				},
+				"timezone": {
+					"description": "Time zone of access point.",
+					"type": "string",
+					"x-etsi-mec-cardinality": "0..1",
+					"x-etsi-mec-origin-type": "dateTimeStamp"
+				}
+			},
+			"required": [
+				"accessPointId",
+				"connectionType",
+				"operationStatus",
+				"numberOfUsers",
+				"resourceURL"
+			],
+			"type": "object"
+		}
+	}
+}
\ No newline at end of file
diff --git a/SRV/RLOCLOOK/schemas/AccessPointList.schema.json b/SRV/RLOCLOOK/schemas/AccessPointList.schema.json
index 2f0fb04..18b0a8c 100644
--- a/SRV/RLOCLOOK/schemas/AccessPointList.schema.json
+++ b/SRV/RLOCLOOK/schemas/AccessPointList.schema.json
@@ -1,11 +1,270 @@
 {
-  "properties": {
-    "undefinedJsonSchema": {
-      "type": "string",
-      "description": "Json Schema for the given object is not yet defined"
-    }
-  },
-  "required": [
-    "undefinedJsonSchema"
-  ]
-}
+	"accessPointList": {
+		"description": "A type containing list of access points.",
+		"properties": {
+			"accessPoint": {
+				"description": "Collection of the access point information list.",
+				"items": {
+					"description": "A type containing access point information.",
+					"properties": {
+						"accessPointId": {
+							"description": "Identifier of access point.",
+							"type": "string",
+							"x-etsi-mec-cardinality": 1,
+							"x-etsi-mec-origin-type": "string"
+						},
+						"connectionType": {
+							"description": "The connection type for the access point",
+							"enum": [
+								"Femto",
+								"LTE-femto",
+								"Smallcell",
+								"LTE-smallcell",
+								"Wifi",
+								"Pico",
+								"Micro",
+								"Macro",
+								"Wimax",
+								"Unknown"
+							],
+							"type": "string"
+						},
+						"interestRealm": {
+							"description": "Interest realm of access point.",
+							"type": "string",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "string"
+						},
+						"locationInfo": {
+							"properties": {
+								"accuracy": {
+									"description": "Horizontal accuracy / (semi-major) uncertainty of location provided in meters, as defined in [14]. Present only if \"shape\" equals 4, 5 or 6",
+									"type": "integer",
+									"x-etsi-mec-cardinality": "0..1",
+									"x-etsi-mec-origin-type": "UnsignedInt"
+								},
+								"accuracyAltitude": {
+									"description": "Altitude accuracy / uncertainty of location provided in meters, as defined in [14]. Present only if \"shape\" equals 3 or 4",
+									"type": "integer",
+									"x-etsi-mec-cardinality": "0..1",
+									"x-etsi-mec-origin-type": "UnsignedInt"
+								},
+								"accuracySemiMinor": {
+									"description": "Horizontal accuracy / (semi-major) uncertainty of location provided in meters, as defined in [14]. Present only if \"shape\" equals 4, 5 or 6",
+									"type": "integer",
+									"x-etsi-mec-cardinality": "0..1",
+									"x-etsi-mec-origin-type": "UnsignedInt"
+								},
+								"altitude": {
+									"description": "Location altitude relative to the WGS84 ellipsoid surface.",
+									"format": "float",
+									"type": "number",
+									"x-etsi-mec-cardinality": "0..1",
+									"x-etsi-mec-origin-type": "Float"
+								},
+								"confidence": {
+									"description": "Confidence by which the position of a target entity is known to be within the shape description, expressed as a percentage and defined in [14]. Present only if \"shape\" equals 1, 4 or 6",
+									"type": "integer",
+									"x-etsi-mec-cardinality": "0..1",
+									"x-etsi-mec-origin-type": "UnsignedInt"
+								},
+								"includedAngle": {
+									"description": "Present only if \"shape\" equals 6",
+									"type": "integer",
+									"x-etsi-mec-cardinality": "0..1",
+									"x-etsi-mec-origin-type": "UnsignedInt"
+								},
+								"innerRadius": {
+									"description": "Present only if \"shape\" equals 6",
+									"type": "integer",
+									"x-etsi-mec-cardinality": "0..1",
+									"x-etsi-mec-origin-type": "UnsignedInt"
+								},
+								"latitude": {
+									"description": "Location latitude, expressed in the range -90° to +90°. Cardinality greater than one only if \"shape\" equals 7.",
+									"items": {
+										"format": "float",
+										"type": "number"
+									},
+									"minItems": 1,
+									"type": "array",
+									"x-etsi-mec-cardinality": "1..N",
+									"x-etsi-mec-origin-type": "Float"
+								},
+								"longitude": {
+									"description": "Location longitude, expressed in the range -180° to +180°. Cardinality greater than one only if \"shape\" equals 7.",
+									"items": {
+										"format": "float",
+										"type": "number"
+									},
+									"minItems": 1,
+									"type": "array",
+									"x-etsi-mec-cardinality": "1..N",
+									"x-etsi-mec-origin-type": "Float"
+								},
+								"offsetAngle": {
+									"description": "Present only if \"shape\" equals 6",
+									"type": "integer",
+									"x-etsi-mec-cardinality": "0..1",
+									"x-etsi-mec-origin-type": "UnsignedInt"
+								},
+								"orientationMajorAxis": {
+									"description": "Angle of orientation of the major axis, expressed in the range 0° to 180°, as defined in [14]. Present only if \"shape\" equals 4 or 6",
+									"type": "integer",
+									"x-etsi-mec-cardinality": "0..1",
+									"x-etsi-mec-origin-type": "UnsignedInt"
+								},
+								"shape": {
+									"description": "Shape information, as detailed in [14], associated with the reported location coordinate: <p>1 = ELLIPSOID_ARC <p>2 = ELLIPSOID_POINT <p>3 = ELLIPSOID_POINT_ALTITUDE <p>4 = ELLIPSOID_POINT_ALTITUDE_UNCERT_ELLIPSOID <p>5 = ELLIPSOID_POINT_UNCERT_CIRCLE <p>6 = ELLIPSOID_POINT_UNCERT_ELLIPSE <p>7 = POLYGON",
+									"type": "integer",
+									"x-etsi-mec-cardinality": "1",
+									"x-etsi-mec-origin-type": "Enum_inlined"
+								},
+								"timestamp": {
+									"properties": {
+										"nanoSeconds": {
+											"description": "The nanoseconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.",
+											"format": "int32",
+											"type": "integer",
+											"x-etsi-mec-cardinality": "1",
+											"x-etsi-mec-origin-type": "Uint32"
+										},
+										"seconds": {
+											"description": "The seconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.",
+											"format": "int32",
+											"type": "integer",
+											"x-etsi-mec-cardinality": "1",
+											"x-etsi-mec-origin-type": "Uint32"
+										}
+									},
+									"required": [
+										"seconds",
+										"nanoSeconds"
+									],
+									"type": "object",
+									"x-etsi-ref": "6.5.2"
+								},
+								"uncertaintyRadius": {
+									"description": "Present only if \"shape\" equals 6",
+									"type": "integer",
+									"x-etsi-mec-cardinality": "0..1",
+									"x-etsi-mec-origin-type": "UnsignedInt"
+								},
+								"velocity": {
+									"description": "Structure with attributes relating to the target entity’s velocity, as defined in [14].",
+									"properties": {
+										"bearing": {
+											"description": "Bearing, expressed in the range 0° to 360°, as defined in [14].",
+											"type": "integer",
+											"x-etsi-mec-cardinality": "1",
+											"x-etsi-mec-origin-type": "UnsignedInt"
+										},
+										"horizontalSpeed": {
+											"description": "Horizontal speed, expressed in km/h and defined in [14].",
+											"type": "integer",
+											"x-etsi-mec-cardinality": "1",
+											"x-etsi-mec-origin-type": "UnsignedInt"
+										},
+										"uncertainty": {
+											"description": "Horizontal uncertainty, as defined in [14]. Present only if \"velocityType\" equals 3 or 4",
+											"type": "integer",
+											"x-etsi-mec-cardinality": "0..1",
+											"x-etsi-mec-origin-type": "UnsignedInt"
+										},
+										"velocityType": {
+											"description": "Velocity information, as detailed in [14], associated with the reported location coordinate: <p>1 = HORIZONTAL <p>2 = HORIZONTAL_VERTICAL <p>3 = HORIZONTAL_UNCERT <p>4 = HORIZONTAL_VERTICAL_UNCERT",
+											"type": "integer",
+											"x-etsi-mec-cardinality": "1",
+											"x-etsi-mec-origin-type": "Enum_inlined"
+										},
+										"verticalSpeed": {
+											"description": "Vertical speed, expressed in km/h and defined in [14]. Present only if \"velocityType\" equals 2 or 4",
+											"type": "integer",
+											"x-etsi-mec-cardinality": "0..1",
+											"x-etsi-mec-origin-type": "Int"
+										},
+										"verticalUncertainty": {
+											"description": "Vertical uncertainty, as defined in [14]. Present only if \"velocityType\" equals 4",
+											"type": "integer",
+											"x-etsi-mec-cardinality": "0..1",
+											"x-etsi-mec-origin-type": "UnsignedInt"
+										}
+									},
+									"required": [
+										"velocityType",
+										"bearing",
+										"horizontalSpeed"
+									],
+									"type": "object",
+									"x-etsi-mec-cardinality": "0..1",
+									"x-etsi-mec-origin-type": "Structure (inlined)"
+								}
+							},
+							"required": [
+								"latitude",
+								"longitude",
+								"shape"
+							],
+							"type": "object",
+							"x-etsi-ref": "6.5.3"
+						},
+						"numberOfUsers": {
+							"description": "Number of users currently on the access point.",
+							"type": "integer",
+							"x-etsi-mec-cardinality": 1,
+							"x-etsi-mec-origin-type": "integer"
+						},
+						"operationStatus": {
+							"enum": [
+								"Serviceable",
+								"Unserviceable",
+								"Unknown"
+							],
+							"type": "string"
+						},
+						"resourceURL": {
+							"description": "Self referring URL",
+							"type": "string",
+							"x-etsi-mec-cardinality": 1,
+							"x-etsi-mec-origin-type": "anyURI"
+						},
+						"timezone": {
+							"description": "Time zone of access point.",
+							"type": "string",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "dateTimeStamp"
+						}
+					},
+					"required": [
+						"accessPointId",
+						"connectionType",
+						"operationStatus",
+						"numberOfUsers",
+						"resourceURL"
+					],
+					"type": "object"
+				},
+				"type": "array",
+				"x-etsi-mec-cardinality": "0..N",
+				"x-etsi-mec-origin-type": "AccessPointInfo"
+			},
+			"resourceURL": {
+				"description": "Self referring URL",
+				"type": "string",
+				"x-etsi-mec-cardinality": 1,
+				"x-etsi-mec-origin-type": "anyURI"
+			},
+			"zoneId": {
+				"description": "Identifier of zone",
+				"type": "string",
+				"x-etsi-mec-cardinality": 1,
+				"x-etsi-mec-origin-type": "string"
+			}
+		},
+		"required": [
+			"zoneId",
+			"resourceURL"
+		],
+		"type": "object"
+	}
+}
\ No newline at end of file
diff --git a/SRV/UEAREASUB/jsons/CircleNotificationSubscription.json b/SRV/UEAREASUB/jsons/CircleNotificationSubscription.json
index 2780574..17b185b 100644
--- a/SRV/UEAREASUB/jsons/CircleNotificationSubscription.json
+++ b/SRV/UEAREASUB/jsons/CircleNotificationSubscription.json
@@ -1,15 +1,17 @@
 {
-		"address": "acr:10.0.0.1",
-		"callbackReference": {
-			"callbackData": "1234",
-			"notifyURL": "http://application.example.com/notifications/distance_notifications/123456"
-		},
-		"checkImmediate": "true",
-		"clientCorrelator": "0123",
-		"enteringLeavingCriteria": "Entering",
-		"frequency": "10",
-		"latitude": "-80.86302",
-		"longitude": "41.277306",
-		"radius": "500",
-		"trackingAccuracy": "10"
+  "circleNotificationSubscription": {
+    "clientCorrelator": "0123",
+    "callbackReference": {
+      "callbackData": "1234",
+      "notifyURL": "http://clientApp.example.com/location_notifications/123456"
+    },
+    "address": "acr:10.0.0.1",
+    "checkImmediate": true,
+    "enteringLeavingCriteria": "Entering",
+    "frequency": 10,
+    "latitude": -80.88,
+    "longitude": 41.277,
+    "radius": 500,
+    "trackingAccuracy": 10
+  }
 }
\ No newline at end of file
diff --git a/SRV/UEAREASUB/jsons/CircleNotificationSubscriptionError.json b/SRV/UEAREASUB/jsons/CircleNotificationSubscriptionError.json
index 3f9f6e8..3378803 100644
--- a/SRV/UEAREASUB/jsons/CircleNotificationSubscriptionError.json
+++ b/SRV/UEAREASUB/jsons/CircleNotificationSubscriptionError.json
@@ -1,15 +1,17 @@
 {
-		"address": "acr:10.0.0.1",
-		"callback": {
-			"callbackData": "1234",
-			"notifyURL": "http://application.example.com/notifications/distance_notifications/123456"
-		},
-		"checkImmediate": "true",
-		"clientCorrelator": "0123",
-		"enteringLeavingCriteria": "Entering",
-		"frequency": "10",
-		"latitude": "-80.86302",
-		"longitude": "41.277306",
-		"radius": "500",
-		"trackingAccuracy": "10"
+  "circleNotificationSubscription": {
+    "clientCorrelator": "0123",
+    "callback": {
+      "callbackData": "1234",
+      "notifyURL": "http://clientApp.example.com/location_notifications/123456"
+    },
+    "address": "acr:10.0.0.1",
+    "checkImmediate": true,
+    "enteringLeavingCriteria": "Entering",
+    "frequency": 10,
+    "latitude": -80.88,
+    "longitude": 41.277,
+    "radius": 500,
+    "trackingAccuracy": 10
+  }
 }
\ No newline at end of file
diff --git a/SRV/UEAREASUB/schemas/CircleNotificationSubscription.schema.json b/SRV/UEAREASUB/schemas/CircleNotificationSubscription.schema.json
index f8b20f2..0791f2d 100644
--- a/SRV/UEAREASUB/schemas/CircleNotificationSubscription.schema.json
+++ b/SRV/UEAREASUB/schemas/CircleNotificationSubscription.schema.json
@@ -1,11 +1,177 @@
 {
-  "properties": {
-    "undefinedJsonSchema": {
-      "type": "string",
-      "description": "Json Schema for the given object is not yet defined"
-    }
-  },
-  "required": [
-    "undefinedJsonSchema"
-  ]
+	"type": "object",
+	"properties": {
+		"circleNotificationSubscription": {
+			"description": "A type containing data for notifications, when the area is defined as a circle.",
+			"properties": {
+				"address": {
+					"description": "Address of terminals to monitor (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+					"items": {
+						"type": "string"
+					},
+					"type": "array",
+					"x-etsi-mec-cardinality": "1..N",
+					"x-etsi-mec-origin-type": "anyURI"
+				},
+				"callbackReference": {
+					"properties": {
+						"callbackData": {
+							"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+							"type": "string",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "string"
+						},
+						"notificationFormat": {
+							"enum": [
+								"XML",
+								"JSON"
+							],
+							"type": "string"
+						},
+						"notifyURL": {
+							"description": "Notify Callback URL",
+							"type": "string",
+							"x-etsi-mec-cardinality": "1",
+							"x-etsi-mec-origin-type": "anyURI"
+						}
+					},
+					"required": [
+						"notifyURL"
+					],
+					"type": "object"
+				},
+				"checkImmediate": {
+					"description": "Check location immediately after establishing notification.",
+					"type": "boolean",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "boolean"
+				},
+				"clientCorrelator": {
+					"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+					"type": "string",
+					"x-etsi-mec-cardinality": "0..1",
+					"x-etsi-mec-origin-type": "string"
+				},
+				"count": {
+					"description": "Maximum number of notifications per individual address. For no maximum, either do not include this element or specify a value of zero. Default value is 0.",
+					"type": "integer",
+					"x-etsi-mec-cardinality": "0..1",
+					"x-etsi-mec-origin-type": "int"
+				},
+				"duration": {
+					"description": "Period of time (in seconds) notifications are provided for. If set to “0” (zero), a default duration time, which is specified by the service policy, will be used. If the parameter is omitted, the notifications will continue until the maximum duration time, which is specified by the service policy, unless the notifications are stopped by deletion of subscription for notifications.",
+					"type": "integer",
+					"x-etsi-mec-cardinality": "0..1",
+					"x-etsi-mec-origin-type": "int"
+				},
+				"enteringLeavingCriteria": {
+					"enum": [
+						"Entering",
+						"Leaving"
+					],
+					"type": "string"
+				},
+				"frequency": {
+					"description": "Maximum frequency (in seconds) of notifications per subscription (can also be considered minimum time between notifications).",
+					"type": "integer",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "int"
+				},
+				"latitude": {
+					"description": "Latitude of center point.",
+					"format": "float",
+					"type": "number",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "float"
+				},
+				"link": {
+					"description": "Link to other resources that are in relationship with the resource.",
+					"items": {
+						"description": "Link to other resources",
+						"properties": {
+							"href": {
+								"description": "URI",
+								"format": "anyURI",
+								"type": "string"
+							},
+							"rel": {
+								"description": "Describes the relationship between the URI and the resource.",
+								"type": "string"
+							}
+						},
+						"required": [
+							"rel",
+							"href"
+						],
+						"type": "object"
+					},
+					"type": "array",
+					"x-etsi-mec-cardinality": "0..N",
+					"x-etsi-mec-origin-type": "Link"
+				},
+				"longitude": {
+					"description": "Longitude of center point.",
+					"format": "float",
+					"type": "number",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "float"
+				},
+				"radius": {
+					"description": "Radius circle around center point in meters.",
+					"format": "float",
+					"type": "number",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "float"
+				},
+				"requester": {
+					"description": "Identifies the entity that is requesting the information (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+					"type": "string",
+					"x-etsi-mec-cardinality": "0..1",
+					"x-etsi-mec-origin-type": "anyURI"
+				},
+				"resourceURL": {
+					"description": "Self referring URL",
+					"type": "string",
+					"x-etsi-mec-cardinality": "0..1",
+					"x-etsi-mec-origin-type": "anyURI"
+				},
+				"trackingAccuracy": {
+					"description": "Number of meters of acceptable error in tracking distance.",
+					"format": "float",
+					"type": "number",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "float"
+				}
+			},
+			"required": [
+				"callbackReference",
+				"address",
+				"latitude",
+				"longitude",
+				"radius",
+				"trackingAccuracy",
+				"enteringLeavingCriteria",
+				"checkImmediate",
+				"frequency"
+			],
+			"type": "object"
+		}
+	},
+	"example": {
+		"circleNotificationSubscription": {
+			"clientCorrelator": "0123",
+			"callbackReference": {
+				"callbackData": "1234",
+				"notifyURL": "http://clientApp.example.com/location_notifications/123456"
+			},
+			"address": "acr:10.0.0.1",
+			"checkImmediate": true,
+			"enteringLeavingCriteria": "Entering",
+			"frequency": 10,
+			"latitude": -80.88,
+			"longitude": 41.277,
+			"radius": 500,
+			"trackingAccuracy": 10
+		}
+	}
 }
\ No newline at end of file
diff --git a/SRV/UEAREASUB/schemas/NotificationSubscriptionList.schema.json b/SRV/UEAREASUB/schemas/NotificationSubscriptionList.schema.json
new file mode 100644
index 0000000..efa7244
--- /dev/null
+++ b/SRV/UEAREASUB/schemas/NotificationSubscriptionList.schema.json
@@ -0,0 +1,715 @@
+{
+	"type": "object",
+	"required": [
+		"notificationSubscriptionList"
+	],
+	"properties": {
+		"notificationSubscriptionList": {
+			"properties": {
+				"circleNotificationSubscription": {
+					"description": "Collection of CircleNotificationSubscription elements, see note 2.",
+					"items": {
+						"description": "A type containing data for notifications, when the area is defined as a circle.",
+						"properties": {
+							"address": {
+								"description": "Address of terminals to monitor (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+								"items": {
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "1..N",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"checkImmediate": {
+								"description": "Check location immediately after establishing notification.",
+								"type": "boolean",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "boolean"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"count": {
+								"description": "Maximum number of notifications per individual address. For no maximum, either do not include this element or specify a value of zero. Default value is 0.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "int"
+							},
+							"duration": {
+								"description": "Period of time (in seconds) notifications are provided for. If set to “0” (zero), a default duration time, which is specified by the service policy, will be used. If the parameter is omitted, the notifications will continue until the maximum duration time, which is specified by the service policy, unless the notifications are stopped by deletion of subscription for notifications.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "int"
+							},
+							"enteringLeavingCriteria": {
+								"enum": [
+									"Entering",
+									"Leaving"
+								],
+								"type": "string"
+							},
+							"frequency": {
+								"description": "Maximum frequency (in seconds) of notifications per subscription (can also be considered minimum time between notifications).",
+								"type": "integer",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "int"
+							},
+							"latitude": {
+								"description": "Latitude of center point.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							},
+							"link": {
+								"description": "Link to other resources that are in relationship with the resource.",
+								"items": {
+									"description": "Link to other resources",
+									"properties": {
+										"href": {
+											"description": "URI",
+											"format": "anyURI",
+											"type": "string"
+										},
+										"rel": {
+											"description": "Describes the relationship between the URI and the resource.",
+											"type": "string"
+										}
+									},
+									"required": [
+										"rel",
+										"href"
+									],
+									"type": "object"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "Link"
+							},
+							"longitude": {
+								"description": "Longitude of center point.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							},
+							"radius": {
+								"description": "Radius circle around center point in meters.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							},
+							"requester": {
+								"description": "Identifies the entity that is requesting the information (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"trackingAccuracy": {
+								"description": "Number of meters of acceptable error in tracking distance.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"address",
+							"latitude",
+							"longitude",
+							"radius",
+							"trackingAccuracy",
+							"enteringLeavingCriteria",
+							"checkImmediate",
+							"frequency"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "CircleNotificationSubscription"
+				},
+				"distanceNotificationSubscription": {
+					"description": "Collection of DistanceNotificationSubscription elements, see note 2.",
+					"items": {
+						"description": "A type containing data for distance subscription, with reference to other devices.",
+						"properties": {
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"checkImmediate": {
+								"description": "Check location immediately after establishing notification.",
+								"type": "boolean",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "boolean"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"count": {
+								"description": "Maximum number of notifications per individual address. For no maximum, either do not include this element or specify a value of zero. Default value is 0.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "int"
+							},
+							"criteria": {
+								"enum": [
+									"AllWithinDistance",
+									"AnyWithinDistance",
+									"AllBeyondDistance",
+									"AnyBeyondDistance"
+								],
+								"type": "string"
+							},
+							"distance": {
+								"description": "Distance between devices that shall be monitored.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							},
+							"duration": {
+								"description": "Period of time (in seconds) notifications are provided for. If set to “0” (zero), a default duration time, which is specified by the service policy, will be used. If the parameter is omitted, the notifications will continue until the maximum duration time, which is specified by the service policy, unless the notifications are stopped by deletion of subscription for notifications.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "int"
+							},
+							"frequency": {
+								"description": "Maximum frequency (in seconds) of notifications per subscription (can also be considered minimum time between notifications).",
+								"type": "integer",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "int"
+							},
+							"link": {
+								"description": "Link to other resources that are in relationship with the resource.",
+								"items": {
+									"description": "Link to other resources",
+									"properties": {
+										"href": {
+											"description": "URI",
+											"format": "anyURI",
+											"type": "string"
+										},
+										"rel": {
+											"description": "Describes the relationship between the URI and the resource.",
+											"type": "string"
+										}
+									},
+									"required": [
+										"rel",
+										"href"
+									],
+									"type": "object"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "Link"
+							},
+							"monitoredAddress": {
+								"description": "Contains addresses of devices to monitor (e.g., 'sip' URI, 'tel' URI, 'acr' URI)",
+								"items": {
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "1..N",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"referenceAddress": {
+								"description": "Indicates address of each device that will be used as reference devices from which the distances towards monitored devices indicated in the Addresses will be monitored (e.g., 'sip' URI, 'tel' URI, 'acr' URI)",
+								"items": {
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"requester": {
+								"description": "Identifies the entity that is requesting the information (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"trackingAccuracy": {
+								"description": "Number of meters of acceptable error in tracking distance.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"monitoredAddress",
+							"distance",
+							"trackingAccuracy",
+							"criteria",
+							"checkImmediate",
+							"frequency"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "DistanceNotificationSubscription"
+				},
+				"periodicNotificationSubscription": {
+					"description": "Collection of PeriodicNotificationSubscription elements, see note 2.",
+					"items": {
+						"description": "A type containing data for periodic subscription.",
+						"properties": {
+							"address": {
+								"description": "Address of terminals to monitor (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+								"items": {
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "1..N",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"duration": {
+								"description": "Period of time (in seconds) notifications are provided for. If set to “0” (zero), a default duration time, which is specified by the service policy, will be used. If the parameter is omitted, the notifications will continue until the maximum duration time, which is specified by the service policy, unless the notifications are stopped by deletion of subscription for notifications.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "int"
+							},
+							"frequency": {
+								"description": "Maximum frequency (in seconds) of notifications (can also be considered minimum time between notifications) per subscription.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "int"
+							},
+							"link": {
+								"description": "Link to other resources that are in relationship with the resource.",
+								"items": {
+									"description": "Link to other resources",
+									"properties": {
+										"href": {
+											"description": "URI",
+											"format": "anyURI",
+											"type": "string"
+										},
+										"rel": {
+											"description": "Describes the relationship between the URI and the resource.",
+											"type": "string"
+										}
+									},
+									"required": [
+										"rel",
+										"href"
+									],
+									"type": "object"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "Link"
+							},
+							"requestedAccuracy": {
+								"description": "Accuracy of the provided distance in meters.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "int"
+							},
+							"requester": {
+								"description": "Identifies the entity that is requesting the information (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"address",
+							"requestedAccuracy",
+							"frequency"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "PeriodicNotificationSubscription"
+				},
+				"resourceURL": {
+					"description": "Self-referring URL, see note 1.",
+					"format": "uri",
+					"type": "string",
+					"x-etsi-mec-cardinality": "1",
+					"x-etsi-mec-origin-type": "AnyURI"
+				},
+				"userTrackingSubscription": {
+					"description": "Collection of UserTrackingSubscription elements, see note 1.",
+					"items": {
+						"description": "A type containing user tracking subscription.",
+						"properties": {
+							"address": {
+								"description": "Address of user (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI) to monitor",
+								"type": "string",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"userEventCriteria": {
+								"description": "List of user event values to generate notifications for (these apply to address specified). If this element is missing, a notification is requested to be generated for any change in user event.",
+								"items": {
+									"enum": [
+										"Entering",
+										"Leaving",
+										"Transferring"
+									],
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "UserEventType"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"address"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "UserTrackingSubscription"
+				},
+				"zonalTrafficSubscription": {
+					"description": "Collection of ZonalTrafficSubscription elements, see note 1.",
+					"items": {
+						"description": "A type containing zonal traffic subscription",
+						"properties": {
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"duration": {
+								"description": "Period (in seconds) of time notifications are provided for. If set to \"0\" (zero), a default duration time, which is specified by the service policy, will be used. If the parameter is omitted, the notifications will continue until the maximum duration time, which is specified by the service policy, unless the notifications are stopped by deletion of subscription for notifications. This element MAY be given by the client during resource creation in order to signal the desired lifetime of the subscription. The server MUST return in this element the   period of time for which the subscription will still be valid.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "unsignedInt"
+							},
+							"interestRealm": {
+								"description": "Interest realm of access point (e.g. geographical area, a type of industry etc.).",
+								"items": {
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"userEventCriteria": {
+								"description": "List of user event values to generate notifications for (these apply to zone identifier or all interest realms within zone identifier specified). If this element is missing, a notification is requested to be generated for any change in user event.",
+								"items": {
+									"enum": [
+										"Entering",
+										"Leaving",
+										"Transferring"
+									],
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "UserEventType"
+							},
+							"zoneId": {
+								"description": "Identifier of zone",
+								"type": "string",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "string"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"zoneId"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "ZonalTrafficSubscription"
+				},
+				"zoneStatusSubscription": {
+					"description": "Collection of ZoneStatusSubscription elements, see note 1.",
+					"items": {
+						"description": "A type containing zone status subscription.",
+						"properties": {
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"numberOfUsersAPThreshold": {
+								"description": "Threshold number of users in an access point which if crossed shall cause a notification",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "unsignedInt"
+							},
+							"numberOfUsersZoneThreshold": {
+								"description": "Threshold number of users in a zone which if crossed shall cause a notification",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "unsignedInt"
+							},
+							"operationStatus": {
+								"description": "List of operation status values to generate notifications for (these apply to all access points within a zone).",
+								"items": {
+									"enum": [
+										"Serviceable",
+										"Unserviceable",
+										"Unknown"
+									],
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "OperationStatus"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"zoneId": {
+								"description": "Identifier of zone",
+								"type": "string",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "string"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"zoneId"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "ZoneStatusSubscription"
+				}
+			},
+			"required": [
+				"resourceURL"
+			],
+			"type": "object",
+			"x-etsi-notes": "NOTE 1:\tAs specified in [5], clause 5.2.2.8.\nNOTE 2: \tAs specified in [6], clause 5.2.2.7.",
+			"x-etsi-ref": "6.3.3"
+		}
+	}
+}
\ No newline at end of file
diff --git a/SRV/UEDISTLOOK/schemas/TerminalDistance.schema.json b/SRV/UEDISTLOOK/schemas/TerminalDistance.schema.json
index f8b20f2..ccee80a 100644
--- a/SRV/UEDISTLOOK/schemas/TerminalDistance.schema.json
+++ b/SRV/UEDISTLOOK/schemas/TerminalDistance.schema.json
@@ -1,11 +1,50 @@
 {
-  "properties": {
-    "undefinedJsonSchema": {
-      "type": "string",
-      "description": "Json Schema for the given object is not yet defined"
-    }
-  },
-  "required": [
-    "undefinedJsonSchema"
-  ]
+	"type": "object",
+	"properties": {
+		"terminalDistance": {
+			"description": "A type containing information about the distance from a terminal to a location or between two terminals, in addition the accuracy and a timestamp of the information are provided.",
+			"properties": {
+				"accuracy": {
+					"description": "Accuracy of the provided distance in meters",
+					"type": "integer",
+					"x-etsi-mec-cardinality": "0..1",
+					"x-etsi-mec-origin-type": "integer"
+				},
+				"distance": {
+					"description": "Distance from terminal to a location or between two terminals specified in meters",
+					"type": "integer",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "integer"
+				},
+				"timestamp": {
+					"properties": {
+						"nanoSeconds": {
+							"description": "The nanoseconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.",
+							"format": "int32",
+							"type": "integer",
+							"x-etsi-mec-cardinality": "1",
+							"x-etsi-mec-origin-type": "Uint32"
+						},
+						"seconds": {
+							"description": "The seconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.",
+							"format": "int32",
+							"type": "integer",
+							"x-etsi-mec-cardinality": "1",
+							"x-etsi-mec-origin-type": "Uint32"
+						}
+					},
+					"required": [
+						"seconds",
+						"nanoSeconds"
+					],
+					"type": "object",
+					"x-etsi-ref": "6.5.2"
+				}
+			},
+			"required": [
+				"distance"
+			],
+			"type": "object"
+		}
+	}
 }
\ No newline at end of file
diff --git a/SRV/UEDISTSUB/schemas/DistanceNotificationSubscription.schema.json b/SRV/UEDISTSUB/schemas/DistanceNotificationSubscription.schema.json
index f8b20f2..aaac2e4 100644
--- a/SRV/UEDISTSUB/schemas/DistanceNotificationSubscription.schema.json
+++ b/SRV/UEDISTSUB/schemas/DistanceNotificationSubscription.schema.json
@@ -1,11 +1,174 @@
 {
-  "properties": {
-    "undefinedJsonSchema": {
-      "type": "string",
-      "description": "Json Schema for the given object is not yet defined"
-    }
-  },
-  "required": [
-    "undefinedJsonSchema"
-  ]
+	"type": "object",
+	"properties": {
+		"distanceNotificationSubscription": {
+			"description": "A type containing data for distance subscription, with reference to other devices.",
+			"properties": {
+				"callbackReference": {
+					"properties": {
+						"callbackData": {
+							"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+							"type": "string",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "string"
+						},
+						"notificationFormat": {
+							"enum": [
+								"XML",
+								"JSON"
+							],
+							"type": "string"
+						},
+						"notifyURL": {
+							"description": "Notify Callback URL",
+							"type": "string",
+							"x-etsi-mec-cardinality": "1",
+							"x-etsi-mec-origin-type": "anyURI"
+						}
+					},
+					"required": [
+						"notifyURL"
+					],
+					"type": "object"
+				},
+				"checkImmediate": {
+					"description": "Check location immediately after establishing notification.",
+					"type": "boolean",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "boolean"
+				},
+				"clientCorrelator": {
+					"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+					"type": "string",
+					"x-etsi-mec-cardinality": "0..1",
+					"x-etsi-mec-origin-type": "string"
+				},
+				"count": {
+					"description": "Maximum number of notifications per individual address. For no maximum, either do not include this element or specify a value of zero. Default value is 0.",
+					"type": "integer",
+					"x-etsi-mec-cardinality": "0..1",
+					"x-etsi-mec-origin-type": "int"
+				},
+				"criteria": {
+					"enum": [
+						"AllWithinDistance",
+						"AnyWithinDistance",
+						"AllBeyondDistance",
+						"AnyBeyondDistance"
+					],
+					"type": "string"
+				},
+				"distance": {
+					"description": "Distance between devices that shall be monitored.",
+					"format": "float",
+					"type": "number",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "float"
+				},
+				"duration": {
+					"description": "Period of time (in seconds) notifications are provided for. If set to “0” (zero), a default duration time, which is specified by the service policy, will be used. If the parameter is omitted, the notifications will continue until the maximum duration time, which is specified by the service policy, unless the notifications are stopped by deletion of subscription for notifications.",
+					"type": "integer",
+					"x-etsi-mec-cardinality": "0..1",
+					"x-etsi-mec-origin-type": "int"
+				},
+				"frequency": {
+					"description": "Maximum frequency (in seconds) of notifications per subscription (can also be considered minimum time between notifications).",
+					"type": "integer",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "int"
+				},
+				"link": {
+					"description": "Link to other resources that are in relationship with the resource.",
+					"items": {
+						"description": "Link to other resources",
+						"properties": {
+							"href": {
+								"description": "URI",
+								"format": "anyURI",
+								"type": "string"
+							},
+							"rel": {
+								"description": "Describes the relationship between the URI and the resource.",
+								"type": "string"
+							}
+						},
+						"required": [
+							"rel",
+							"href"
+						],
+						"type": "object"
+					},
+					"type": "array",
+					"x-etsi-mec-cardinality": "0..N",
+					"x-etsi-mec-origin-type": "Link"
+				},
+				"monitoredAddress": {
+					"description": "Contains addresses of devices to monitor (e.g., 'sip' URI, 'tel' URI, 'acr' URI)",
+					"items": {
+						"type": "string"
+					},
+					"type": "array",
+					"x-etsi-mec-cardinality": "1..N",
+					"x-etsi-mec-origin-type": "anyURI"
+				},
+				"referenceAddress": {
+					"description": "Indicates address of each device that will be used as reference devices from which the distances towards monitored devices indicated in the Addresses will be monitored (e.g., 'sip' URI, 'tel' URI, 'acr' URI)",
+					"items": {
+						"type": "string"
+					},
+					"type": "array",
+					"x-etsi-mec-cardinality": "0..N",
+					"x-etsi-mec-origin-type": "anyURI"
+				},
+				"requester": {
+					"description": "Identifies the entity that is requesting the information (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+					"type": "string",
+					"x-etsi-mec-cardinality": "0..1",
+					"x-etsi-mec-origin-type": "anyURI"
+				},
+				"resourceURL": {
+					"description": "Self referring URL",
+					"type": "string",
+					"x-etsi-mec-cardinality": "0..1",
+					"x-etsi-mec-origin-type": "anyURI"
+				},
+				"trackingAccuracy": {
+					"description": "Number of meters of acceptable error in tracking distance.",
+					"format": "float",
+					"type": "number",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "float"
+				}
+			},
+			"required": [
+				"callbackReference",
+				"monitoredAddress",
+				"distance",
+				"trackingAccuracy",
+				"criteria",
+				"checkImmediate",
+				"frequency"
+			],
+			"type": "object"
+		}
+	},
+	"example": {
+		"distanceNotificationSubscription": {
+			"clientCorrelator": "0123",
+			"callbackReference": {
+				"callbackData": "1234",
+				"notifyURL": "http://clientApp.example.com/location_notifications/123456"
+			},
+			"monitoredAddress": [
+				"acr:10.0.0.1",
+				"acr:10.0.0.2"
+			],
+			"checkImmediate": true,
+			"criteria": "AllWithinDistance",
+			"distance": 100,
+			"frequency": 10,
+			"referenceAddress": "acr:10.0.0.3",
+			"trackingAccuracy": 10
+		}
+	}
 }
\ No newline at end of file
diff --git a/SRV/UEDISTSUB/schemas/NotificationSubscriptionList.schema.json b/SRV/UEDISTSUB/schemas/NotificationSubscriptionList.schema.json
new file mode 100644
index 0000000..efa7244
--- /dev/null
+++ b/SRV/UEDISTSUB/schemas/NotificationSubscriptionList.schema.json
@@ -0,0 +1,715 @@
+{
+	"type": "object",
+	"required": [
+		"notificationSubscriptionList"
+	],
+	"properties": {
+		"notificationSubscriptionList": {
+			"properties": {
+				"circleNotificationSubscription": {
+					"description": "Collection of CircleNotificationSubscription elements, see note 2.",
+					"items": {
+						"description": "A type containing data for notifications, when the area is defined as a circle.",
+						"properties": {
+							"address": {
+								"description": "Address of terminals to monitor (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+								"items": {
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "1..N",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"checkImmediate": {
+								"description": "Check location immediately after establishing notification.",
+								"type": "boolean",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "boolean"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"count": {
+								"description": "Maximum number of notifications per individual address. For no maximum, either do not include this element or specify a value of zero. Default value is 0.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "int"
+							},
+							"duration": {
+								"description": "Period of time (in seconds) notifications are provided for. If set to “0” (zero), a default duration time, which is specified by the service policy, will be used. If the parameter is omitted, the notifications will continue until the maximum duration time, which is specified by the service policy, unless the notifications are stopped by deletion of subscription for notifications.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "int"
+							},
+							"enteringLeavingCriteria": {
+								"enum": [
+									"Entering",
+									"Leaving"
+								],
+								"type": "string"
+							},
+							"frequency": {
+								"description": "Maximum frequency (in seconds) of notifications per subscription (can also be considered minimum time between notifications).",
+								"type": "integer",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "int"
+							},
+							"latitude": {
+								"description": "Latitude of center point.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							},
+							"link": {
+								"description": "Link to other resources that are in relationship with the resource.",
+								"items": {
+									"description": "Link to other resources",
+									"properties": {
+										"href": {
+											"description": "URI",
+											"format": "anyURI",
+											"type": "string"
+										},
+										"rel": {
+											"description": "Describes the relationship between the URI and the resource.",
+											"type": "string"
+										}
+									},
+									"required": [
+										"rel",
+										"href"
+									],
+									"type": "object"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "Link"
+							},
+							"longitude": {
+								"description": "Longitude of center point.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							},
+							"radius": {
+								"description": "Radius circle around center point in meters.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							},
+							"requester": {
+								"description": "Identifies the entity that is requesting the information (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"trackingAccuracy": {
+								"description": "Number of meters of acceptable error in tracking distance.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"address",
+							"latitude",
+							"longitude",
+							"radius",
+							"trackingAccuracy",
+							"enteringLeavingCriteria",
+							"checkImmediate",
+							"frequency"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "CircleNotificationSubscription"
+				},
+				"distanceNotificationSubscription": {
+					"description": "Collection of DistanceNotificationSubscription elements, see note 2.",
+					"items": {
+						"description": "A type containing data for distance subscription, with reference to other devices.",
+						"properties": {
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"checkImmediate": {
+								"description": "Check location immediately after establishing notification.",
+								"type": "boolean",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "boolean"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"count": {
+								"description": "Maximum number of notifications per individual address. For no maximum, either do not include this element or specify a value of zero. Default value is 0.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "int"
+							},
+							"criteria": {
+								"enum": [
+									"AllWithinDistance",
+									"AnyWithinDistance",
+									"AllBeyondDistance",
+									"AnyBeyondDistance"
+								],
+								"type": "string"
+							},
+							"distance": {
+								"description": "Distance between devices that shall be monitored.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							},
+							"duration": {
+								"description": "Period of time (in seconds) notifications are provided for. If set to “0” (zero), a default duration time, which is specified by the service policy, will be used. If the parameter is omitted, the notifications will continue until the maximum duration time, which is specified by the service policy, unless the notifications are stopped by deletion of subscription for notifications.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "int"
+							},
+							"frequency": {
+								"description": "Maximum frequency (in seconds) of notifications per subscription (can also be considered minimum time between notifications).",
+								"type": "integer",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "int"
+							},
+							"link": {
+								"description": "Link to other resources that are in relationship with the resource.",
+								"items": {
+									"description": "Link to other resources",
+									"properties": {
+										"href": {
+											"description": "URI",
+											"format": "anyURI",
+											"type": "string"
+										},
+										"rel": {
+											"description": "Describes the relationship between the URI and the resource.",
+											"type": "string"
+										}
+									},
+									"required": [
+										"rel",
+										"href"
+									],
+									"type": "object"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "Link"
+							},
+							"monitoredAddress": {
+								"description": "Contains addresses of devices to monitor (e.g., 'sip' URI, 'tel' URI, 'acr' URI)",
+								"items": {
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "1..N",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"referenceAddress": {
+								"description": "Indicates address of each device that will be used as reference devices from which the distances towards monitored devices indicated in the Addresses will be monitored (e.g., 'sip' URI, 'tel' URI, 'acr' URI)",
+								"items": {
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"requester": {
+								"description": "Identifies the entity that is requesting the information (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"trackingAccuracy": {
+								"description": "Number of meters of acceptable error in tracking distance.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"monitoredAddress",
+							"distance",
+							"trackingAccuracy",
+							"criteria",
+							"checkImmediate",
+							"frequency"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "DistanceNotificationSubscription"
+				},
+				"periodicNotificationSubscription": {
+					"description": "Collection of PeriodicNotificationSubscription elements, see note 2.",
+					"items": {
+						"description": "A type containing data for periodic subscription.",
+						"properties": {
+							"address": {
+								"description": "Address of terminals to monitor (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+								"items": {
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "1..N",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"duration": {
+								"description": "Period of time (in seconds) notifications are provided for. If set to “0” (zero), a default duration time, which is specified by the service policy, will be used. If the parameter is omitted, the notifications will continue until the maximum duration time, which is specified by the service policy, unless the notifications are stopped by deletion of subscription for notifications.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "int"
+							},
+							"frequency": {
+								"description": "Maximum frequency (in seconds) of notifications (can also be considered minimum time between notifications) per subscription.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "int"
+							},
+							"link": {
+								"description": "Link to other resources that are in relationship with the resource.",
+								"items": {
+									"description": "Link to other resources",
+									"properties": {
+										"href": {
+											"description": "URI",
+											"format": "anyURI",
+											"type": "string"
+										},
+										"rel": {
+											"description": "Describes the relationship between the URI and the resource.",
+											"type": "string"
+										}
+									},
+									"required": [
+										"rel",
+										"href"
+									],
+									"type": "object"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "Link"
+							},
+							"requestedAccuracy": {
+								"description": "Accuracy of the provided distance in meters.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "int"
+							},
+							"requester": {
+								"description": "Identifies the entity that is requesting the information (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"address",
+							"requestedAccuracy",
+							"frequency"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "PeriodicNotificationSubscription"
+				},
+				"resourceURL": {
+					"description": "Self-referring URL, see note 1.",
+					"format": "uri",
+					"type": "string",
+					"x-etsi-mec-cardinality": "1",
+					"x-etsi-mec-origin-type": "AnyURI"
+				},
+				"userTrackingSubscription": {
+					"description": "Collection of UserTrackingSubscription elements, see note 1.",
+					"items": {
+						"description": "A type containing user tracking subscription.",
+						"properties": {
+							"address": {
+								"description": "Address of user (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI) to monitor",
+								"type": "string",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"userEventCriteria": {
+								"description": "List of user event values to generate notifications for (these apply to address specified). If this element is missing, a notification is requested to be generated for any change in user event.",
+								"items": {
+									"enum": [
+										"Entering",
+										"Leaving",
+										"Transferring"
+									],
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "UserEventType"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"address"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "UserTrackingSubscription"
+				},
+				"zonalTrafficSubscription": {
+					"description": "Collection of ZonalTrafficSubscription elements, see note 1.",
+					"items": {
+						"description": "A type containing zonal traffic subscription",
+						"properties": {
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"duration": {
+								"description": "Period (in seconds) of time notifications are provided for. If set to \"0\" (zero), a default duration time, which is specified by the service policy, will be used. If the parameter is omitted, the notifications will continue until the maximum duration time, which is specified by the service policy, unless the notifications are stopped by deletion of subscription for notifications. This element MAY be given by the client during resource creation in order to signal the desired lifetime of the subscription. The server MUST return in this element the   period of time for which the subscription will still be valid.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "unsignedInt"
+							},
+							"interestRealm": {
+								"description": "Interest realm of access point (e.g. geographical area, a type of industry etc.).",
+								"items": {
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"userEventCriteria": {
+								"description": "List of user event values to generate notifications for (these apply to zone identifier or all interest realms within zone identifier specified). If this element is missing, a notification is requested to be generated for any change in user event.",
+								"items": {
+									"enum": [
+										"Entering",
+										"Leaving",
+										"Transferring"
+									],
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "UserEventType"
+							},
+							"zoneId": {
+								"description": "Identifier of zone",
+								"type": "string",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "string"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"zoneId"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "ZonalTrafficSubscription"
+				},
+				"zoneStatusSubscription": {
+					"description": "Collection of ZoneStatusSubscription elements, see note 1.",
+					"items": {
+						"description": "A type containing zone status subscription.",
+						"properties": {
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"numberOfUsersAPThreshold": {
+								"description": "Threshold number of users in an access point which if crossed shall cause a notification",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "unsignedInt"
+							},
+							"numberOfUsersZoneThreshold": {
+								"description": "Threshold number of users in a zone which if crossed shall cause a notification",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "unsignedInt"
+							},
+							"operationStatus": {
+								"description": "List of operation status values to generate notifications for (these apply to all access points within a zone).",
+								"items": {
+									"enum": [
+										"Serviceable",
+										"Unserviceable",
+										"Unknown"
+									],
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "OperationStatus"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"zoneId": {
+								"description": "Identifier of zone",
+								"type": "string",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "string"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"zoneId"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "ZoneStatusSubscription"
+				}
+			},
+			"required": [
+				"resourceURL"
+			],
+			"type": "object",
+			"x-etsi-notes": "NOTE 1:\tAs specified in [5], clause 5.2.2.8.\nNOTE 2: \tAs specified in [6], clause 5.2.2.7.",
+			"x-etsi-ref": "6.3.3"
+		}
+	}
+}
\ No newline at end of file
diff --git a/SRV/UEINFOLOOK/PlatUeInformationLookup.robot b/SRV/UEINFOLOOK/PlatUeInformationLookup.robot
index 8a5ba3f..1dffa6f 100644
--- a/SRV/UEINFOLOOK/PlatUeInformationLookup.robot
+++ b/SRV/UEINFOLOOK/PlatUeInformationLookup.robot
@@ -56,6 +56,6 @@ Get list of users with filter
     [Arguments]     ${key}   ${value}
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/users?${key}=${value}
+    Get    ${apiRoot}/${apiName}/${apiVersion}/queries/users?${key}=${value}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SRV/UEINFOSUB/schemas/NotificationSubscriptionList.schema.json b/SRV/UEINFOSUB/schemas/NotificationSubscriptionList.schema.json
new file mode 100644
index 0000000..efa7244
--- /dev/null
+++ b/SRV/UEINFOSUB/schemas/NotificationSubscriptionList.schema.json
@@ -0,0 +1,715 @@
+{
+	"type": "object",
+	"required": [
+		"notificationSubscriptionList"
+	],
+	"properties": {
+		"notificationSubscriptionList": {
+			"properties": {
+				"circleNotificationSubscription": {
+					"description": "Collection of CircleNotificationSubscription elements, see note 2.",
+					"items": {
+						"description": "A type containing data for notifications, when the area is defined as a circle.",
+						"properties": {
+							"address": {
+								"description": "Address of terminals to monitor (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+								"items": {
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "1..N",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"checkImmediate": {
+								"description": "Check location immediately after establishing notification.",
+								"type": "boolean",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "boolean"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"count": {
+								"description": "Maximum number of notifications per individual address. For no maximum, either do not include this element or specify a value of zero. Default value is 0.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "int"
+							},
+							"duration": {
+								"description": "Period of time (in seconds) notifications are provided for. If set to “0” (zero), a default duration time, which is specified by the service policy, will be used. If the parameter is omitted, the notifications will continue until the maximum duration time, which is specified by the service policy, unless the notifications are stopped by deletion of subscription for notifications.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "int"
+							},
+							"enteringLeavingCriteria": {
+								"enum": [
+									"Entering",
+									"Leaving"
+								],
+								"type": "string"
+							},
+							"frequency": {
+								"description": "Maximum frequency (in seconds) of notifications per subscription (can also be considered minimum time between notifications).",
+								"type": "integer",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "int"
+							},
+							"latitude": {
+								"description": "Latitude of center point.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							},
+							"link": {
+								"description": "Link to other resources that are in relationship with the resource.",
+								"items": {
+									"description": "Link to other resources",
+									"properties": {
+										"href": {
+											"description": "URI",
+											"format": "anyURI",
+											"type": "string"
+										},
+										"rel": {
+											"description": "Describes the relationship between the URI and the resource.",
+											"type": "string"
+										}
+									},
+									"required": [
+										"rel",
+										"href"
+									],
+									"type": "object"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "Link"
+							},
+							"longitude": {
+								"description": "Longitude of center point.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							},
+							"radius": {
+								"description": "Radius circle around center point in meters.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							},
+							"requester": {
+								"description": "Identifies the entity that is requesting the information (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"trackingAccuracy": {
+								"description": "Number of meters of acceptable error in tracking distance.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"address",
+							"latitude",
+							"longitude",
+							"radius",
+							"trackingAccuracy",
+							"enteringLeavingCriteria",
+							"checkImmediate",
+							"frequency"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "CircleNotificationSubscription"
+				},
+				"distanceNotificationSubscription": {
+					"description": "Collection of DistanceNotificationSubscription elements, see note 2.",
+					"items": {
+						"description": "A type containing data for distance subscription, with reference to other devices.",
+						"properties": {
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"checkImmediate": {
+								"description": "Check location immediately after establishing notification.",
+								"type": "boolean",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "boolean"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"count": {
+								"description": "Maximum number of notifications per individual address. For no maximum, either do not include this element or specify a value of zero. Default value is 0.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "int"
+							},
+							"criteria": {
+								"enum": [
+									"AllWithinDistance",
+									"AnyWithinDistance",
+									"AllBeyondDistance",
+									"AnyBeyondDistance"
+								],
+								"type": "string"
+							},
+							"distance": {
+								"description": "Distance between devices that shall be monitored.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							},
+							"duration": {
+								"description": "Period of time (in seconds) notifications are provided for. If set to “0” (zero), a default duration time, which is specified by the service policy, will be used. If the parameter is omitted, the notifications will continue until the maximum duration time, which is specified by the service policy, unless the notifications are stopped by deletion of subscription for notifications.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "int"
+							},
+							"frequency": {
+								"description": "Maximum frequency (in seconds) of notifications per subscription (can also be considered minimum time between notifications).",
+								"type": "integer",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "int"
+							},
+							"link": {
+								"description": "Link to other resources that are in relationship with the resource.",
+								"items": {
+									"description": "Link to other resources",
+									"properties": {
+										"href": {
+											"description": "URI",
+											"format": "anyURI",
+											"type": "string"
+										},
+										"rel": {
+											"description": "Describes the relationship between the URI and the resource.",
+											"type": "string"
+										}
+									},
+									"required": [
+										"rel",
+										"href"
+									],
+									"type": "object"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "Link"
+							},
+							"monitoredAddress": {
+								"description": "Contains addresses of devices to monitor (e.g., 'sip' URI, 'tel' URI, 'acr' URI)",
+								"items": {
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "1..N",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"referenceAddress": {
+								"description": "Indicates address of each device that will be used as reference devices from which the distances towards monitored devices indicated in the Addresses will be monitored (e.g., 'sip' URI, 'tel' URI, 'acr' URI)",
+								"items": {
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"requester": {
+								"description": "Identifies the entity that is requesting the information (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"trackingAccuracy": {
+								"description": "Number of meters of acceptable error in tracking distance.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"monitoredAddress",
+							"distance",
+							"trackingAccuracy",
+							"criteria",
+							"checkImmediate",
+							"frequency"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "DistanceNotificationSubscription"
+				},
+				"periodicNotificationSubscription": {
+					"description": "Collection of PeriodicNotificationSubscription elements, see note 2.",
+					"items": {
+						"description": "A type containing data for periodic subscription.",
+						"properties": {
+							"address": {
+								"description": "Address of terminals to monitor (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+								"items": {
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "1..N",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"duration": {
+								"description": "Period of time (in seconds) notifications are provided for. If set to “0” (zero), a default duration time, which is specified by the service policy, will be used. If the parameter is omitted, the notifications will continue until the maximum duration time, which is specified by the service policy, unless the notifications are stopped by deletion of subscription for notifications.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "int"
+							},
+							"frequency": {
+								"description": "Maximum frequency (in seconds) of notifications (can also be considered minimum time between notifications) per subscription.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "int"
+							},
+							"link": {
+								"description": "Link to other resources that are in relationship with the resource.",
+								"items": {
+									"description": "Link to other resources",
+									"properties": {
+										"href": {
+											"description": "URI",
+											"format": "anyURI",
+											"type": "string"
+										},
+										"rel": {
+											"description": "Describes the relationship between the URI and the resource.",
+											"type": "string"
+										}
+									},
+									"required": [
+										"rel",
+										"href"
+									],
+									"type": "object"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "Link"
+							},
+							"requestedAccuracy": {
+								"description": "Accuracy of the provided distance in meters.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "int"
+							},
+							"requester": {
+								"description": "Identifies the entity that is requesting the information (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"address",
+							"requestedAccuracy",
+							"frequency"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "PeriodicNotificationSubscription"
+				},
+				"resourceURL": {
+					"description": "Self-referring URL, see note 1.",
+					"format": "uri",
+					"type": "string",
+					"x-etsi-mec-cardinality": "1",
+					"x-etsi-mec-origin-type": "AnyURI"
+				},
+				"userTrackingSubscription": {
+					"description": "Collection of UserTrackingSubscription elements, see note 1.",
+					"items": {
+						"description": "A type containing user tracking subscription.",
+						"properties": {
+							"address": {
+								"description": "Address of user (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI) to monitor",
+								"type": "string",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"userEventCriteria": {
+								"description": "List of user event values to generate notifications for (these apply to address specified). If this element is missing, a notification is requested to be generated for any change in user event.",
+								"items": {
+									"enum": [
+										"Entering",
+										"Leaving",
+										"Transferring"
+									],
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "UserEventType"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"address"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "UserTrackingSubscription"
+				},
+				"zonalTrafficSubscription": {
+					"description": "Collection of ZonalTrafficSubscription elements, see note 1.",
+					"items": {
+						"description": "A type containing zonal traffic subscription",
+						"properties": {
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"duration": {
+								"description": "Period (in seconds) of time notifications are provided for. If set to \"0\" (zero), a default duration time, which is specified by the service policy, will be used. If the parameter is omitted, the notifications will continue until the maximum duration time, which is specified by the service policy, unless the notifications are stopped by deletion of subscription for notifications. This element MAY be given by the client during resource creation in order to signal the desired lifetime of the subscription. The server MUST return in this element the   period of time for which the subscription will still be valid.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "unsignedInt"
+							},
+							"interestRealm": {
+								"description": "Interest realm of access point (e.g. geographical area, a type of industry etc.).",
+								"items": {
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"userEventCriteria": {
+								"description": "List of user event values to generate notifications for (these apply to zone identifier or all interest realms within zone identifier specified). If this element is missing, a notification is requested to be generated for any change in user event.",
+								"items": {
+									"enum": [
+										"Entering",
+										"Leaving",
+										"Transferring"
+									],
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "UserEventType"
+							},
+							"zoneId": {
+								"description": "Identifier of zone",
+								"type": "string",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "string"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"zoneId"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "ZonalTrafficSubscription"
+				},
+				"zoneStatusSubscription": {
+					"description": "Collection of ZoneStatusSubscription elements, see note 1.",
+					"items": {
+						"description": "A type containing zone status subscription.",
+						"properties": {
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"numberOfUsersAPThreshold": {
+								"description": "Threshold number of users in an access point which if crossed shall cause a notification",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "unsignedInt"
+							},
+							"numberOfUsersZoneThreshold": {
+								"description": "Threshold number of users in a zone which if crossed shall cause a notification",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "unsignedInt"
+							},
+							"operationStatus": {
+								"description": "List of operation status values to generate notifications for (these apply to all access points within a zone).",
+								"items": {
+									"enum": [
+										"Serviceable",
+										"Unserviceable",
+										"Unknown"
+									],
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "OperationStatus"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"zoneId": {
+								"description": "Identifier of zone",
+								"type": "string",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "string"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"zoneId"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "ZoneStatusSubscription"
+				}
+			},
+			"required": [
+				"resourceURL"
+			],
+			"type": "object",
+			"x-etsi-notes": "NOTE 1:\tAs specified in [5], clause 5.2.2.8.\nNOTE 2: \tAs specified in [6], clause 5.2.2.7.",
+			"x-etsi-ref": "6.3.3"
+		}
+	}
+}
\ No newline at end of file
diff --git a/SRV/UEINFOSUB/schemas/ZonalTrafficSubscription.schema.json b/SRV/UEINFOSUB/schemas/ZonalTrafficSubscription.schema.json
index 0a27ccb..e0d6fb6 100644
--- a/SRV/UEINFOSUB/schemas/ZonalTrafficSubscription.schema.json
+++ b/SRV/UEINFOSUB/schemas/ZonalTrafficSubscription.schema.json
@@ -1,12 +1,89 @@
 {
-  "properties": {
-    "undefinedJsonSchema": {
-      "type": "string",
-      "description": "Json Schema for the given object is not yet defined"
-    }
-  },
-  "required": [
-    "undefinedJsonSchema"
-  ]
-}
-
+	"type": "object",
+	"properties": {
+		"zonalTrafficSubscription": {
+			"description": "A type containing zonal traffic subscription",
+			"properties": {
+				"callbackReference": {
+					"properties": {
+						"callbackData": {
+							"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+							"type": "string",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "string"
+						},
+						"notificationFormat": {
+							"enum": [
+								"XML",
+								"JSON"
+							],
+							"type": "string"
+						},
+						"notifyURL": {
+							"description": "Notify Callback URL",
+							"type": "string",
+							"x-etsi-mec-cardinality": "1",
+							"x-etsi-mec-origin-type": "anyURI"
+						}
+					},
+					"required": [
+						"notifyURL"
+					],
+					"type": "object"
+				},
+				"clientCorrelator": {
+					"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+					"type": "string",
+					"x-etsi-mec-cardinality": "0..1",
+					"x-etsi-mec-origin-type": "string"
+				},
+				"duration": {
+					"description": "Period (in seconds) of time notifications are provided for. If set to \"0\" (zero), a default duration time, which is specified by the service policy, will be used. If the parameter is omitted, the notifications will continue until the maximum duration time, which is specified by the service policy, unless the notifications are stopped by deletion of subscription for notifications. This element MAY be given by the client during resource creation in order to signal the desired lifetime of the subscription. The server MUST return in this element the   period of time for which the subscription will still be valid.",
+					"type": "integer",
+					"x-etsi-mec-cardinality": "0..1",
+					"x-etsi-mec-origin-type": "unsignedInt"
+				},
+				"interestRealm": {
+					"description": "Interest realm of access point (e.g. geographical area, a type of industry etc.).",
+					"items": {
+						"type": "string"
+					},
+					"type": "array",
+					"x-etsi-mec-cardinality": "0..N",
+					"x-etsi-mec-origin-type": "string"
+				},
+				"resourceURL": {
+					"description": "Self referring URL",
+					"type": "string",
+					"x-etsi-mec-cardinality": "0..1",
+					"x-etsi-mec-origin-type": "anyURI"
+				},
+				"userEventCriteria": {
+					"description": "List of user event values to generate notifications for (these apply to zone identifier or all interest realms within zone identifier specified). If this element is missing, a notification is requested to be generated for any change in user event.",
+					"items": {
+						"enum": [
+							"Entering",
+							"Leaving",
+							"Transferring"
+						],
+						"type": "string"
+					},
+					"type": "array",
+					"x-etsi-mec-cardinality": "0..N",
+					"x-etsi-mec-origin-type": "UserEventType"
+				},
+				"zoneId": {
+					"description": "Identifier of zone",
+					"type": "string",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "string"
+				}
+			},
+			"required": [
+				"callbackReference",
+				"zoneId"
+			],
+			"type": "object"
+		}
+	}
+}
\ No newline at end of file
diff --git a/SRV/UELOCLOOK/schemas/UserInfo.schema.json b/SRV/UELOCLOOK/schemas/UserInfo.schema.json
index 6b78189..1739826 100644
--- a/SRV/UELOCLOOK/schemas/UserInfo.schema.json
+++ b/SRV/UELOCLOOK/schemas/UserInfo.schema.json
@@ -1,144 +1,253 @@
 {
-  "type": "object",
-  "properties": {
-    "accessPointId": {
-      "description": "The identity of the access point the user is currently on, see note 1.",
-      "type": "string",
-      "x-etsi-mec-cardinality": "1",
-      "x-etsi-mec-origin-type": "String"
-    },
-    "address": {
-      "description": "Address of user (e.g. 'sip' URI, 'tel' URI, 'acr' URI) currently on the access point, see note 1.",
-      "format": "uri",
-      "type": "string",
-      "x-etsi-mec-cardinality": "1",
-      "x-etsi-mec-origin-type": "AnyURI"
-    },
-    "ancillaryInfo": {
-      "description": "Reserved for future use.",
-      "type": "string",
-      "x-etsi-mec-cardinality": "0..1",
-      "x-etsi-mec-origin-type": "String"
-    },
-    "contextLocationInfo": {
-      "description": "Contextual information of a user location (e.g. aisle, floor, room number, etc.).",
-      "type": "string",
-      "x-etsi-mec-cardinality": "0..1",
-      "x-etsi-mec-origin-type": "String"
-    },
-    "locationInfo": {
-      "properties": {
-        "accuracy": {
-          "type": "number"
-        },
-        "accuracyAltitude": {
-          "type": "number"
-        },
-        "accuracySemiMinor": {
-          "type": "number"
-        },
-        "altitude": {
-          "description": "Location altitude relative to the WGS84 ellipsoid surface.",
-          "type": "number",
-          "x-etsi-mec-cardinality": "0..1",
-          "x-etsi-mec-origin-type": "Float"
-        },
-        "confidence": {
-          "type": "number"
-        },
-        "includedAngle": {
-          "type": "number"
-        },
-        "innerRadius": {
-          "type": "number"
-        },
-        "latitude": {
-          "description": "Location latitude, expressed in the range -90Β° to +90Β°. Cardinality greater than one only if \"shape\" equals 7.",
-          "items": {
-            "type": "number"
-          },
-          "minItems": 1,
-          "type": "array",
-          "x-etsi-mec-cardinality": "1..N",
-          "x-etsi-mec-origin-type": "Float"
-        },
-        "longitude": {
-          "description": "Location longitude, expressed in the range -180Β° to +180Β°. Cardinality greater than one only if \"shape\" equals 7.",
-          "items": {
-            "type": "number"
-          },
-          "minItems": 1,
-          "type": "array",
-          "x-etsi-mec-cardinality": "1..N",
-          "x-etsi-mec-origin-type": "Float"
-        },
-        "offsetAngle": {
-          "type": "number"
-        },
-        "orientationMajorAxis": {
-          "type": "number"
-        },
-        "shape": {
-          "description": "Shape information, as detailed in [14], associated with the reported location coordinate:\n1 = Ellipsoid_Arc\n2 = ellipsoid_Point\n3 = ellipsoid_Point_Altitude\n4 = ellipsoid_Point_Altitude_Uncert_Ellipsoid\n5 = ellipsoid_Point_Uncert_Circle\n6 = ellipsoid_Point_Uncert_Ellipse\n7 = polygon",
-          "type": "string",
-          "x-etsi-mec-cardinality": "1",
-          "x-etsi-mec-origin-type": "Enum_inlined"
-        },
-        "uncertaintyRadius": {
-          "type": "number"
-        },
-        "velocity": {
-          "description": "Structure with attributes relating to the target entity’s velocity, as defined in [14].",
-          "type": "object",
-          "x-etsi-mec-cardinality": "0..1",
-          "x-etsi-mec-origin-type": "Structure (inlined)"
-        }
-      },
-      "required": [
-        "latitude",
-        "longitude",
-        "shape"
-      ],
-      "type": "object",
-      "x-etsi-ref": "6.5.3"
-    },
-    "resourceURL": {
-      "description": "Self-referring URL, see note 1.",
-      "type": "string",
-      "x-etsi-mec-cardinality": "1",
-      "x-etsi-mec-origin-type": "String"
-    },
-    "timeStamp": {
-      "properties": {
-        "nanoSeconds": {
-          "type": "number"
-        },
-        "seconds": {
-          "type": "number"
-        }
-      },
-      "required": [
-        "seconds",
-        "nanoSeconds"
-      ],
-      "type": "object",
-      "x-etsi-ref": "6.5.2"
-    },
-    "zoneId": {
-      "description": "The identity of the zone the user is currently within, see note 1.",
-      "type": "string",
-      "x-etsi-mec-cardinality": "1",
-      "x-etsi-mec-origin-type": "String"
-    }
-  },
-  "required": [
-    "address",
-    "accessPointId",
-    "zoneId",
-    "resourceURL",
-    "timeStamp"
-  ],
-  "description": "Represents the information related to a user attached to an access point associated to the MEC host, such access point is in scope of the Location Service instance.\n",
-  "x-etsi-notes": ":\tAs specified in [5], clause 5.2.2.7.\nNOTE 2: \tAs specified in [5], clause 5.2.2.5.",
-  "x-etsi-ref": "6.2.2"
-}
+	"type": "object",
+	"properties": {
+		"userInfo": {
+			"properties": {
+				"accessPointId": {
+					"description": "The identity of the access point the user is currently on, see note 1.",
+					"type": "string",
+					"x-etsi-mec-cardinality": "1",
+					"x-etsi-mec-origin-type": "String"
+				},
+				"address": {
+					"description": "Address of user (e.g. 'sip' URI, 'tel' URI, 'acr' URI) currently on the access point, see note 1.",
+					"format": "uri",
+					"type": "string",
+					"x-etsi-mec-cardinality": "1",
+					"x-etsi-mec-origin-type": "AnyURI"
+				},
+				"ancillaryInfo": {
+					"description": "Reserved for future use.",
+					"type": "string",
+					"x-etsi-mec-cardinality": "0..1",
+					"x-etsi-mec-origin-type": "String"
+				},
+				"contextLocationInfo": {
+					"description": "Contextual information of a user location (e.g. aisle, floor, room number, etc.).",
+					"type": "string",
+					"x-etsi-mec-cardinality": "0..1",
+					"x-etsi-mec-origin-type": "String"
+				},
+				"locationInfo": {
+					"properties": {
+						"accuracy": {
+							"description": "Horizontal accuracy / (semi-major) uncertainty of location provided in meters, as defined in [14]. Present only if \"shape\" equals 4, 5 or 6",
+							"type": "integer",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "UnsignedInt"
+						},
+						"accuracyAltitude": {
+							"description": "Altitude accuracy / uncertainty of location provided in meters, as defined in [14]. Present only if \"shape\" equals 3 or 4",
+							"type": "integer",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "UnsignedInt"
+						},
+						"accuracySemiMinor": {
+							"description": "Horizontal accuracy / (semi-major) uncertainty of location provided in meters, as defined in [14]. Present only if \"shape\" equals 4, 5 or 6",
+							"type": "integer",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "UnsignedInt"
+						},
+						"altitude": {
+							"description": "Location altitude relative to the WGS84 ellipsoid surface.",
+							"format": "float",
+							"type": "number",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "Float"
+						},
+						"confidence": {
+							"description": "Confidence by which the position of a target entity is known to be within the shape description, expressed as a percentage and defined in [14]. Present only if \"shape\" equals 1, 4 or 6",
+							"type": "integer",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "UnsignedInt"
+						},
+						"includedAngle": {
+							"description": "Present only if \"shape\" equals 6",
+							"type": "integer",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "UnsignedInt"
+						},
+						"innerRadius": {
+							"description": "Present only if \"shape\" equals 6",
+							"type": "integer",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "UnsignedInt"
+						},
+						"latitude": {
+							"description": "Location latitude, expressed in the range -90° to +90°. Cardinality greater than one only if \"shape\" equals 7.",
+							"items": {
+								"format": "float",
+								"type": "number"
+							},
+							"minItems": 1,
+							"type": "array",
+							"x-etsi-mec-cardinality": "1..N",
+							"x-etsi-mec-origin-type": "Float"
+						},
+						"longitude": {
+							"description": "Location longitude, expressed in the range -180° to +180°. Cardinality greater than one only if \"shape\" equals 7.",
+							"items": {
+								"format": "float",
+								"type": "number"
+							},
+							"minItems": 1,
+							"type": "array",
+							"x-etsi-mec-cardinality": "1..N",
+							"x-etsi-mec-origin-type": "Float"
+						},
+						"offsetAngle": {
+							"description": "Present only if \"shape\" equals 6",
+							"type": "integer",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "UnsignedInt"
+						},
+						"orientationMajorAxis": {
+							"description": "Angle of orientation of the major axis, expressed in the range 0° to 180°, as defined in [14]. Present only if \"shape\" equals 4 or 6",
+							"type": "integer",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "UnsignedInt"
+						},
+						"shape": {
+							"description": "Shape information, as detailed in [14], associated with the reported location coordinate: <p>1 = ELLIPSOID_ARC <p>2 = ELLIPSOID_POINT <p>3 = ELLIPSOID_POINT_ALTITUDE <p>4 = ELLIPSOID_POINT_ALTITUDE_UNCERT_ELLIPSOID <p>5 = ELLIPSOID_POINT_UNCERT_CIRCLE <p>6 = ELLIPSOID_POINT_UNCERT_ELLIPSE <p>7 = POLYGON",
+							"type": "integer",
+							"x-etsi-mec-cardinality": "1",
+							"x-etsi-mec-origin-type": "Enum_inlined"
+						},
+						"timestamp": {
+							"properties": {
+								"nanoSeconds": {
+									"description": "The nanoseconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.",
+									"format": "int32",
+									"type": "integer",
+									"x-etsi-mec-cardinality": "1",
+									"x-etsi-mec-origin-type": "Uint32"
+								},
+								"seconds": {
+									"description": "The seconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.",
+									"format": "int32",
+									"type": "integer",
+									"x-etsi-mec-cardinality": "1",
+									"x-etsi-mec-origin-type": "Uint32"
+								}
+							},
+							"required": [
+								"seconds",
+								"nanoSeconds"
+							],
+							"type": "object",
+							"x-etsi-ref": "6.5.2"
+						},
+						"uncertaintyRadius": {
+							"description": "Present only if \"shape\" equals 6",
+							"type": "integer",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "UnsignedInt"
+						},
+						"velocity": {
+							"description": "Structure with attributes relating to the target entity’s velocity, as defined in [14].",
+							"properties": {
+								"bearing": {
+									"description": "Bearing, expressed in the range 0° to 360°, as defined in [14].",
+									"type": "integer",
+									"x-etsi-mec-cardinality": "1",
+									"x-etsi-mec-origin-type": "UnsignedInt"
+								},
+								"horizontalSpeed": {
+									"description": "Horizontal speed, expressed in km/h and defined in [14].",
+									"type": "integer",
+									"x-etsi-mec-cardinality": "1",
+									"x-etsi-mec-origin-type": "UnsignedInt"
+								},
+								"uncertainty": {
+									"description": "Horizontal uncertainty, as defined in [14]. Present only if \"velocityType\" equals 3 or 4",
+									"type": "integer",
+									"x-etsi-mec-cardinality": "0..1",
+									"x-etsi-mec-origin-type": "UnsignedInt"
+								},
+								"velocityType": {
+									"description": "Velocity information, as detailed in [14], associated with the reported location coordinate: <p>1 = HORIZONTAL <p>2 = HORIZONTAL_VERTICAL <p>3 = HORIZONTAL_UNCERT <p>4 = HORIZONTAL_VERTICAL_UNCERT",
+									"type": "integer",
+									"x-etsi-mec-cardinality": "1",
+									"x-etsi-mec-origin-type": "Enum_inlined"
+								},
+								"verticalSpeed": {
+									"description": "Vertical speed, expressed in km/h and defined in [14]. Present only if \"velocityType\" equals 2 or 4",
+									"type": "integer",
+									"x-etsi-mec-cardinality": "0..1",
+									"x-etsi-mec-origin-type": "Int"
+								},
+								"verticalUncertainty": {
+									"description": "Vertical uncertainty, as defined in [14]. Present only if \"velocityType\" equals 4",
+									"type": "integer",
+									"x-etsi-mec-cardinality": "0..1",
+									"x-etsi-mec-origin-type": "UnsignedInt"
+								}
+							},
+							"required": [
+								"velocityType",
+								"bearing",
+								"horizontalSpeed"
+							],
+							"type": "object",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "Structure (inlined)"
+						}
+					},
+					"required": [
+						"latitude",
+						"longitude",
+						"shape"
+					],
+					"type": "object",
+					"x-etsi-ref": "6.5.3"
+				},
+				"resourceURL": {
+					"description": "Self-referring URL, see note 1.",
+					"type": "string",
+					"x-etsi-mec-cardinality": "1",
+					"x-etsi-mec-origin-type": "String"
+				},
+				"timestamp": {
+					"properties": {
+						"nanoSeconds": {
+							"description": "The nanoseconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.",
+							"format": "int32",
+							"type": "integer",
+							"x-etsi-mec-cardinality": "1",
+							"x-etsi-mec-origin-type": "Uint32"
+						},
+						"seconds": {
+							"description": "The seconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.",
+							"format": "int32",
+							"type": "integer",
+							"x-etsi-mec-cardinality": "1",
+							"x-etsi-mec-origin-type": "Uint32"
+						}
+					},
+					"required": [
+						"seconds",
+						"nanoSeconds"
+					],
+					"type": "object",
+					"x-etsi-ref": "6.5.2"
+				},
+				"zoneId": {
+					"description": "The identity of the zone the user is currently within, see note 1.",
+					"type": "string",
+					"x-etsi-mec-cardinality": "1",
+					"x-etsi-mec-origin-type": "String"
+				}
+			},
+			"required": [
+				"address",
+				"accessPointId",
+				"zoneId",
+				"resourceURL",
+				"timestamp"
+			],
+			"type": "object",
+			"x-etsi-notes": "NOTE 1:\tAs specified in [5], clause 5.2.2.7.\nNOTE 2: \tAs specified in [5], clause 5.2.2.5.",
+			"x-etsi-ref": "6.2.2"
+		}
+	}
+}
\ No newline at end of file
diff --git a/SRV/UELOCLOOK/schemas/UserList.schema.json b/SRV/UELOCLOOK/schemas/UserList.schema.json
index 32b692b..eafe70b 100644
--- a/SRV/UELOCLOOK/schemas/UserList.schema.json
+++ b/SRV/UELOCLOOK/schemas/UserList.schema.json
@@ -1,169 +1,274 @@
 {
-	"description": "A type containing list of users.",
 	"type": "object",
-	"required": [
-		"resourceURL"
-	],
 	"properties": {
-		"user": {
-			"description": "Collection of the zone information list.",
-			"type": "array",
-			"items": {
-				"properties": {
-					"accessPointId": {
-						"description": "The identity of the access point the user is currently on, see note 1.",
-						"type": "string",
-						"x-etsi-mec-cardinality": "1",
-						"x-etsi-mec-origin-type": "String"
-					},
-					"address": {
-						"description": "Address of user (e.g. 'sip' URI, 'tel' URI, 'acr' URI) currently on the access point, see note 1.",
-						"format": "uri",
-						"type": "string",
-						"x-etsi-mec-cardinality": "1",
-						"x-etsi-mec-origin-type": "AnyURI"
-					},
-					"ancillaryInfo": {
-						"description": "Reserved for future use.",
-						"type": "string",
-						"x-etsi-mec-cardinality": "0..1",
-						"x-etsi-mec-origin-type": "String"
-					},
-					"contextLocationInfo": {
-						"description": "Contextual information of a user location (e.g. aisle, floor, room number, etc.).",
-						"type": "string",
-						"x-etsi-mec-cardinality": "0..1",
-						"x-etsi-mec-origin-type": "String"
-					},
-					"locationInfo": {
+		"userList": {
+			"description": "A type containing list of users.",
+			"properties": {
+				"resourceURL": {
+					"description": "Self referring URL",
+					"type": "string",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "anyURI"
+				},
+				"user": {
+					"description": "Collection of the zone information list.",
+					"items": {
 						"properties": {
-							"accuracy": {
-								"type": "number"
-							},
-							"accuracyAltitude": {
-								"type": "number"
+							"accessPointId": {
+								"description": "The identity of the access point the user is currently on, see note 1.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "1",
+								"x-etsi-mec-origin-type": "String"
 							},
-							"accuracySemiMinor": {
-								"type": "number"
+							"address": {
+								"description": "Address of user (e.g. 'sip' URI, 'tel' URI, 'acr' URI) currently on the access point, see note 1.",
+								"format": "uri",
+								"type": "string",
+								"x-etsi-mec-cardinality": "1",
+								"x-etsi-mec-origin-type": "AnyURI"
 							},
-							"altitude": {
-								"description": "Location altitude relative to the WGS84 ellipsoid surface.",
-								"type": "number",
+							"ancillaryInfo": {
+								"description": "Reserved for future use.",
+								"type": "string",
 								"x-etsi-mec-cardinality": "0..1",
-								"x-etsi-mec-origin-type": "Float"
-							},
-							"confidence": {
-								"type": "number"
-							},
-							"includedAngle": {
-								"type": "number"
+								"x-etsi-mec-origin-type": "String"
 							},
-							"innerRadius": {
-								"type": "number"
-							},
-							"latitude": {
-								"description": "Location latitude, expressed in the range -90Β° to +90Β°. Cardinality greater than one only if \"shape\" equals 7.",
-								"items": {
-									"type": "number"
-								},
-								"type": "array",
-								"x-etsi-mec-cardinality": "1..N",
-								"x-etsi-mec-origin-type": "Float"
+							"contextLocationInfo": {
+								"description": "Contextual information of a user location (e.g. aisle, floor, room number, etc.).",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "String"
 							},
-							"longitude": {
-								"description": "Location longitude, expressed in the range -180Β° to +180Β°. Cardinality greater than one only if \"shape\" equals 7.",
-								"items": {
-									"type": "number"
+							"locationInfo": {
+								"properties": {
+									"accuracy": {
+										"description": "Horizontal accuracy / (semi-major) uncertainty of location provided in meters, as defined in [14]. Present only if \"shape\" equals 4, 5 or 6",
+										"type": "integer",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "UnsignedInt"
+									},
+									"accuracyAltitude": {
+										"description": "Altitude accuracy / uncertainty of location provided in meters, as defined in [14]. Present only if \"shape\" equals 3 or 4",
+										"type": "integer",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "UnsignedInt"
+									},
+									"accuracySemiMinor": {
+										"description": "Horizontal accuracy / (semi-major) uncertainty of location provided in meters, as defined in [14]. Present only if \"shape\" equals 4, 5 or 6",
+										"type": "integer",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "UnsignedInt"
+									},
+									"altitude": {
+										"description": "Location altitude relative to the WGS84 ellipsoid surface.",
+										"format": "float",
+										"type": "number",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "Float"
+									},
+									"confidence": {
+										"description": "Confidence by which the position of a target entity is known to be within the shape description, expressed as a percentage and defined in [14]. Present only if \"shape\" equals 1, 4 or 6",
+										"type": "integer",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "UnsignedInt"
+									},
+									"includedAngle": {
+										"description": "Present only if \"shape\" equals 6",
+										"type": "integer",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "UnsignedInt"
+									},
+									"innerRadius": {
+										"description": "Present only if \"shape\" equals 6",
+										"type": "integer",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "UnsignedInt"
+									},
+									"latitude": {
+										"description": "Location latitude, expressed in the range -90° to +90°. Cardinality greater than one only if \"shape\" equals 7.",
+										"items": {
+											"format": "float",
+											"type": "number"
+										},
+										"minItems": 1,
+										"type": "array",
+										"x-etsi-mec-cardinality": "1..N",
+										"x-etsi-mec-origin-type": "Float"
+									},
+									"longitude": {
+										"description": "Location longitude, expressed in the range -180° to +180°. Cardinality greater than one only if \"shape\" equals 7.",
+										"items": {
+											"format": "float",
+											"type": "number"
+										},
+										"minItems": 1,
+										"type": "array",
+										"x-etsi-mec-cardinality": "1..N",
+										"x-etsi-mec-origin-type": "Float"
+									},
+									"offsetAngle": {
+										"description": "Present only if \"shape\" equals 6",
+										"type": "integer",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "UnsignedInt"
+									},
+									"orientationMajorAxis": {
+										"description": "Angle of orientation of the major axis, expressed in the range 0° to 180°, as defined in [14]. Present only if \"shape\" equals 4 or 6",
+										"type": "integer",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "UnsignedInt"
+									},
+									"shape": {
+										"description": "Shape information, as detailed in [14], associated with the reported location coordinate: <p>1 = ELLIPSOID_ARC <p>2 = ELLIPSOID_POINT <p>3 = ELLIPSOID_POINT_ALTITUDE <p>4 = ELLIPSOID_POINT_ALTITUDE_UNCERT_ELLIPSOID <p>5 = ELLIPSOID_POINT_UNCERT_CIRCLE <p>6 = ELLIPSOID_POINT_UNCERT_ELLIPSE <p>7 = POLYGON",
+										"type": "integer",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "Enum_inlined"
+									},
+									"timestamp": {
+										"properties": {
+											"nanoSeconds": {
+												"description": "The nanoseconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.",
+												"format": "int32",
+												"type": "integer",
+												"x-etsi-mec-cardinality": "1",
+												"x-etsi-mec-origin-type": "Uint32"
+											},
+											"seconds": {
+												"description": "The seconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.",
+												"format": "int32",
+												"type": "integer",
+												"x-etsi-mec-cardinality": "1",
+												"x-etsi-mec-origin-type": "Uint32"
+											}
+										},
+										"required": [
+											"seconds",
+											"nanoSeconds"
+										],
+										"type": "object",
+										"x-etsi-ref": "6.5.2"
+									},
+									"uncertaintyRadius": {
+										"description": "Present only if \"shape\" equals 6",
+										"type": "integer",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "UnsignedInt"
+									},
+									"velocity": {
+										"description": "Structure with attributes relating to the target entity’s velocity, as defined in [14].",
+										"properties": {
+											"bearing": {
+												"description": "Bearing, expressed in the range 0° to 360°, as defined in [14].",
+												"type": "integer",
+												"x-etsi-mec-cardinality": "1",
+												"x-etsi-mec-origin-type": "UnsignedInt"
+											},
+											"horizontalSpeed": {
+												"description": "Horizontal speed, expressed in km/h and defined in [14].",
+												"type": "integer",
+												"x-etsi-mec-cardinality": "1",
+												"x-etsi-mec-origin-type": "UnsignedInt"
+											},
+											"uncertainty": {
+												"description": "Horizontal uncertainty, as defined in [14]. Present only if \"velocityType\" equals 3 or 4",
+												"type": "integer",
+												"x-etsi-mec-cardinality": "0..1",
+												"x-etsi-mec-origin-type": "UnsignedInt"
+											},
+											"velocityType": {
+												"description": "Velocity information, as detailed in [14], associated with the reported location coordinate: <p>1 = HORIZONTAL <p>2 = HORIZONTAL_VERTICAL <p>3 = HORIZONTAL_UNCERT <p>4 = HORIZONTAL_VERTICAL_UNCERT",
+												"type": "integer",
+												"x-etsi-mec-cardinality": "1",
+												"x-etsi-mec-origin-type": "Enum_inlined"
+											},
+											"verticalSpeed": {
+												"description": "Vertical speed, expressed in km/h and defined in [14]. Present only if \"velocityType\" equals 2 or 4",
+												"type": "integer",
+												"x-etsi-mec-cardinality": "0..1",
+												"x-etsi-mec-origin-type": "Int"
+											},
+											"verticalUncertainty": {
+												"description": "Vertical uncertainty, as defined in [14]. Present only if \"velocityType\" equals 4",
+												"type": "integer",
+												"x-etsi-mec-cardinality": "0..1",
+												"x-etsi-mec-origin-type": "UnsignedInt"
+											}
+										},
+										"required": [
+											"velocityType",
+											"bearing",
+											"horizontalSpeed"
+										],
+										"type": "object",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "Structure (inlined)"
+									}
 								},
-								"type": "array",
-								"x-etsi-mec-cardinality": "1..N",
-								"x-etsi-mec-origin-type": "Float"
-							},
-							"offsetAngle": {
-								"type": "number"
-							},
-							"orientationMajorAxis": {
-								"type": "number"
-							},
-							"shape": {
-								"description": "Shape information, as detailed in [14], associated with the reported location coordinate:\n1 = Ellipsoid_Arc\n2 = ellipsoid_Point\n3 = ellipsoid_Point_Altitude\n4 = ellipsoid_Point_Altitude_Uncert_Ellipsoid\n5 = ellipsoid_Point_Uncert_Circle\n6 = ellipsoid_Point_Uncert_Ellipse\n7 = polygon",
-								"enum": [
-									"ELLIPSOID_ARC",
-									"ELLIPSOID_POINT",
-									"ELLIPSOID_POINT_ALTITUDE",
-									"ELLIPSOID_POINT_ALTITUDE_UNCERT_ELLIPSOID",
-									"ELLIPSOID_POINT_UNCERT_CIRCLE",
-									"ELLIPSOID_POINT_UNCERT_ELLIPSE",
-									"POLYGON"
+								"required": [
+									"latitude",
+									"longitude",
+									"shape"
 								],
+								"type": "object",
+								"x-etsi-ref": "6.5.3"
+							},
+							"resourceURL": {
+								"description": "Self-referring URL, see note 1.",
 								"type": "string",
 								"x-etsi-mec-cardinality": "1",
-								"x-etsi-mec-origin-type": "Enum (inlined)"
+								"x-etsi-mec-origin-type": "String"
 							},
-							"uncertaintyRadius": {
-								"type": "number"
-							},
-							"velocity": {
-								"description": "Structure with attributes relating to the target entity’s velocity, as defined in [14].",
+							"timestamp": {
+								"properties": {
+									"nanoSeconds": {
+										"description": "The nanoseconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.",
+										"format": "int32",
+										"type": "integer",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "Uint32"
+									},
+									"seconds": {
+										"description": "The seconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.",
+										"format": "int32",
+										"type": "integer",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "Uint32"
+									}
+								},
+								"required": [
+									"seconds",
+									"nanoSeconds"
+								],
 								"type": "object",
-								"x-etsi-mec-cardinality": "0..1",
-								"x-etsi-mec-origin-type": "Structure (inlined)"
-							}
-						},
-						"required": [
-							"latitude",
-							"longitude",
-							"shape"
-						],
-						"type": "object",
-						"x-etsi-ref": "6.5.3"
-					},
-					"resourceURL": {
-						"description": "Self-referring URL, see note 1.",
-						"type": "string",
-						"x-etsi-mec-cardinality": "1",
-						"x-etsi-mec-origin-type": "String"
-					},
-					"timeStamp": {
-						"properties": {
-							"nanoSeconds": {
-								"type": "number"
+								"x-etsi-ref": "6.5.2"
 							},
-							"seconds": {
-								"type": "number"
+							"zoneId": {
+								"description": "The identity of the zone the user is currently within, see note 1.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "1",
+								"x-etsi-mec-origin-type": "String"
 							}
 						},
 						"required": [
-							"seconds",
-							"nanoSeconds"
+							"address",
+							"accessPointId",
+							"zoneId",
+							"resourceURL",
+							"timestamp"
 						],
 						"type": "object",
-						"x-etsi-ref": "6.5.2"
+						"x-etsi-notes": "NOTE 1:\tAs specified in [5], clause 5.2.2.7.\nNOTE 2: \tAs specified in [5], clause 5.2.2.5.",
+						"x-etsi-ref": "6.2.2"
 					},
-					"zoneId": {
-						"description": "The identity of the zone the user is currently within, see note 1.",
-						"type": "string",
-						"x-etsi-mec-cardinality": "1",
-						"x-etsi-mec-origin-type": "String"
-					}
-				},
-				"required": [
-					"address",
-					"accessPointId",
-					"zoneId",
-					"resourceURL",
-					"timeStamp"
-				],
-				"type": "object",
-				"x-etsi-notes": ":\tAs specified in [5], clause 5.2.2.7.\nNOTE 2: \tAs specified in [5], clause 5.2.2.5.",
-				"x-etsi-ref": "6.2.2"
-			}
-		},
-		"resourceURL": {
-			"description": "Self referring URL.",
-			"type": "string",
-			"format": "uri",
-			"example": "http://example.com/exampleAPI/location/v1/subscriptions/userTracking/subscription123"
+					"type": "array",
+					"x-etsi-mec-cardinality": "0..N",
+					"x-etsi-mec-origin-type": "UserInfo"
+				}
+			},
+			"required": [
+				"resourceURL"
+			],
+			"type": "object"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/SRV/UELOCSUB/schemas/NotificationSubscriptionList.schema.json b/SRV/UELOCSUB/schemas/NotificationSubscriptionList.schema.json
new file mode 100644
index 0000000..efa7244
--- /dev/null
+++ b/SRV/UELOCSUB/schemas/NotificationSubscriptionList.schema.json
@@ -0,0 +1,715 @@
+{
+	"type": "object",
+	"required": [
+		"notificationSubscriptionList"
+	],
+	"properties": {
+		"notificationSubscriptionList": {
+			"properties": {
+				"circleNotificationSubscription": {
+					"description": "Collection of CircleNotificationSubscription elements, see note 2.",
+					"items": {
+						"description": "A type containing data for notifications, when the area is defined as a circle.",
+						"properties": {
+							"address": {
+								"description": "Address of terminals to monitor (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+								"items": {
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "1..N",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"checkImmediate": {
+								"description": "Check location immediately after establishing notification.",
+								"type": "boolean",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "boolean"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"count": {
+								"description": "Maximum number of notifications per individual address. For no maximum, either do not include this element or specify a value of zero. Default value is 0.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "int"
+							},
+							"duration": {
+								"description": "Period of time (in seconds) notifications are provided for. If set to “0” (zero), a default duration time, which is specified by the service policy, will be used. If the parameter is omitted, the notifications will continue until the maximum duration time, which is specified by the service policy, unless the notifications are stopped by deletion of subscription for notifications.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "int"
+							},
+							"enteringLeavingCriteria": {
+								"enum": [
+									"Entering",
+									"Leaving"
+								],
+								"type": "string"
+							},
+							"frequency": {
+								"description": "Maximum frequency (in seconds) of notifications per subscription (can also be considered minimum time between notifications).",
+								"type": "integer",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "int"
+							},
+							"latitude": {
+								"description": "Latitude of center point.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							},
+							"link": {
+								"description": "Link to other resources that are in relationship with the resource.",
+								"items": {
+									"description": "Link to other resources",
+									"properties": {
+										"href": {
+											"description": "URI",
+											"format": "anyURI",
+											"type": "string"
+										},
+										"rel": {
+											"description": "Describes the relationship between the URI and the resource.",
+											"type": "string"
+										}
+									},
+									"required": [
+										"rel",
+										"href"
+									],
+									"type": "object"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "Link"
+							},
+							"longitude": {
+								"description": "Longitude of center point.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							},
+							"radius": {
+								"description": "Radius circle around center point in meters.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							},
+							"requester": {
+								"description": "Identifies the entity that is requesting the information (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"trackingAccuracy": {
+								"description": "Number of meters of acceptable error in tracking distance.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"address",
+							"latitude",
+							"longitude",
+							"radius",
+							"trackingAccuracy",
+							"enteringLeavingCriteria",
+							"checkImmediate",
+							"frequency"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "CircleNotificationSubscription"
+				},
+				"distanceNotificationSubscription": {
+					"description": "Collection of DistanceNotificationSubscription elements, see note 2.",
+					"items": {
+						"description": "A type containing data for distance subscription, with reference to other devices.",
+						"properties": {
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"checkImmediate": {
+								"description": "Check location immediately after establishing notification.",
+								"type": "boolean",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "boolean"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"count": {
+								"description": "Maximum number of notifications per individual address. For no maximum, either do not include this element or specify a value of zero. Default value is 0.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "int"
+							},
+							"criteria": {
+								"enum": [
+									"AllWithinDistance",
+									"AnyWithinDistance",
+									"AllBeyondDistance",
+									"AnyBeyondDistance"
+								],
+								"type": "string"
+							},
+							"distance": {
+								"description": "Distance between devices that shall be monitored.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							},
+							"duration": {
+								"description": "Period of time (in seconds) notifications are provided for. If set to “0” (zero), a default duration time, which is specified by the service policy, will be used. If the parameter is omitted, the notifications will continue until the maximum duration time, which is specified by the service policy, unless the notifications are stopped by deletion of subscription for notifications.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "int"
+							},
+							"frequency": {
+								"description": "Maximum frequency (in seconds) of notifications per subscription (can also be considered minimum time between notifications).",
+								"type": "integer",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "int"
+							},
+							"link": {
+								"description": "Link to other resources that are in relationship with the resource.",
+								"items": {
+									"description": "Link to other resources",
+									"properties": {
+										"href": {
+											"description": "URI",
+											"format": "anyURI",
+											"type": "string"
+										},
+										"rel": {
+											"description": "Describes the relationship between the URI and the resource.",
+											"type": "string"
+										}
+									},
+									"required": [
+										"rel",
+										"href"
+									],
+									"type": "object"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "Link"
+							},
+							"monitoredAddress": {
+								"description": "Contains addresses of devices to monitor (e.g., 'sip' URI, 'tel' URI, 'acr' URI)",
+								"items": {
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "1..N",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"referenceAddress": {
+								"description": "Indicates address of each device that will be used as reference devices from which the distances towards monitored devices indicated in the Addresses will be monitored (e.g., 'sip' URI, 'tel' URI, 'acr' URI)",
+								"items": {
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"requester": {
+								"description": "Identifies the entity that is requesting the information (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"trackingAccuracy": {
+								"description": "Number of meters of acceptable error in tracking distance.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"monitoredAddress",
+							"distance",
+							"trackingAccuracy",
+							"criteria",
+							"checkImmediate",
+							"frequency"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "DistanceNotificationSubscription"
+				},
+				"periodicNotificationSubscription": {
+					"description": "Collection of PeriodicNotificationSubscription elements, see note 2.",
+					"items": {
+						"description": "A type containing data for periodic subscription.",
+						"properties": {
+							"address": {
+								"description": "Address of terminals to monitor (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+								"items": {
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "1..N",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"duration": {
+								"description": "Period of time (in seconds) notifications are provided for. If set to “0” (zero), a default duration time, which is specified by the service policy, will be used. If the parameter is omitted, the notifications will continue until the maximum duration time, which is specified by the service policy, unless the notifications are stopped by deletion of subscription for notifications.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "int"
+							},
+							"frequency": {
+								"description": "Maximum frequency (in seconds) of notifications (can also be considered minimum time between notifications) per subscription.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "int"
+							},
+							"link": {
+								"description": "Link to other resources that are in relationship with the resource.",
+								"items": {
+									"description": "Link to other resources",
+									"properties": {
+										"href": {
+											"description": "URI",
+											"format": "anyURI",
+											"type": "string"
+										},
+										"rel": {
+											"description": "Describes the relationship between the URI and the resource.",
+											"type": "string"
+										}
+									},
+									"required": [
+										"rel",
+										"href"
+									],
+									"type": "object"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "Link"
+							},
+							"requestedAccuracy": {
+								"description": "Accuracy of the provided distance in meters.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "int"
+							},
+							"requester": {
+								"description": "Identifies the entity that is requesting the information (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"address",
+							"requestedAccuracy",
+							"frequency"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "PeriodicNotificationSubscription"
+				},
+				"resourceURL": {
+					"description": "Self-referring URL, see note 1.",
+					"format": "uri",
+					"type": "string",
+					"x-etsi-mec-cardinality": "1",
+					"x-etsi-mec-origin-type": "AnyURI"
+				},
+				"userTrackingSubscription": {
+					"description": "Collection of UserTrackingSubscription elements, see note 1.",
+					"items": {
+						"description": "A type containing user tracking subscription.",
+						"properties": {
+							"address": {
+								"description": "Address of user (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI) to monitor",
+								"type": "string",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"userEventCriteria": {
+								"description": "List of user event values to generate notifications for (these apply to address specified). If this element is missing, a notification is requested to be generated for any change in user event.",
+								"items": {
+									"enum": [
+										"Entering",
+										"Leaving",
+										"Transferring"
+									],
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "UserEventType"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"address"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "UserTrackingSubscription"
+				},
+				"zonalTrafficSubscription": {
+					"description": "Collection of ZonalTrafficSubscription elements, see note 1.",
+					"items": {
+						"description": "A type containing zonal traffic subscription",
+						"properties": {
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"duration": {
+								"description": "Period (in seconds) of time notifications are provided for. If set to \"0\" (zero), a default duration time, which is specified by the service policy, will be used. If the parameter is omitted, the notifications will continue until the maximum duration time, which is specified by the service policy, unless the notifications are stopped by deletion of subscription for notifications. This element MAY be given by the client during resource creation in order to signal the desired lifetime of the subscription. The server MUST return in this element the   period of time for which the subscription will still be valid.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "unsignedInt"
+							},
+							"interestRealm": {
+								"description": "Interest realm of access point (e.g. geographical area, a type of industry etc.).",
+								"items": {
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"userEventCriteria": {
+								"description": "List of user event values to generate notifications for (these apply to zone identifier or all interest realms within zone identifier specified). If this element is missing, a notification is requested to be generated for any change in user event.",
+								"items": {
+									"enum": [
+										"Entering",
+										"Leaving",
+										"Transferring"
+									],
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "UserEventType"
+							},
+							"zoneId": {
+								"description": "Identifier of zone",
+								"type": "string",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "string"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"zoneId"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "ZonalTrafficSubscription"
+				},
+				"zoneStatusSubscription": {
+					"description": "Collection of ZoneStatusSubscription elements, see note 1.",
+					"items": {
+						"description": "A type containing zone status subscription.",
+						"properties": {
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"numberOfUsersAPThreshold": {
+								"description": "Threshold number of users in an access point which if crossed shall cause a notification",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "unsignedInt"
+							},
+							"numberOfUsersZoneThreshold": {
+								"description": "Threshold number of users in a zone which if crossed shall cause a notification",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "unsignedInt"
+							},
+							"operationStatus": {
+								"description": "List of operation status values to generate notifications for (these apply to all access points within a zone).",
+								"items": {
+									"enum": [
+										"Serviceable",
+										"Unserviceable",
+										"Unknown"
+									],
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "OperationStatus"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"zoneId": {
+								"description": "Identifier of zone",
+								"type": "string",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "string"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"zoneId"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "ZoneStatusSubscription"
+				}
+			},
+			"required": [
+				"resourceURL"
+			],
+			"type": "object",
+			"x-etsi-notes": "NOTE 1:\tAs specified in [5], clause 5.2.2.8.\nNOTE 2: \tAs specified in [6], clause 5.2.2.7.",
+			"x-etsi-ref": "6.3.3"
+		}
+	}
+}
\ No newline at end of file
diff --git a/SRV/UELOCSUB/schemas/UserTrackingSubscription.schema.json b/SRV/UELOCSUB/schemas/UserTrackingSubscription.schema.json
index f8b20f2..6e2231a 100644
--- a/SRV/UELOCSUB/schemas/UserTrackingSubscription.schema.json
+++ b/SRV/UELOCSUB/schemas/UserTrackingSubscription.schema.json
@@ -1,11 +1,74 @@
 {
-  "properties": {
-    "undefinedJsonSchema": {
-      "type": "string",
-      "description": "Json Schema for the given object is not yet defined"
-    }
-  },
-  "required": [
-    "undefinedJsonSchema"
-  ]
+	"type": "object",
+	"properties": {
+		"userTrackingSubscription": {
+			"description": "A type containing user tracking subscription.",
+			"properties": {
+				"address": {
+					"description": "Address of user (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI) to monitor",
+					"type": "string",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "anyURI"
+				},
+				"callbackReference": {
+					"properties": {
+						"callbackData": {
+							"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+							"type": "string",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "string"
+						},
+						"notificationFormat": {
+							"enum": [
+								"XML",
+								"JSON"
+							],
+							"type": "string"
+						},
+						"notifyURL": {
+							"description": "Notify Callback URL",
+							"type": "string",
+							"x-etsi-mec-cardinality": "1",
+							"x-etsi-mec-origin-type": "anyURI"
+						}
+					},
+					"required": [
+						"notifyURL"
+					],
+					"type": "object"
+				},
+				"clientCorrelator": {
+					"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+					"type": "string",
+					"x-etsi-mec-cardinality": "0..1",
+					"x-etsi-mec-origin-type": "string"
+				},
+				"resourceURL": {
+					"description": "Self referring URL",
+					"type": "string",
+					"x-etsi-mec-cardinality": "0..1",
+					"x-etsi-mec-origin-type": "anyURI"
+				},
+				"userEventCriteria": {
+					"description": "List of user event values to generate notifications for (these apply to address specified). If this element is missing, a notification is requested to be generated for any change in user event.",
+					"items": {
+						"enum": [
+							"Entering",
+							"Leaving",
+							"Transferring"
+						],
+						"type": "string"
+					},
+					"type": "array",
+					"x-etsi-mec-cardinality": "0..N",
+					"x-etsi-mec-origin-type": "UserEventType"
+				}
+			},
+			"required": [
+				"callbackReference",
+				"address"
+			],
+			"type": "object"
+		}
+	}
 }
\ No newline at end of file
diff --git a/SRV/UETRACKSUB/schemas/NotificationSubscriptionList.schema.json b/SRV/UETRACKSUB/schemas/NotificationSubscriptionList.schema.json
new file mode 100644
index 0000000..efa7244
--- /dev/null
+++ b/SRV/UETRACKSUB/schemas/NotificationSubscriptionList.schema.json
@@ -0,0 +1,715 @@
+{
+	"type": "object",
+	"required": [
+		"notificationSubscriptionList"
+	],
+	"properties": {
+		"notificationSubscriptionList": {
+			"properties": {
+				"circleNotificationSubscription": {
+					"description": "Collection of CircleNotificationSubscription elements, see note 2.",
+					"items": {
+						"description": "A type containing data for notifications, when the area is defined as a circle.",
+						"properties": {
+							"address": {
+								"description": "Address of terminals to monitor (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+								"items": {
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "1..N",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"checkImmediate": {
+								"description": "Check location immediately after establishing notification.",
+								"type": "boolean",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "boolean"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"count": {
+								"description": "Maximum number of notifications per individual address. For no maximum, either do not include this element or specify a value of zero. Default value is 0.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "int"
+							},
+							"duration": {
+								"description": "Period of time (in seconds) notifications are provided for. If set to “0” (zero), a default duration time, which is specified by the service policy, will be used. If the parameter is omitted, the notifications will continue until the maximum duration time, which is specified by the service policy, unless the notifications are stopped by deletion of subscription for notifications.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "int"
+							},
+							"enteringLeavingCriteria": {
+								"enum": [
+									"Entering",
+									"Leaving"
+								],
+								"type": "string"
+							},
+							"frequency": {
+								"description": "Maximum frequency (in seconds) of notifications per subscription (can also be considered minimum time between notifications).",
+								"type": "integer",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "int"
+							},
+							"latitude": {
+								"description": "Latitude of center point.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							},
+							"link": {
+								"description": "Link to other resources that are in relationship with the resource.",
+								"items": {
+									"description": "Link to other resources",
+									"properties": {
+										"href": {
+											"description": "URI",
+											"format": "anyURI",
+											"type": "string"
+										},
+										"rel": {
+											"description": "Describes the relationship between the URI and the resource.",
+											"type": "string"
+										}
+									},
+									"required": [
+										"rel",
+										"href"
+									],
+									"type": "object"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "Link"
+							},
+							"longitude": {
+								"description": "Longitude of center point.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							},
+							"radius": {
+								"description": "Radius circle around center point in meters.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							},
+							"requester": {
+								"description": "Identifies the entity that is requesting the information (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"trackingAccuracy": {
+								"description": "Number of meters of acceptable error in tracking distance.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"address",
+							"latitude",
+							"longitude",
+							"radius",
+							"trackingAccuracy",
+							"enteringLeavingCriteria",
+							"checkImmediate",
+							"frequency"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "CircleNotificationSubscription"
+				},
+				"distanceNotificationSubscription": {
+					"description": "Collection of DistanceNotificationSubscription elements, see note 2.",
+					"items": {
+						"description": "A type containing data for distance subscription, with reference to other devices.",
+						"properties": {
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"checkImmediate": {
+								"description": "Check location immediately after establishing notification.",
+								"type": "boolean",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "boolean"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"count": {
+								"description": "Maximum number of notifications per individual address. For no maximum, either do not include this element or specify a value of zero. Default value is 0.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "int"
+							},
+							"criteria": {
+								"enum": [
+									"AllWithinDistance",
+									"AnyWithinDistance",
+									"AllBeyondDistance",
+									"AnyBeyondDistance"
+								],
+								"type": "string"
+							},
+							"distance": {
+								"description": "Distance between devices that shall be monitored.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							},
+							"duration": {
+								"description": "Period of time (in seconds) notifications are provided for. If set to “0” (zero), a default duration time, which is specified by the service policy, will be used. If the parameter is omitted, the notifications will continue until the maximum duration time, which is specified by the service policy, unless the notifications are stopped by deletion of subscription for notifications.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "int"
+							},
+							"frequency": {
+								"description": "Maximum frequency (in seconds) of notifications per subscription (can also be considered minimum time between notifications).",
+								"type": "integer",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "int"
+							},
+							"link": {
+								"description": "Link to other resources that are in relationship with the resource.",
+								"items": {
+									"description": "Link to other resources",
+									"properties": {
+										"href": {
+											"description": "URI",
+											"format": "anyURI",
+											"type": "string"
+										},
+										"rel": {
+											"description": "Describes the relationship between the URI and the resource.",
+											"type": "string"
+										}
+									},
+									"required": [
+										"rel",
+										"href"
+									],
+									"type": "object"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "Link"
+							},
+							"monitoredAddress": {
+								"description": "Contains addresses of devices to monitor (e.g., 'sip' URI, 'tel' URI, 'acr' URI)",
+								"items": {
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "1..N",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"referenceAddress": {
+								"description": "Indicates address of each device that will be used as reference devices from which the distances towards monitored devices indicated in the Addresses will be monitored (e.g., 'sip' URI, 'tel' URI, 'acr' URI)",
+								"items": {
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"requester": {
+								"description": "Identifies the entity that is requesting the information (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"trackingAccuracy": {
+								"description": "Number of meters of acceptable error in tracking distance.",
+								"format": "float",
+								"type": "number",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "float"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"monitoredAddress",
+							"distance",
+							"trackingAccuracy",
+							"criteria",
+							"checkImmediate",
+							"frequency"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "DistanceNotificationSubscription"
+				},
+				"periodicNotificationSubscription": {
+					"description": "Collection of PeriodicNotificationSubscription elements, see note 2.",
+					"items": {
+						"description": "A type containing data for periodic subscription.",
+						"properties": {
+							"address": {
+								"description": "Address of terminals to monitor (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+								"items": {
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "1..N",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"duration": {
+								"description": "Period of time (in seconds) notifications are provided for. If set to “0” (zero), a default duration time, which is specified by the service policy, will be used. If the parameter is omitted, the notifications will continue until the maximum duration time, which is specified by the service policy, unless the notifications are stopped by deletion of subscription for notifications.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "int"
+							},
+							"frequency": {
+								"description": "Maximum frequency (in seconds) of notifications (can also be considered minimum time between notifications) per subscription.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "int"
+							},
+							"link": {
+								"description": "Link to other resources that are in relationship with the resource.",
+								"items": {
+									"description": "Link to other resources",
+									"properties": {
+										"href": {
+											"description": "URI",
+											"format": "anyURI",
+											"type": "string"
+										},
+										"rel": {
+											"description": "Describes the relationship between the URI and the resource.",
+											"type": "string"
+										}
+									},
+									"required": [
+										"rel",
+										"href"
+									],
+									"type": "object"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "Link"
+							},
+							"requestedAccuracy": {
+								"description": "Accuracy of the provided distance in meters.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "int"
+							},
+							"requester": {
+								"description": "Identifies the entity that is requesting the information (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"address",
+							"requestedAccuracy",
+							"frequency"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "PeriodicNotificationSubscription"
+				},
+				"resourceURL": {
+					"description": "Self-referring URL, see note 1.",
+					"format": "uri",
+					"type": "string",
+					"x-etsi-mec-cardinality": "1",
+					"x-etsi-mec-origin-type": "AnyURI"
+				},
+				"userTrackingSubscription": {
+					"description": "Collection of UserTrackingSubscription elements, see note 1.",
+					"items": {
+						"description": "A type containing user tracking subscription.",
+						"properties": {
+							"address": {
+								"description": "Address of user (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI) to monitor",
+								"type": "string",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"userEventCriteria": {
+								"description": "List of user event values to generate notifications for (these apply to address specified). If this element is missing, a notification is requested to be generated for any change in user event.",
+								"items": {
+									"enum": [
+										"Entering",
+										"Leaving",
+										"Transferring"
+									],
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "UserEventType"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"address"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "UserTrackingSubscription"
+				},
+				"zonalTrafficSubscription": {
+					"description": "Collection of ZonalTrafficSubscription elements, see note 1.",
+					"items": {
+						"description": "A type containing zonal traffic subscription",
+						"properties": {
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"duration": {
+								"description": "Period (in seconds) of time notifications are provided for. If set to \"0\" (zero), a default duration time, which is specified by the service policy, will be used. If the parameter is omitted, the notifications will continue until the maximum duration time, which is specified by the service policy, unless the notifications are stopped by deletion of subscription for notifications. This element MAY be given by the client during resource creation in order to signal the desired lifetime of the subscription. The server MUST return in this element the   period of time for which the subscription will still be valid.",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "unsignedInt"
+							},
+							"interestRealm": {
+								"description": "Interest realm of access point (e.g. geographical area, a type of industry etc.).",
+								"items": {
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"userEventCriteria": {
+								"description": "List of user event values to generate notifications for (these apply to zone identifier or all interest realms within zone identifier specified). If this element is missing, a notification is requested to be generated for any change in user event.",
+								"items": {
+									"enum": [
+										"Entering",
+										"Leaving",
+										"Transferring"
+									],
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "UserEventType"
+							},
+							"zoneId": {
+								"description": "Identifier of zone",
+								"type": "string",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "string"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"zoneId"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "ZonalTrafficSubscription"
+				},
+				"zoneStatusSubscription": {
+					"description": "Collection of ZoneStatusSubscription elements, see note 1.",
+					"items": {
+						"description": "A type containing zone status subscription.",
+						"properties": {
+							"callbackReference": {
+								"properties": {
+									"callbackData": {
+										"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+										"type": "string",
+										"x-etsi-mec-cardinality": "0..1",
+										"x-etsi-mec-origin-type": "string"
+									},
+									"notificationFormat": {
+										"enum": [
+											"XML",
+											"JSON"
+										],
+										"type": "string"
+									},
+									"notifyURL": {
+										"description": "Notify Callback URL",
+										"type": "string",
+										"x-etsi-mec-cardinality": "1",
+										"x-etsi-mec-origin-type": "anyURI"
+									}
+								},
+								"required": [
+									"notifyURL"
+								],
+								"type": "object"
+							},
+							"clientCorrelator": {
+								"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "string"
+							},
+							"numberOfUsersAPThreshold": {
+								"description": "Threshold number of users in an access point which if crossed shall cause a notification",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "unsignedInt"
+							},
+							"numberOfUsersZoneThreshold": {
+								"description": "Threshold number of users in a zone which if crossed shall cause a notification",
+								"type": "integer",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "unsignedInt"
+							},
+							"operationStatus": {
+								"description": "List of operation status values to generate notifications for (these apply to all access points within a zone).",
+								"items": {
+									"enum": [
+										"Serviceable",
+										"Unserviceable",
+										"Unknown"
+									],
+									"type": "string"
+								},
+								"type": "array",
+								"x-etsi-mec-cardinality": "0..N",
+								"x-etsi-mec-origin-type": "OperationStatus"
+							},
+							"resourceURL": {
+								"description": "Self referring URL",
+								"type": "string",
+								"x-etsi-mec-cardinality": "0..1",
+								"x-etsi-mec-origin-type": "anyURI"
+							},
+							"zoneId": {
+								"description": "Identifier of zone",
+								"type": "string",
+								"x-etsi-mec-cardinality": 1,
+								"x-etsi-mec-origin-type": "string"
+							}
+						},
+						"required": [
+							"callbackReference",
+							"zoneId"
+						],
+						"type": "object"
+					},
+					"minItems": 0,
+					"type": "array",
+					"x-etsi-mec-cardinality": "0.. N",
+					"x-etsi-mec-origin-type": "ZoneStatusSubscription"
+				}
+			},
+			"required": [
+				"resourceURL"
+			],
+			"type": "object",
+			"x-etsi-notes": "NOTE 1:\tAs specified in [5], clause 5.2.2.8.\nNOTE 2: \tAs specified in [6], clause 5.2.2.7.",
+			"x-etsi-ref": "6.3.3"
+		}
+	}
+}
\ No newline at end of file
diff --git a/SRV/UETRACKSUB/schemas/PeriodicNotificationSubscription.schema.json b/SRV/UETRACKSUB/schemas/PeriodicNotificationSubscription.schema.json
index f8b20f2..f364afb 100644
--- a/SRV/UETRACKSUB/schemas/PeriodicNotificationSubscription.schema.json
+++ b/SRV/UETRACKSUB/schemas/PeriodicNotificationSubscription.schema.json
@@ -1,11 +1,114 @@
 {
-  "properties": {
-    "undefinedJsonSchema": {
-      "type": "string",
-      "description": "Json Schema for the given object is not yet defined"
-    }
-  },
-  "required": [
-    "undefinedJsonSchema"
-  ]
+	"type": "object",
+	"properties": {
+		"periodicNotificationSubscription": {
+			"description": "A type containing data for periodic subscription.",
+			"properties": {
+				"address": {
+					"description": "Address of terminals to monitor (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+					"items": {
+						"type": "string"
+					},
+					"type": "array",
+					"x-etsi-mec-cardinality": "1..N",
+					"x-etsi-mec-origin-type": "anyURI"
+				},
+				"callbackReference": {
+					"properties": {
+						"callbackData": {
+							"description": "Data the application can register with the server when subscribing to notifications, and that are passed back unchanged in each of the related notifications. These data can be used by the application in the processing of the notification, e.g. for correlation purposes.",
+							"type": "string",
+							"x-etsi-mec-cardinality": "0..1",
+							"x-etsi-mec-origin-type": "string"
+						},
+						"notificationFormat": {
+							"enum": [
+								"XML",
+								"JSON"
+							],
+							"type": "string"
+						},
+						"notifyURL": {
+							"description": "Notify Callback URL",
+							"type": "string",
+							"x-etsi-mec-cardinality": "1",
+							"x-etsi-mec-origin-type": "anyURI"
+						}
+					},
+					"required": [
+						"notifyURL"
+					],
+					"type": "object"
+				},
+				"clientCorrelator": {
+					"description": "A correlator that the client can use to tag this particular resource representation during a request to create a resource on the server.",
+					"type": "string",
+					"x-etsi-mec-cardinality": "0..1",
+					"x-etsi-mec-origin-type": "string"
+				},
+				"duration": {
+					"description": "Period of time (in seconds) notifications are provided for. If set to “0” (zero), a default duration time, which is specified by the service policy, will be used. If the parameter is omitted, the notifications will continue until the maximum duration time, which is specified by the service policy, unless the notifications are stopped by deletion of subscription for notifications.",
+					"type": "integer",
+					"x-etsi-mec-cardinality": "0..1",
+					"x-etsi-mec-origin-type": "int"
+				},
+				"frequency": {
+					"description": "Maximum frequency (in seconds) of notifications (can also be considered minimum time between notifications) per subscription.",
+					"type": "integer",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "int"
+				},
+				"link": {
+					"description": "Link to other resources that are in relationship with the resource.",
+					"items": {
+						"description": "Link to other resources",
+						"properties": {
+							"href": {
+								"description": "URI",
+								"format": "anyURI",
+								"type": "string"
+							},
+							"rel": {
+								"description": "Describes the relationship between the URI and the resource.",
+								"type": "string"
+							}
+						},
+						"required": [
+							"rel",
+							"href"
+						],
+						"type": "object"
+					},
+					"type": "array",
+					"x-etsi-mec-cardinality": "0..N",
+					"x-etsi-mec-origin-type": "Link"
+				},
+				"requestedAccuracy": {
+					"description": "Accuracy of the provided distance in meters.",
+					"type": "integer",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "int"
+				},
+				"requester": {
+					"description": "Identifies the entity that is requesting the information (e.g. \"sip\" URI, \"tel\" URI, \"acr\" URI)",
+					"type": "string",
+					"x-etsi-mec-cardinality": "0..1",
+					"x-etsi-mec-origin-type": "anyURI"
+				},
+				"resourceURL": {
+					"description": "Self referring URL",
+					"type": "string",
+					"x-etsi-mec-cardinality": "0..1",
+					"x-etsi-mec-origin-type": "anyURI"
+				}
+			},
+			"required": [
+				"callbackReference",
+				"address",
+				"requestedAccuracy",
+				"frequency"
+			],
+			"type": "object"
+		}
+	}
 }
\ No newline at end of file
diff --git a/SRV/ZOINFOLOOK/PlatZoneInfoLocation.robot b/SRV/ZOINFOLOOK/PlatZoneInfoLocation.robot
new file mode 100644
index 0000000..13f2080
--- /dev/null
+++ b/SRV/ZOINFOLOOK/PlatZoneInfoLocation.robot
@@ -0,0 +1,62 @@
+*** Settings ***
+
+Documentation
+...    A test suite for validating Radio Node Location Lookup (RLOCLOOK) operations.
+
+Resource    ../../GenericKeywords.robot
+Resource    environment/variables.txt
+Library     REST    ${SCHEMA}://${HOST}:${PORT}    ssl_verify=false
+Library     OperatingSystem 
+
+Default Tags    TC_MEC_SRV_RLOCLOOK
+
+
+*** Test Cases ***
+
+TC_MEC_SRV_ZOINFOLOOK_001_OK
+    [Documentation]
+    ...    TO BE COMPLETED
+
+    [Tags]    PIC_MEC_PLAT    PIC_SERVICES    INCLUDE_UNDEFINED_SCHEMAS
+    Get the zones info location list
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    ZoneList
+
+
+TC_MEC_SRV_ZOINFOLOOK_002_OK
+    [Documentation]
+    ...    TO BE CMPLETED
+
+    [Tags]    PIC_MEC_PLAT    PIC_SERVICES
+    Get the zone info location        ${ZONE_ID}
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    ZoneInfo
+    Should Be Equal As Strings    ${response['body']['zoneInfo']['zoneId']}    ${ZONE_ID}
+    
+TC_MEC_SRV_ZOINFOLOOK_002_NF
+    [Documentation]
+    ...    TO BE CMPLETED
+
+    [Tags]    PIC_MEC_PLAT    PIC_SERVICES
+    Get the zone info location        ${NON_EXISTENT_ZONE_ID}
+    Check HTTP Response Status Code Is    404
+
+*** Keywords ***
+Get the zone info location 
+    [Arguments]    ${zoneId}
+    Set Headers    {"Accept":"application/json"}
+    Set Headers    {"Authorization":"${TOKEN}"}
+    Get    ${apiRoot}/${apiName}/${apiVersion}/queries/zones/${zoneId}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+
+Get the zones info location list
+    Set Headers    {"Accept":"application/json"}
+    Set Headers    {"Authorization":"${TOKEN}"}
+    Get    ${apiRoot}/${apiName}/${apiVersion}/queries/zones
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+
+
diff --git a/SRV/ZOINFOLOOK/README.md b/SRV/ZOINFOLOOK/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/SRV/ZOINFOLOOK/environment/variables.txt b/SRV/ZOINFOLOOK/environment/variables.txt
new file mode 100644
index 0000000..a9bf262
--- /dev/null
+++ b/SRV/ZOINFOLOOK/environment/variables.txt
@@ -0,0 +1,14 @@
+*** Variables ***
+# Generic variables
+${SCHEMA}                   http
+${HOST}                     10.192.2.172
+${PORT}                     8081
+${response}                         {}
+${TOKEN}                            Basic YWxhZGRpbjpvcGVuc2VzYW1l
+${apiRoot}        
+${apiName}        location
+${apiVersion}     v2
+
+# Specific variables
+${ZONE_ID}                    5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f
+${NON_EXISTENT_ZONE_ID}       NON_EXISTENT_ZONE_ID
diff --git a/SRV/ZOINFOLOOK/schemas/ZoneInfo.schema.json b/SRV/ZOINFOLOOK/schemas/ZoneInfo.schema.json
new file mode 100644
index 0000000..b39dd2d
--- /dev/null
+++ b/SRV/ZOINFOLOOK/schemas/ZoneInfo.schema.json
@@ -0,0 +1,48 @@
+{
+	"type": "object",
+	"properties": {
+		"zoneInfo": {
+			"description": "A type containing zone information.",
+			"properties": {
+				"numberOfAccessPoints": {
+					"description": "The number of access points within the zone",
+					"type": "integer",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "unsignedInt"
+				},
+				"numberOfUnserviceableAccessPoints": {
+					"description": "Number of inoperable access points within the zone.",
+					"type": "integer",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "unsignedInt"
+				},
+				"numberOfUsers": {
+					"description": "The number of users currently on the access point.",
+					"type": "integer",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "unsignedInt"
+				},
+				"resourceURL": {
+					"description": "Self referring URL",
+					"type": "string",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "anyURI"
+				},
+				"zoneId": {
+					"description": "Identifier of zone",
+					"type": "string",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "string"
+				}
+			},
+			"required": [
+				"zoneId",
+				"numberOfAccessPoints",
+				"numberOfUnserviceableAccessPoints",
+				"numberOfUsers",
+				"resourceURL"
+			],
+			"type": "object"
+		}
+	}
+}
\ No newline at end of file
diff --git a/SRV/ZOINFOLOOK/schemas/ZoneList.schema.json b/SRV/ZOINFOLOOK/schemas/ZoneList.schema.json
new file mode 100644
index 0000000..b39dd2d
--- /dev/null
+++ b/SRV/ZOINFOLOOK/schemas/ZoneList.schema.json
@@ -0,0 +1,48 @@
+{
+	"type": "object",
+	"properties": {
+		"zoneInfo": {
+			"description": "A type containing zone information.",
+			"properties": {
+				"numberOfAccessPoints": {
+					"description": "The number of access points within the zone",
+					"type": "integer",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "unsignedInt"
+				},
+				"numberOfUnserviceableAccessPoints": {
+					"description": "Number of inoperable access points within the zone.",
+					"type": "integer",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "unsignedInt"
+				},
+				"numberOfUsers": {
+					"description": "The number of users currently on the access point.",
+					"type": "integer",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "unsignedInt"
+				},
+				"resourceURL": {
+					"description": "Self referring URL",
+					"type": "string",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "anyURI"
+				},
+				"zoneId": {
+					"description": "Identifier of zone",
+					"type": "string",
+					"x-etsi-mec-cardinality": 1,
+					"x-etsi-mec-origin-type": "string"
+				}
+			},
+			"required": [
+				"zoneId",
+				"numberOfAccessPoints",
+				"numberOfUnserviceableAccessPoints",
+				"numberOfUsers",
+				"resourceURL"
+			],
+			"type": "object"
+		}
+	}
+}
\ No newline at end of file
-- 
GitLab