diff --git a/Mp1.yaml b/Mp1.yaml
index d078e2811bb8a713a971c3e5cbb95e1186f313f2..d6ee920795b8751b7d00029650d54aaf8e22a5bc 100644
--- a/Mp1.yaml
+++ b/Mp1.yaml
@@ -572,16 +572,6 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/EndPointInfo.Uri'
-    EndPointInfo:
-      description: This type represents information about a transport endpoint
-      type: object
-      properties:
-        uris:
-          $ref: '#/components/schemas/EndPointInfo.Uris'
-        addresses:
-          $ref: '#/components/schemas/EndPointInfo.Addresses'
-        alternative:
-          $ref: '#/components/schemas/EndPointInfo.Alternative'
     LinkType:
       description: This type represents a type of link and may be referenced from data structures
       type: object
@@ -1195,7 +1185,12 @@ components:
         version:
           $ref: '#/components/schemas/TransportInfo.Version'
         endpoint:
-          $ref: '#/components/schemas/EndPointInfo'
+          description: This type represents information about a transport endpoint
+          type: object
+          oneOf:
+            - $ref: '#/components/schemas/EndPointInfo.Uris'
+            - $ref: '#/components/schemas/EndPointInfo.Addresses'
+            - $ref: '#/components/schemas/EndPointInfo.Alternative'
         security:
           $ref: '#/components/schemas/SecurityInfo'
         implSpecificInfo:
@@ -1712,9 +1707,6 @@ components:
           endpoint:
             uris:
               - '/meMp1/service/EntryPoint'
-            addresses:
-              - host: '192.0.2.0'
-                port: 8080
           security:
             oAuth2Info:
               grantTypes: 'OAUTH2_CLIENT_CREDENTIALS'
@@ -1740,8 +1732,6 @@ components:
             protocol: 'HTTP'
             version: '2.0'
             endpoint:
-              uris:
-                - '/meMp1/service/EntryPoint'
               addresses:
                 - host: '192.0.2.0'
                   port: 8080