diff --git a/Mp1.json b/Mp1.json
index 6c42dc4142c851ef77bbcf5b0c76e3b8deb78270..6060e9f73fb3eafb1c7a0429c71cbec01a0a3c22 100644
--- a/Mp1.json
+++ b/Mp1.json
@@ -728,14 +728,31 @@
       },
       "EndPointInfo.Addresses": {
         "description": "Entry point information of the service as one or more pairs of IP address and port",
-        "type": "array",
-        "items": {
-          "$ref": "#/components/schemas/EndPointInfo.Address"
+        "type": "object",
+        "required": [
+          "addresses"
+        ],
+        "properties": {
+          "addresses": {
+            "type": "array",
+            "minItems": 0,
+            "items": {
+              "$ref": "#/components/schemas/EndPointInfo.Address"
+            }
+          }
         }
       },
       "EndPointInfo.Alternative": {
         "description": "Entry point information of the service in a format defined by an implementation, or in an external specification.",
-        "type": "object"
+        "type": "object",
+        "required": [
+          "alternative"
+        ],
+        "properties": {
+          "alternative": {
+            "type": "object"
+          }
+        }
       },
       "EndPointInfo.Uri": {
         "description": "Entry point information of the service",
@@ -745,9 +762,18 @@
       },
       "EndPointInfo.Uris": {
         "description": "Entry point information of the service as string, formatted according to URI syntax",
-        "type": "array",
-        "items": {
-          "$ref": "#/components/schemas/EndPointInfo.Uri"
+        "type": "object",
+        "required": [
+          "uris"
+        ],
+        "properties": {
+          "uris": {
+            "type": "array",
+            "minItems": 0,
+            "items": {
+              "$ref": "#/components/schemas/EndPointInfo.Uri"
+            }
+          }
         }
       },
       "LinkType": {
diff --git a/Mp1.yaml b/Mp1.yaml
index d6ee920795b8751b7d00029650d54aaf8e22a5bc..bcfda289de0c1f825d5059a547957ff4e7561e66 100644
--- a/Mp1.yaml
+++ b/Mp1.yaml
@@ -552,14 +552,25 @@ components:
       description: >-
         Entry point information of the service as one or more pairs of IP
         address and port
-      type: array
-      items:
-        $ref: '#/components/schemas/EndPointInfo.Address'
+      type: object
+      required:
+        - addresses
+      properties:
+        addresses:
+          type: array
+          minItems: 0
+          items:
+            $ref: '#/components/schemas/EndPointInfo.Address'
     EndPointInfo.Alternative:
       description: >-
         Entry point information of the service in a format defined by an
         implementation, or in an external specification.
       type: object
+      required:
+        - alternative
+      properties: 
+        alternative:
+          type: object
     EndPointInfo.Uri:
       description: Entry point information of the service
       type: string
@@ -569,9 +580,15 @@ components:
       description: >-
         Entry point information of the service as string, formatted according to
         URI syntax
-      type: array
-      items:
-        $ref: '#/components/schemas/EndPointInfo.Uri'
+      type: object
+      required:
+        - uris
+      properties:
+        uris:
+          type: array
+          minItems: 0
+          items:
+            $ref: '#/components/schemas/EndPointInfo.Uri'
     LinkType:
       description: This type represents a type of link and may be referenced from data structures
       type: object