diff --git a/src/SOL002/APIVersion/APIVersion.yaml b/src/SOL002/APIVersion/APIVersion.yaml
index 1a313177ba43bc6dee36e61770f324dfc19f8018..b3d4344b3ba67633abd8cdd9aa641c850b21e728 100644
--- a/src/SOL002/APIVersion/APIVersion.yaml
+++ b/src/SOL002/APIVersion/APIVersion.yaml
@@ -17,7 +17,6 @@ info:
 externalDocs:
   description: ETSI GS NFV-SOL 002 V2.5.1
   url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.05.01_60/gs_nfv-sol002v020501p.pdf
-basePath: /{apiName}
 schemes:
   - http
   - https
@@ -29,50 +28,17 @@ paths:
   ###############################################################################
   # API Versions                                                                #
   ###############################################################################
-  '/api-versions':
-    parameters:
-      - name: Version
-        description: >
-          Version of the API requested to use when responding to this request.
-        in: header
-        required: false
-        type: string
-    get:
-      summary: Retrieve API version information
-      description: >
-        The GET method reads API version information. This method shall follow the provisions specified in
-        table 4.6.3.3.3.2-1 for request and response data structures, and response codes. URI query parameters are not
-        supported.
-      responses:
-        200:
-          description: >
-            API version information was read successfully.
-            The response body shall contain 4.4 API version
-            information, as defined in clause 4.4.1.13.
-          schema:
-            $ref: '../../definitions/SOL002SOL003_def.yaml#/definitions/ApiVersionInformation'
-          headers:
-            Content-Type:
-              description: The MIME type of the body of the response.
-              type: string
-              maximum: 1
-              minimum: 1
-            Version:
-              description: The used API version.
-              type: string
-              maximum: 1
-              minimum: 1
-        400: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/400' }
-        401: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/401' }
-        403: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/403' }
-        404: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/404' }
-        405: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/405' }
-        406: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/406' }
-        413: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/413' }
-        414: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/414' }
-        416: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/416' }
-        422: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/422' }
-        429: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/429' }
-        500: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/500' }
-        503: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/503' }
-        504: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/504' }
+  '/vnfconfig/api-versions':
+    $ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
+
+  '/vnffm/api-versions':
+    $ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
+
+  '/vnfind/api-versions':
+    $ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
+
+  '/vnflcm/api-versions':
+    $ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
+
+  '/vnfpm/api-versions':
+    $ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
\ No newline at end of file
diff --git a/src/SOL002/VNFConfiguration/VNFConfiguration.yaml b/src/SOL002/VNFConfiguration/VNFConfiguration.yaml
index 951d7b5cfa2fda23a15420e2a1ea0d01d5d45d7d..18bcb6da44d26c963350bd122566783d75cecc01 100644
--- a/src/SOL002/VNFConfiguration/VNFConfiguration.yaml
+++ b/src/SOL002/VNFConfiguration/VNFConfiguration.yaml
@@ -30,52 +30,7 @@ paths:
   # API Versions                                                                #
   ###############################################################################
   '/api-versions':
-    parameters:
-      - name: Version
-        description: >
-          Version of the API requested to use when responding to this request.
-        in: header
-        required: true
-        type: string
-    get:
-      summary: Retrieve API version information
-      description: >
-        The GET method reads API version information. This method shall follow the provisions specified in
-        table 4.6.3.3.3.2-1 for request and response data structures, and response codes. URI query parameters are not
-        supported.
-      responses:
-        200:
-          description: >
-            API version information was read successfully.
-            The response body shall contain 4.4 API version
-            information, as defined in clause 4.4.1.13.
-          schema:
-            $ref: '../../definitions/SOL002SOL003_def.yaml#/definitions/ApiVersionInformation'
-          headers:
-            Content-Type:
-              description: The MIME type of the body of the response.
-              type: string
-              maximum: 1
-              minimum: 1
-            Version:
-              description: The used API version.
-              type: string
-              maximum: 1
-              minimum: 1
-        400: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/400' }
-        401: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/401' }
-        403: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/403' }
-        404: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/404' }
-        405: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/405' }
-        406: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/406' }
-        413: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/413' }
-        414: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/414' }
-        416: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/416' }
-        422: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/422' }
-        429: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/429' }
-        500: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/500' }
-        503: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/503' }
-        504: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/504' }
+    $ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
 
   ###############################################################################
   # VNF Configuration                                                           #
diff --git a/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml
index dbd6788519635e19e1666a1617eceb8d1f234edd..fe93435fdfd8ec4ea6af893e7601f766b3227c11 100644
--- a/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml
+++ b/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml
@@ -36,56 +36,11 @@ produces:
 
 
 paths:
-###############################################################################
-# API Versions                                                                #
-###############################################################################
+  ###############################################################################
+  # API Versions                                                                #
+  ###############################################################################
   '/api-versions':
-    parameters:
-      - name: Version
-        description: >
-          Version of the API requested to use when responding to this request.
-        in: header
-        required: true
-        type: string
-    get:
-      summary: Retrieve API version information
-      description: >
-        The GET method reads API version information. This method shall follow the provisions specified in
-        table 4.6.3.3.3.2-1 for request and response data structures, and response codes. URI query parameters are not
-        supported.
-      responses:
-        200:
-          description: >
-            API version information was read successfully.
-            The response body shall contain 4.4 API version
-            information, as defined in clause 4.4.1.13.
-          schema:
-            $ref: '../../definitions/SOL002SOL003_def.yaml#/definitions/ApiVersionInformation'
-          headers:
-            Content-Type:
-              description: The MIME type of the body of the response.
-              type: string
-              maximum: 1
-              minimum: 1
-            Version:
-              description: The used API version.
-              type: string
-              maximum: 1
-              minimum: 1
-        400: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/400' }
-        401: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/401' }
-        403: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/403' }
-        404: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/404' }
-        405: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/405' }
-        406: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/406' }
-        413: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/413' }
-        414: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/414' }
-        416: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/416' }
-        422: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/422' }
-        429: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/429' }
-        500: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/500' }
-        503: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/503' }
-        504: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/504' }
+    $ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
 
 ###############################################################################
 # Alarms                                                                      #
diff --git a/src/SOL002/VNFIndicator/VNFIndicator.yaml b/src/SOL002/VNFIndicator/VNFIndicator.yaml
index fe4fd7b7512c642296cfeb8d4df31fec9c2de62f..2831b5f7847b2958112f0fc83659881ddab9d82d 100644
--- a/src/SOL002/VNFIndicator/VNFIndicator.yaml
+++ b/src/SOL002/VNFIndicator/VNFIndicator.yaml
@@ -44,52 +44,7 @@ paths:
   # API Versions                                                                #
   ###############################################################################
   '/api-versions':
-    parameters:
-      - name: Version
-        description: >
-          Version of the API requested to use when responding to this request.
-        in: header
-        required: true
-        type: string
-    get:
-      summary: Retrieve API version information
-      description: >
-        The GET method reads API version information. This method shall follow the provisions specified in
-        table 4.6.3.3.3.2-1 for request and response data structures, and response codes. URI query parameters are not
-        supported.
-      responses:
-        200:
-          description: >
-            API version information was read successfully.
-            The response body shall contain 4.4 API version
-            information, as defined in clause 4.4.1.13.
-          schema:
-            $ref: '../../definitions/SOL002SOL003_def.yaml#/definitions/ApiVersionInformation'
-          headers:
-            Content-Type:
-              description: The MIME type of the body of the response.
-              type: string
-              maximum: 1
-              minimum: 1
-            Version:
-              description: The used API version.
-              type: string
-              maximum: 1
-              minimum: 1
-        400: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/400' }
-        401: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/401' }
-        403: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/403' }
-        404: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/404' }
-        405: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/405' }
-        406: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/406' }
-        413: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/413' }
-        414: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/414' }
-        416: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/416' }
-        422: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/422' }
-        429: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/429' }
-        500: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/500' }
-        503: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/503' }
-        504: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/504' }
+    $ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
 
   ###############################################################################
   # VNF Indicators                                                              #
diff --git a/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml
index 741ab4707048f38d3aef10c95a472209262bd8b2..ffa6e8a5f0a3a49a8238c5495302f1966a66bdd6 100644
--- a/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml
+++ b/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml
@@ -35,56 +35,12 @@ produces:
 
 
 paths:
-###############################################################################
-# API Versions                                                                #
-###############################################################################
+  ###############################################################################
+  # API Versions                                                                #
+  ###############################################################################
   '/api-versions':
-    parameters:
-      - name: Version
-        description: >
-          Version of the API requested to use when responding to this request.
-        in: header
-        required: true
-        type: string
-    get:
-      summary: Retrieve API version information
-      description: >
-        The GET method reads API version information. This method shall follow the provisions specified in
-        table 4.6.3.3.3.2-1 for request and response data structures, and response codes. URI query parameters are not
-        supported.
-      responses:
-        200:
-          description: >
-            API version information was read successfully.
-            The response body shall contain 4.4 API version
-            information, as defined in clause 4.4.1.13.
-          schema:
-            $ref: '../../definitions/SOL002SOL003_def.yaml#/definitions/ApiVersionInformation'
-          headers:
-            Content-Type:
-              description: The MIME type of the body of the response.
-              type: string
-              maximum: 1
-              minimum: 1
-            Version:
-              description: The used API version.
-              type: string
-              maximum: 1
-              minimum: 1
-        400: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/400' }
-        401: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/401' }
-        403: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/403' }
-        404: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/404' }
-        405: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/405' }
-        406: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/406' }
-        413: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/413' }
-        414: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/414' }
-        416: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/416' }
-        422: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/422' }
-        429: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/429' }
-        500: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/500' }
-        503: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/503' }
-        504: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/504' }
+    $ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
+
 ###############################################################################
 # VNF instances                                                               #
 ###############################################################################
diff --git a/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml b/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml
index 8e50b39e87e0e4dfc6a0d9f1dbdd08a4094c5591..f5f1d92190871b71a1a24e2e459baebc8dcd9b80 100644
--- a/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml
+++ b/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml
@@ -36,56 +36,11 @@ produces:
 
 
 paths:
-###############################################################################
-# API Versions                                                                #
-###############################################################################
+  ###############################################################################
+  # API Versions                                                                #
+  ###############################################################################
   '/api-versions':
-    parameters:
-      - name: Version
-        description: >
-          Version of the API requested to use when responding to this request.
-        in: header
-        required: true
-        type: string
-    get:
-      summary: Retrieve API version information
-      description: >
-        The GET method reads API version information. This method shall follow the provisions specified in
-        table 4.6.3.3.3.2-1 for request and response data structures, and response codes. URI query parameters are not
-        supported.
-      responses:
-        200:
-          description: >
-            API version information was read successfully.
-            The response body shall contain 4.4 API version
-            information, as defined in clause 4.4.1.13.
-          schema:
-            $ref: '../../definitions/SOL002SOL003_def.yaml#/definitions/ApiVersionInformation'
-          headers:
-            Content-Type:
-              description: The MIME type of the body of the response.
-              type: string
-              maximum: 1
-              minimum: 1
-            Version:
-              description: The used API version.
-              type: string
-              maximum: 1
-              minimum: 1
-        400: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/400' }
-        401: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/401' }
-        403: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/403' }
-        404: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/404' }
-        405: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/405' }
-        406: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/406' }
-        413: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/413' }
-        414: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/414' }
-        416: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/416' }
-        422: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/422' }
-        429: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/429' }
-        500: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/500' }
-        503: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/503' }
-        504: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/504' }
+    $ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
 
 ###############################################################################
 # PM jobs                                                                     #
diff --git a/src/SOL003/APIVersion/APIVersion.yaml b/src/SOL003/APIVersion/APIVersion.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..678e2ddb92fca9df1c4c6d1a96e62746ebbdf6a8
--- /dev/null
+++ b/src/SOL003/APIVersion/APIVersion.yaml
@@ -0,0 +1,50 @@
+swagger: "2.0"
+info:
+  version: "1.2.0"
+  title: "SOL003 - API version interface"
+  description: >
+    SOL003 - API version Interface
+    IMPORTANT: Please note that this file might be not aligned to the current
+    version of the ETSI Group Specification it refers to and has not been
+    approved by the ETSI NFV ISG. In case of discrepancies the published ETSI
+    Group Specification takes precedence.
+    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
+  license:
+    name: "ETSI Forge copyright notice"
+    url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
+  contact:
+    name: "NFV-SOL WG"
+externalDocs:
+  description: ETSI GS NFV-SOL 003 V2.5.1
+  url:
+schemes:
+  - http
+  - https
+consumes:
+  - application/json
+produces:
+  - application/json
+paths:
+  ###############################################################################
+  # API Versions                                                                #
+  ###############################################################################
+  '/vrqan/api-versions':
+    $ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
+
+  '/vnffm/api-versions':
+    $ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
+
+  '/vnfind/api-versions':
+    $ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
+
+  '/vnflcm/api-versions':
+    $ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
+
+  '/vnfpm/api-versions':
+    $ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
+
+  '/grant/api-versions':
+    $ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
+
+  '/vnfpkgm/api-versions':
+    $ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
\ No newline at end of file
diff --git a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml
index 3643122251a966a8b6bd5404150438a72a822099..3643c48bc06e1ac2b76bcb3ed7db245fc791389e 100644
--- a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml
+++ b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml
@@ -39,56 +39,11 @@ produces:
   - "application/json"
 
 paths:
-###############################################################################
-# API Versions                                                                #
-###############################################################################
+  ###############################################################################
+  # API Versions                                                                #
+  ###############################################################################
   '/api-versions':
-    get:
-      summary: Retrieve API version information
-      description: >
-        The GET method reads API version information. This method shall follow the provisions specified in
-        table 4.6.3.3.3.2-1 for request and response data structures, and response codes. URI query parameters are not
-        supported.
-      parameters:
-        - name: Version
-          description: >
-            Version of the API requested to use when responding to this request.
-          in: header
-          required: false
-          type: string
-      responses:
-        200:
-          description: >
-            API version information was read successfully.
-            The response body shall contain 4.4 API version
-            information, as defined in clause 4.4.1.13.
-          schema:
-            $ref: '../../definitions/SOL002SOL003_def.yaml#/definitions/ApiVersionInformation'
-          headers:
-            Content-Type:
-              description: The MIME type of the body of the response.
-              type: string
-              maximum: 1
-              minimum: 1
-            Version:
-              description: The used API version.
-              type: string
-              maximum: 1
-              minimum: 1
-        400: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/400' }
-        401: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/401' }
-        403: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/403' }
-        404: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/404' }
-        405: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/405' }
-        406: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/406' }
-        413: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/413' }
-        414: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/414' }
-        416: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/416' }
-        422: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/422' }
-        429: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/429' }
-        500: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/500' }
-        503: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/503' }
-        504: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/504' }
+    $ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
 
 ###############################################################################
 # Alarms                                                                      #
diff --git a/src/SOL003/VNFIndicator/VNFIndicator.yaml b/src/SOL003/VNFIndicator/VNFIndicator.yaml
index 867a6dd4799d2b6bfde213d831e5fec76a08f6ef..f20cfa2be7dc623ac080afb04fcc64a68e1b3f2c 100644
--- a/src/SOL003/VNFIndicator/VNFIndicator.yaml
+++ b/src/SOL003/VNFIndicator/VNFIndicator.yaml
@@ -38,56 +38,11 @@ produces:
   - "application/json"
 
 paths:
-###############################################################################
-# API Versions                                                                #
-###############################################################################
+  ###############################################################################
+  # API Versions                                                                #
+  ###############################################################################
   '/api-versions':
-    get:
-      summary: Retrieve API version information
-      description: >
-        The GET method reads API version information. This method shall follow the provisions specified in
-        table 4.6.3.3.3.2-1 for request and response data structures, and response codes. URI query parameters are not
-        supported.
-      parameters:
-        - name: Version
-          description: >
-            Version of the API requested to use when responding to this request.
-          in: header
-          required: false
-          type: string
-      responses:
-        200:
-          description: >
-            API version information was read successfully.
-            The response body shall contain 4.4 API version
-            information, as defined in clause 4.4.1.13.
-          schema:
-            $ref: '../../definitions/SOL002SOL003_def.yaml#/definitions/ApiVersionInformation'
-          headers:
-            Content-Type:
-              description: The MIME type of the body of the response.
-              type: string
-              maximum: 1
-              minimum: 1
-            Version:
-              description: The used API version.
-              type: string
-              maximum: 1
-              minimum: 1
-        400: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/400' }
-        401: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/401' }
-        403: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/403' }
-        404: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/404' }
-        405: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/405' }
-        406: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/406' }
-        413: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/413' }
-        414: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/414' }
-        416: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/416' }
-        422: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/422' }
-        429: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/429' }
-        500: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/500' }
-        503: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/503' }
-        504: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/504' }
+    $ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
 
 ###############################################################################
 # VNF indicators                                                              #
diff --git a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml
index d79d51d082b082d62b01779714feeeca7b8e89a2..e8c36e26ead05baa9d63c628d56a5a93f47d8bd7 100644
--- a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml
+++ b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml
@@ -39,56 +39,11 @@ produces:
   - "application/json"
 
 paths:
-###############################################################################
-# API Versions                                                                #
-###############################################################################
+  ###############################################################################
+  # API Versions                                                                #
+  ###############################################################################
   '/api-versions':
-    get:
-      summary: Retrieve API version information
-      description: >
-        The GET method reads API version information. This method shall follow the provisions specified in
-        table 4.6.3.3.3.2-1 for request and response data structures, and response codes. URI query parameters are not
-        supported.
-      parameters:
-        - name: Version
-          description: >
-            Version of the API requested to use when responding to this request.
-          in: header
-          required: false
-          type: string
-      responses:
-        200:
-          description: >
-            API version information was read successfully.
-            The response body shall contain 4.4 API version
-            information, as defined in clause 4.4.1.13.
-          schema:
-            $ref: '../../definitions/SOL002SOL003_def.yaml#/definitions/ApiVersionInformation'
-          headers:
-            Content-Type:
-              description: The MIME type of the body of the response.
-              type: string
-              maximum: 1
-              minimum: 1
-            Version:
-              description: The used API version.
-              type: string
-              maximum: 1
-              minimum: 1
-        400: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/400' }
-        401: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/401' }
-        403: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/403' }
-        404: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/404' }
-        405: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/405' }
-        406: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/406' }
-        413: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/413' }
-        414: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/414' }
-        416: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/416' }
-        422: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/422' }
-        429: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/429' }
-        500: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/500' }
-        503: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/503' }
-        504: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/504' }
+    $ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
 
 ###############################################################################
 # VNF instances                                                               #
diff --git a/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml b/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml
index f961c1651e1c78e698bab297d160181c358f95d2..98266d78faf026bf3055fdfcbe2d5946fb4a0ad4 100644
--- a/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml
+++ b/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml
@@ -39,56 +39,11 @@ produces:
   - "application/json"
 
 paths:
-###############################################################################
-# API Versions                                                                #
-###############################################################################
+  ###############################################################################
+  # API Versions                                                                #
+  ###############################################################################
   '/api-versions':
-    get:
-      summary: Retrieve API version information
-      description: >
-        The GET method reads API version information. This method shall follow the provisions specified in
-        table 4.6.3.3.3.2-1 for request and response data structures, and response codes. URI query parameters are not
-        supported.
-      parameters:
-        - name: Version
-          description: >
-            Version of the API requested to use when responding to this request.
-          in: header
-          required: false
-          type: string
-      responses:
-        200:
-          description: >
-            API version information was read successfully.
-            The response body shall contain 4.4 API version
-            information, as defined in clause 4.4.1.13.
-          schema:
-            $ref: '../../definitions/SOL002SOL003_def.yaml#/definitions/ApiVersionInformation'
-          headers:
-            Content-Type:
-              description: The MIME type of the body of the response.
-              type: string
-              maximum: 1
-              minimum: 1
-            Version:
-              description: The used API version.
-              type: string
-              maximum: 1
-              minimum: 1
-        400: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/400' }
-        401: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/401' }
-        403: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/403' }
-        404: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/404' }
-        405: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/405' }
-        406: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/406' }
-        413: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/413' }
-        414: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/414' }
-        416: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/416' }
-        422: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/422' }
-        429: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/429' }
-        500: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/500' }
-        503: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/503' }
-        504: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/504' }
+    $ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
 
 ###############################################################################
 # Resource: Grants                                                            #
diff --git a/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml b/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml
index 6c3fb629523b85e8396259147b69e8c5a2dc604f..e1271bf7844b10efd902f647862798099b231cdc 100644
--- a/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml
+++ b/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml
@@ -39,56 +39,11 @@ produces:
   - "application/json"
 
 paths:
-###############################################################################
-# API Versions                                                                #
-###############################################################################
+  ###############################################################################
+  # API Versions                                                                #
+  ###############################################################################
   '/api-versions':
-    get:
-      summary: Retrieve API version information
-      description: >
-        The GET method reads API version information. This method shall follow the provisions specified in
-        table 4.6.3.3.3.2-1 for request and response data structures, and response codes. URI query parameters are not
-        supported.
-      parameters:
-        - name: Version
-          description: >
-            Version of the API requested to use when responding to this request.
-          in: header
-          required: false
-          type: string
-      responses:
-        200:
-          description: >
-            API version information was read successfully.
-            The response body shall contain 4.4 API version
-            information, as defined in clause 4.4.1.13.
-          schema:
-            $ref: '../../definitions/SOL002SOL003_def.yaml#/definitions/ApiVersionInformation'
-          headers:
-            Content-Type:
-              description: The MIME type of the body of the response.
-              type: string
-              maximum: 1
-              minimum: 1
-            Version:
-              description: The used API version.
-              type: string
-              maximum: 1
-              minimum: 1
-        400: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/400' }
-        401: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/401' }
-        403: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/403' }
-        404: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/404' }
-        405: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/405' }
-        406: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/406' }
-        413: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/413' }
-        414: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/414' }
-        416: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/416' }
-        422: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/422' }
-        429: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/429' }
-        500: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/500' }
-        503: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/503' }
-        504: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/504' }
+    $ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
 
 ###############################################################################
 # VNF packages                                                                #
diff --git a/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml b/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml
index 070861abad3b4e9d898445e3fd5bb800324f23cd..ec9b5c8c8b0343e256d18c646c40a8af5d4fb805 100644
--- a/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml
+++ b/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml
@@ -39,56 +39,11 @@ produces:
   - "application/json"
 
 paths:
-###############################################################################
-# API Versions                                                                #
-###############################################################################
+  ###############################################################################
+  # API Versions                                                                #
+  ###############################################################################
   '/api-versions':
-    get:
-      summary: Retrieve API version information
-      description: >
-        The GET method reads API version information. This method shall follow the provisions specified in
-        table 4.6.3.3.3.2-1 for request and response data structures, and response codes. URI query parameters are not
-        supported.
-      parameters:
-        - name: Version
-          description: >
-            Version of the API requested to use when responding to this request.
-          in: header
-          required: false
-          type: string
-      responses:
-        200:
-          description: >
-            API version information was read successfully.
-            The response body shall contain 4.4 API version
-            information, as defined in clause 4.4.1.13.
-          schema:
-            $ref: '../../definitions/SOL002SOL003_def.yaml#/definitions/ApiVersionInformation'
-          headers:
-            Content-Type:
-              description: The MIME type of the body of the response.
-              type: string
-              maximum: 1
-              minimum: 1
-            Version:
-              description: The used API version.
-              type: string
-              maximum: 1
-              minimum: 1
-        400: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/400' }
-        401: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/401' }
-        403: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/403' }
-        404: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/404' }
-        405: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/405' }
-        406: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/406' }
-        413: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/413' }
-        414: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/414' }
-        416: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/416' }
-        422: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/422' }
-        429: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/429' }
-        500: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/500' }
-        503: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/503' }
-        504: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/504' }
+    $ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
 
 ###############################################################################
 # PM jobs                                                                     #
diff --git a/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml b/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml
index d7efe2ba56e0319064f87c52ab4885b2f10742f6..5dfd146fe16f6a4e8991122b59d64855bb33e149 100644
--- a/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml
+++ b/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml
@@ -39,56 +39,11 @@ produces:
   - "application/json"
 
 paths:
-###############################################################################
-# API Versions                                                                #
-###############################################################################
+  ###############################################################################
+  # API Versions                                                                #
+  ###############################################################################
   '/api-versions':
-    get:
-      summary: Retrieve API version information
-      description: >
-        The GET method reads API version information. This method shall follow the provisions specified in
-        table 4.6.3.3.3.2-1 for request and response data structures, and response codes. URI query parameters are not
-        supported.
-      parameters:
-        - name: Version
-          description: >
-            Version of the API requested to use when responding to this request.
-          in: header
-          required: false
-          type: string
-      responses:
-        200:
-          description: >
-            API version information was read successfully.
-            The response body shall contain 4.4 API version
-            information, as defined in clause 4.4.1.13.
-          schema:
-            $ref: '../../definitions/SOL002SOL003_def.yaml#/definitions/ApiVersionInformation'
-          headers:
-            Content-Type:
-              description: The MIME type of the body of the response.
-              type: string
-              maximum: 1
-              minimum: 1
-            Version:
-              description: The used API version.
-              type: string
-              maximum: 1
-              minimum: 1
-        400: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/400' }
-        401: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/401' }
-        403: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/403' }
-        404: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/404' }
-        405: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/405' }
-        406: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/406' }
-        413: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/413' }
-        414: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/414' }
-        416: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/416' }
-        422: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/422' }
-        429: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/429' }
-        500: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/500' }
-        503: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/503' }
-        504: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/504' }
+    $ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
 
 ###############################################################################
 # Subscriptions                                                               #
diff --git a/src/definitions/SOL002SOL003_def.yaml b/src/definitions/SOL002SOL003_def.yaml
index d3f6897f4c448bc53743826e4476867ff7dd1d85..5871c894d70f47ef84d1df1032fd3da5f541ee52 100644
--- a/src/definitions/SOL002SOL003_def.yaml
+++ b/src/definitions/SOL002SOL003_def.yaml
@@ -905,4 +905,3 @@ definitions:
 
 
 
-
diff --git a/src/endpoints/SOL002SOL003_endpoints.yaml b/src/endpoints/SOL002SOL003_endpoints.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ee687823390ed9384a31966a25ea7df4f905c208
--- /dev/null
+++ b/src/endpoints/SOL002SOL003_endpoints.yaml
@@ -0,0 +1,51 @@
+# Copyright (c) ETSI 2017.
+# https://forge.etsi.org/etsi-forge-copyright-notice.txt
+
+endpoints:
+  api-versions:
+    parameters:
+      - name: Version
+        description: >
+          Version of the API requested to use when responding to this request.
+        in: header
+        required: false
+        type: string
+    get:
+      summary: Retrieve API version information
+      description: >
+        The GET method reads API version information. This method shall follow the provisions specified in
+        table 4.6.3.3.3.2-1 for request and response data structures, and response codes. URI query parameters are not
+        supported.
+      responses:
+        200:
+          description: >
+            API version information was read successfully.
+            The response body shall contain 4.4 API version
+            information, as defined in clause 4.4.1.13.
+          schema:
+            $ref: '../../definitions/SOL002SOL003_def.yaml#/definitions/ApiVersionInformation'
+          headers:
+            Content-Type:
+              description: The MIME type of the body of the response.
+              type: string
+              maximum: 1
+              minimum: 1
+            Version:
+              description: The used API version.
+              type: string
+              maximum: 1
+              minimum: 1
+        400: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/400' }
+        401: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/401' }
+        403: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/403' }
+        404: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/404' }
+        405: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/405' }
+        406: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/406' }
+        413: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/413' }
+        414: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/414' }
+        416: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/416' }
+        422: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/422' }
+        429: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/429' }
+        500: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/500' }
+        503: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/503' }
+        504: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/504' }