diff --git a/src/SOL005/APIVersion/APIVersion.yaml b/src/SOL005/APIVersion/APIVersion.yaml
index e5024d0b0a241cfcecef99bb67947d6c981e9c50..3fec67c7254d6ce8c968548f1c972dde0240e802 100644
--- a/src/SOL005/APIVersion/APIVersion.yaml
+++ b/src/SOL005/APIVersion/APIVersion.yaml
@@ -1,6 +1,7 @@
 swagger: "2.0"
+
 info:
-  version: "1.1.0"
+  version: "1.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
   title: "SOL005 - API version interface"
   description: >
     SOL005 - API version Interface
@@ -14,16 +15,21 @@ info:
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
   contact:
     name: "NFV-SOL WG"
+
 externalDocs:
   description: ETSI GS NFV-SOL 005 V2.5.1
   url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/02.05.01_60/gs_NFV-SOL005v020501p.pdf
+
 schemes:
   - http
   - https
+
 consumes:
   - application/json
+
 produces:
   - application/json
+
 paths:
   ###############################################################################
   # API Versions                                                                #
diff --git a/src/SOL005/NSDManagement/NSDManagement.yaml b/src/SOL005/NSDManagement/NSDManagement.yaml
index e75e067f9fceec39189089c91bdc33c5b8ecea70..23df6eeec99596d778f0132b5ab06825d5653e15 100644
--- a/src/SOL005/NSDManagement/NSDManagement.yaml
+++ b/src/SOL005/NSDManagement/NSDManagement.yaml
@@ -1,7 +1,7 @@
 swagger: "2.0"
 
 info:
-  version: "1.1.0"
+  version: "1.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
   title: "SOL005 - NSD Management Interface"
   description: >
     SOL005 - NSD Management Interface 
@@ -15,17 +15,23 @@ info:
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
   contact:
     name: "NFV-SOL WG"
+
 externalDocs:
   description: ETSI GS NFV-SOL 005 V2.5.1
   url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/02.05.01_60/gs_NFV-SOL005v020501p.pdf
+
 basePath: /nsd/v1
+
 schemes:
   - http
   - https
+
 consumes:
   - application/json
+
 produces:
   - application/json
+
 paths:
   ###############################################################################
   # API Versions                                                                #
@@ -408,6 +414,8 @@ paths:
           $ref: "../responses/SOL005_resp.yaml#/responses/406"
         409:
           description: >
+            409 CONFLICT
+
             Error: The operation cannot be executed currently, due to a conflict with the state of the resource.
             Typically, this is due to an operational state mismatch, i.e. enable an already enabled or disable
             an already disabled individual NS descriptor resource, or the "nsdOnboardingState" is not ONBOARDED.
@@ -445,7 +453,7 @@ paths:
       responses:
         204:
           description: >
-            204 No Content
+            204 NO CONTENT
 
             The operation has completed successfully.
             The response body shall be empty.
@@ -478,6 +486,8 @@ paths:
           $ref: "../responses/SOL005_resp.yaml#/responses/406"
         409:
           description: >
+            409 CONFLICT
+
             Error: The operation cannot be executed currently, due to a conflict with the state of the resource.
             Typically, this is due to the fact the NS descriptor resource is in the enabled operational state
             (i.e. operationalState = ENABLED) or there are running NS instances using the concerned individual
@@ -589,6 +599,8 @@ paths:
               minimum: 1
         206:
           description: >
+            206 PARTIAL CONTENT
+
             On success, if the NFVO supports range requests, a single consecutive byte range from the content
             of the NSD file is returned.
             The response body shall contain the requested part of the NSD file.
@@ -609,6 +621,8 @@ paths:
           $ref: "../responses/SOL005_resp.yaml#/responses/406"
         409:
           description: >
+            409 CONFLICT
+
             Error: The operation cannot be executed currently, due to a conflict with the state of the resource.
             Typically, this is due to the fact "nsdOnboardingState" has a value different from ONBOARDED.
             The response body shall contain a ProblemDetails structure, in which the "detail" attribute shall
@@ -616,6 +630,8 @@ paths:
           $ref: "../responses/SOL005_resp.yaml#/responses/409"
         416:
           description: >
+            416 RANGE NOT SATISFIABLE
+
             The byte range passed in the "Range" header did not match any available byte range in the NSD file
             (e.g. "access after end of file").
             The response body may contain a ProblemDetails structure.
@@ -694,6 +710,21 @@ paths:
 
             The NSD content was successfully uploaded and validated (synchronous mode). 
             The response body shall be empty.
+          headers:
+            WWW-Authenticate:
+              type: string
+              description: >
+                Challenge if the corresponding HTTP request has not provided
+                authorization, or error details if the corresponding HTTP request
+                has provided an invalid authorization token.
+              maximum: 1
+              minimum: 0
+            Version:
+              description: >
+                Version of the API used in the response.
+              type: string
+              maximum: 1
+              minimum: 1
         400:
           $ref: "../responses/SOL005_resp.yaml#/responses/400"
         401:
@@ -708,6 +739,8 @@ paths:
           $ref: "../responses/SOL005_resp.yaml#/responses/406"
         409:
           description: >
+            409 CONFLICT
+
             Error: The operation cannot be executed currently, due to a conflict with the state of the resource.
             Typically, this is due to the fact that the NsdOnboardingState has a value other than CREATED.
             The response body shall contain a ProblemDetails structure, in which the "detail" attribute shall
@@ -1116,6 +1149,21 @@ paths:
 
             The operation has completed successfully.
             The response body shall be empty.
+          headers:
+            WWW-Authenticate:
+              type: string
+              description: >
+                Challenge if the corresponding HTTP request has not provided
+                authorization, or error details if the corresponding HTTP request
+                has provided an invalid authorization token.
+              maximum: 1
+              minimum: 0
+            Version:
+              description: >
+                Version of the API used in the response.
+              type: string
+              maximum: 1
+              minimum: 1
         400:
           $ref: "../responses/SOL005_resp.yaml#/responses/400"
         401:
@@ -1217,6 +1265,8 @@ paths:
           $ref: "../responses/SOL005_resp.yaml#/responses/406"
         409:
           description: >
+            409 CONFLICT
+
             Error: The operation cannot be executed currently, due to a conflict with the state of the resource.
             Typically, this is due to the fact pnfdOnboardingState has a value different from ONBOARDED.
             The response body shall contain a ProblemDetails structure, in which the "detail" attribute
@@ -1249,6 +1299,21 @@ paths:
 
             The PNFD content was successfully uploaded and validated. 
             The response body shall be empty.
+          headers:
+            WWW-Authenticate:
+              type: string
+              description: >
+                Challenge if the corresponding HTTP request has not provided
+                authorization, or error details if the corresponding HTTP request
+                has provided an invalid authorization token.
+              maximum: 1
+              minimum: 0
+            Version:
+              description: >
+                Version of the API used in the response.
+              type: string
+              maximum: 1
+              minimum: 1
         400:
           $ref: "../responses/SOL005_resp.yaml#/responses/400"
         401:
@@ -1263,8 +1328,9 @@ paths:
           $ref: "../responses/SOL005_resp.yaml#/responses/406"
         409:
           description: >
-            Error: The operation cannot be executed currently, due to a conflict with the state of the resource.
+            409 CONFLICT
 
+            Error: The operation cannot be executed currently, due to a conflict with the state of the resource.
             Typically, this is due to the fact that the PnfdOnboardingState has a value other than CREATED.
             The response body shall contain a ProblemDetails structure, in which the "detail" attribute shall
             convey more information about the error.
@@ -1370,6 +1436,8 @@ paths:
               minimum: 1
         303:
           description: >
+            303 SEE OTHER
+
             A subscription with the same callbackURI and the same filter already exits and the policy of the NFVO
             is to not create redundant subscriptions.
             The HTTP response shall include a "Location" HTTP header that contains the resource URI of the existing
@@ -1617,6 +1685,21 @@ paths:
 
             The subscription resource was deleted successfully.
             The response body shall be empty.
+          headers:
+            WWW-Authenticate:
+              type: string
+              description: >
+                Challenge if the corresponding HTTP request has not provided
+                authorization, or error details if the corresponding HTTP request
+                has provided an invalid authorization token.
+              maximum: 1
+              minimum: 0
+            Version:
+              description: >
+                Version of the API used in the response.
+              type: string
+              maximum: 1
+              minimum: 1
         400:
           $ref: "../responses/SOL005_resp.yaml#/responses/400"
         401:
diff --git a/src/SOL005/NSDManagement/definitions/SOL005NSDescriptorManagement_def.yaml b/src/SOL005/NSDManagement/definitions/SOL005NSDescriptorManagement_def.yaml
index ecd44fb17b15294d791ddf9c845a6f97b701afd8..336caacd80e9274ac04fd8103cfebf82597faaea 100644
--- a/src/SOL005/NSDManagement/definitions/SOL005NSDescriptorManagement_def.yaml
+++ b/src/SOL005/NSDManagement/definitions/SOL005NSDescriptorManagement_def.yaml
@@ -1,5 +1,6 @@
 # Copyright (c) ETSI 2017.
 # https://forge.etsi.org/etsi-forge-copyright-notice.txt
+
 definitions:
   NsdInfoModifications:
     type: object
diff --git a/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml b/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml
index ec968cd67fd3dfb495270f6022385f3dba01c46a..c2ce4a7608868633e950f65c30ce4bf124116baa 100644
--- a/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml
+++ b/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml
@@ -1,7 +1,7 @@
 swagger: "2.0"
 
 info:
-  version: "1.1.0"
+  version: "1.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
   title: SOL005 - NSD Management Notification interface
   description: >
     SOL005 - NSD Management Notification interface
@@ -30,9 +30,9 @@ produces:
 
 paths:
   ###############################################################################
-  # Notification endpoint NSDManagement                                         #
+  # Notification endpoint NsdOnBoardingNotification                             #
   ###############################################################################
-  '/URI_is_provided_by_the_client_when_creating_the_subscription-NsdOnBoardingNotification':
+  '/URI_is_provided_by_the_client_when_creating_the_subscription_NsdOnBoardingNotification':
     parameters:
       - name: Authorization
         description: >
@@ -177,8 +177,10 @@ paths:
         503:
           $ref: "../responses/SOL005_resp.yaml#/responses/503"
 
-  '/URI_is_provided_by_the_client_when_creating_the_subscription-NsdOnBoardingFailureNotification':
-    #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.10
+  ###############################################################################
+  # Notification endpoint NsdOnBoardingFailureNotification                      #
+  ###############################################################################
+  '/URI_is_provided_by_the_client_when_creating_the_subscription_NsdOnBoardingFailureNotification':
     parameters:
       - name: Authorization
         description: >
@@ -323,8 +325,10 @@ paths:
         503:
           $ref: "../responses/SOL005_resp.yaml#/responses/503"
 
-  '/URI_is_provided_by_the_client_when_creating_the_subscription-NsdChangeNotification':
-    #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.10
+  ###############################################################################
+  # Notification endpoint NsdChangeNotification                                 #
+  ###############################################################################
+  '/URI_is_provided_by_the_client_when_creating_the_subscription_NsdChangeNotification':
     parameters:
       - name: Authorization
         description: >
@@ -469,8 +473,10 @@ paths:
         503:
           $ref: "../responses/SOL005_resp.yaml#/responses/503"
 
-  '/URI_is_provided_by_the_client_when_creating_the_subscription-NsdDeletionNotification':
-    #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.10
+  ###############################################################################
+  # Notification endpoint NsdDeletionNotification                               #
+  ###############################################################################
+  '/URI_is_provided_by_the_client_when_creating_the_subscription_NsdDeletionNotification':
     parameters:
       - name: Authorization
         description: >
@@ -615,8 +621,10 @@ paths:
         503:
           $ref: "../responses/SOL005_resp.yaml#/responses/503"
 
-  '/URI_is_provided_by_the_client_when_creating_the_subscription-PnfdOnBoardingNotification':
-    #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.10
+  ###############################################################################
+  # Notification endpoint PnfdOnBoardingNotification                            #
+  ###############################################################################
+  '/URI_is_provided_by_the_client_when_creating_the_subscription_PnfdOnBoardingNotification':
     parameters:
       - name: Authorization
         description: >
@@ -668,7 +676,7 @@ paths:
       responses:
         204:
           description: >
-            204 No Content
+            204 NO CONTENT
 
             The notification was delivered successfully.
           headers:
@@ -761,8 +769,10 @@ paths:
         503:
           $ref: "../responses/SOL005_resp.yaml#/responses/503"
 
-  '/URI_is_provided_by_the_client_when_creating_the_subscription-PnfdOnBoardingFailureNotification':
-    #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.10
+  ###############################################################################
+  # Notification endpoint PnfdOnBoardingFailureNotification                     #
+  ###############################################################################
+  '/URI_is_provided_by_the_client_when_creating_the_subscription_PnfdOnBoardingFailureNotification':
     parameters:
       - name: Authorization
         description: >
@@ -907,8 +917,10 @@ paths:
         503:
           $ref: "../responses/SOL005_resp.yaml#/responses/503"
 
-  '/URI_is_provided_by_the_client_when_creating_the_subscription-PnfdDeletionNotification':
-    #ETSI GS NFV-SOL 005 V2.4.1 location: 5.4.10
+  ###############################################################################
+  # Notification endpoint PnfdDeletionNotification                              #
+  ###############################################################################
+  '/URI_is_provided_by_the_client_when_creating_the_subscription_PnfdDeletionNotification':
     parameters:
       - name: Authorization
         description: >
@@ -960,7 +972,7 @@ paths:
       responses:
         204:
           description: >
-            204 No Content
+            204 NO CONTENT
 
             The notification was delivered successfully.
           headers:
@@ -1051,4 +1063,4 @@ paths:
         500:
           $ref: "../responses/SOL005_resp.yaml#/responses/500"
         503:
-          $ref: "../responses/SOL005_resp.yaml#/responses/503"
+          $ref: "../responses/SOL005_resp.yaml#/responses/503"
\ No newline at end of file
diff --git a/src/SOL005/NSFaultManagement/NSFaultManagement.yaml b/src/SOL005/NSFaultManagement/NSFaultManagement.yaml
index 9da8d3bc7320587e90dff1f49e1e9298da318917..c835424fb3854efcd0408f971eae3f0bdcb9fd8e 100644
--- a/src/SOL005/NSFaultManagement/NSFaultManagement.yaml
+++ b/src/SOL005/NSFaultManagement/NSFaultManagement.yaml
@@ -1,7 +1,7 @@
 swagger: "2.0"
 
 info:
-  version: "1.1.0"
+  version: "1.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
   title: "SOL005 - NS Fault Management Interface"
   description: >
     SOL005 - NS Fault Management Interface
diff --git a/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml b/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml
index a1c54956971db7b3c7d96b9eb8037ffd02fb4845..a5732c72692f85d61a04ab3894a73f82c788f57b 100644
--- a/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml
+++ b/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml
@@ -1,7 +1,7 @@
 swagger: "2.0"
 
 info:
-  version: "1.1.0"
+  version: "1.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
   title: "SOL005 - NS Fault Management Notification interface"
   description: >
     SOL005 - NS Fault Management Notification interface
diff --git a/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml b/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml
index 22f637a2af13f5d71cd2ffade5d1e0af0e3f419a..4bf0b068a6cb2fad970b8fe58b8b4484f8db3b5b 100644
--- a/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml
+++ b/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml
@@ -1,6 +1,6 @@
 swagger: "2.0"
 info:
-  version: "1.1.0"
+  version: "1.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
   title: "SOL005 - NS Lifecycle Management Interface"
   description: >
     SOL005 - NS Lifecycle Management Interface
diff --git a/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml b/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml
index 036a27ecf11ad19110d77250d6b623f775ae538d..25f98f797d078da10117919e872a145b04907365 100644
--- a/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml
+++ b/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml
@@ -1,7 +1,7 @@
 swagger: "2.0"
 
 info:
-  version: "1.1.0"
+  version: "1.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
   title: "SOL005 - NS Lifecycle Management Notification interface"
   description: >
     SOL005 - NS Lifecycle Management Notification interface
diff --git a/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml b/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml
index c01b86b1165e614fc55c79b370eab1e9c474d6ee..9dbdae32109bc08f7beacdd8dfb9b2068433ddfc 100644
--- a/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml
+++ b/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml
@@ -1,7 +1,7 @@
 swagger: "2.0"
 
 info:
-  version: "1.1.0"
+  version: "1.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
   title: "SOL005 - NS Performance Management Interface"
   description: >
     SOL005 - NS Performance Management Interface
@@ -15,17 +15,23 @@ info:
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
   contact:
     name: "NFV-SOL WG"
+
 externalDocs:
   description: ETSI GS NFV-SOL 005 V2.5.1
   url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/02.05.01_60/gs_NFV-SOL005v020501p.pdf
+
 basePath: /nspm/v1
+
 schemes:
   - http
   - https
+
 consumes:
   - application/json
+
 produces:
   - application/json
+
 paths:
   ###############################################################################
   # API Versions                                                                #
@@ -771,7 +777,7 @@ paths:
       responses:
         204:
           description: >
-            204 No Content
+            204 NO CONTENT
 
             The threshold was deleted successfully.
             The response body shall be empty.
diff --git a/src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerformanceManagement_def.yaml b/src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerformanceManagement_def.yaml
index cbf41d071bb317f33cee92b1d0c8361a3875f014..6035136d145be10244b7a7fedb5a80c48ba0866b 100644
--- a/src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerformanceManagement_def.yaml
+++ b/src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerformanceManagement_def.yaml
@@ -1,5 +1,6 @@
 # Copyright (c) ETSI 2017.
 # https://forge.etsi.org/etsi-forge-copyright-notice.txt
+
 definitions:
   PmSubscriptionRequest:
     description: >
diff --git a/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml b/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml
index 0cb0476b6810a42415ea7720500cac54168d6f15..4bb1943baa16477ec11ac1bd6e64a75805825967 100644
--- a/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml
+++ b/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml
@@ -1,7 +1,7 @@
 swagger: "2.0"
 
 info:
-  version: "1.1.0"
+  version: "1.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
   title: "SOL005 - NS Performance Management Notification interface"
   description: >
     SOL005 - NS Performance Management Notification interface
@@ -25,13 +25,15 @@ schemes:
 
 consumes:
   - application/json
+
 produces:
   - application/json
+
 paths:
   ##################################################################################
-  # Notification endpoint NS Performance Management                                #
+  # Notification endpoint PerformanceInformationAvailableNotification              #
   ##################################################################################
-  '/URI_is_provided_by_the_client_when_creating_the_subscription-PerformanceInformationAvailableNotification':
+  '/URI_is_provided_by_the_client_when_creating_the_subscription_PerformanceInformationAvailableNotificatio':
     parameters:
       - name: Authorization
         description: >
@@ -53,7 +55,6 @@ paths:
         The POST method delivers a notification regarding a performance management event from the server to the client.
         This method shall follow the provisions specified in the
         Tables 7.4.9.3.1-1 and 7.4.9.3.1-2 for URI query parameters,
-
       parameters:
         - name: PerformanceInformationAvailableNotification
           description: >
@@ -133,7 +134,7 @@ paths:
       responses:
         204:
           description: >
-            204 No Content
+            204 NO CONTENT
 
             The notification endpoint was tested successfully.
             The response body shall be empty.
@@ -169,12 +170,15 @@ paths:
         503:
           $ref: "../responses/SOL005_resp.yaml#/responses/503"
 
-  '/URI_is_provided_by_the_client_when_creating_the_subscription-ThresholdCrossedNotification':
+  ##################################################################################
+  # Notification endpoint ThresholdCrossedNotification                             #
+  ##################################################################################
+  '/URI_is_provided_by_the_client_when_creating_the_subscription_ThresholdCrossedNotification':
     parameters:
       - name: Authorization
         description: >
           The authorization token for the request.
-          Reference: IETF RFC 7235.
+          Reference: IETF RFC 7235
         in: header
         required: false
         type: string
@@ -191,7 +195,6 @@ paths:
         The POST method delivers a notification regarding a performance management event from the server to the client.
         This method shall follow the provisions specified in the
         Tables 7.4.9.3.1-1 and 7.4.9.3.1-2 for URI query parameters,
-
       parameters:
         - name: ThresholdCrossedNotification
           description: >
@@ -210,7 +213,7 @@ paths:
         - name: Content-Type
           description: >
             The MIME type of the body of the request.
-            Reference: IETF RFC 7231.
+            Reference: IETF RFC 7231
           in: header
           required: true
           type: string
@@ -271,7 +274,7 @@ paths:
       responses:
         204:
           description: >
-            204 No Content
+            204 NO CONTENT
 
             The notification endpoint was tested successfully.
             The response body shall be empty.
diff --git a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml
index 71c0da27857f72f37bbcdf0005e9f5b461a535e3..e4659a086e6f321d0e4e709110aa00147844ec3a 100644
--- a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml
+++ b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml
@@ -1,7 +1,7 @@
 swagger: "2.0"
 
 info:
-  version: "1.1.0"
+  version: "1.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
   title: SOL005 - VNF Package Management Interface
   description: >
     SOL005 - VNF Package Management Interface
diff --git a/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml b/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml
index c53a7f4e97e74b3ca8c031d65edced2eae75b0d0..898bc350804ad6781e0d9be7518963b6b48cfa95 100644
--- a/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml
+++ b/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml
@@ -1,6 +1,6 @@
 swagger: "2.0"
 info:
-  version: "1.1.0"
+  version: "1.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
   title: "SOL005 - VNF Package Management Notification interface"
   description: >
     SOL005 - VNF Package Management Notification interface
diff --git a/src/SOL005/responses/SOL005_resp.yaml b/src/SOL005/responses/SOL005_resp.yaml
index d7ec415f796488b63d71fdb545948651da9734ff..01037719ae46263bac0d687a51219007850699b2 100644
--- a/src/SOL005/responses/SOL005_resp.yaml
+++ b/src/SOL005/responses/SOL005_resp.yaml
@@ -38,7 +38,8 @@ responses:
         maximum: 1
         minimum: 1
     schema:
-      $ref: "../../NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml#/definitions/NsInstance"
+      $ref: "../NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml#/definitions/NsInstance"
+
   202-with-Location-empty:
     description: >
       202 ACCEPTED
@@ -180,6 +181,7 @@ responses:
   401:
     description: >
       401 UNAUTHORIZED
+
       If the request contains no access token even though one is required, or if the request contains an authorization
       token that is invalid (e.g. expired or revoked), the API producer should respond with this response.
       The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750
@@ -210,6 +212,7 @@ responses:
   403:
     description: >
       403 FORBIDDEN
+
       If the API consumer is not allowed to perform a particular request to a particular resource,
       the API producer shall respond with this response code. The "ProblemDetails" structure shall be provided.
       It should include in the "detail" attribute information about the source of the problem,
@@ -240,6 +243,7 @@ responses:
   404:
     description: >
       404 NOT FOUND
+
       If the API producer did not find a current representation for the resource addressed by the URI passed
       in the request or is not willing to disclose that one exists, it shall respond with this response code.
       The "ProblemDetails" structure may be provided, including in the "detail" attribute information about
@@ -275,6 +279,7 @@ responses:
   405:
     description: >
       405 METHOD NOT ALLOWED
+
       If a particular HTTP method is not supported for a particular resource, the API producer shall respond
       with this response code. The "ProblemDetails" structure may be omitted.
     headers:
@@ -303,6 +308,7 @@ responses:
   406:
     description: >
       406 NOT ACCEPTABLE
+
       If the "Accept" header does not contain at least one name of a content type that is acceptable
       to the API producer, the API producer shall respond with this response code.
       The "ProblemDetails" structure may be omitted.
@@ -329,284 +335,9 @@ responses:
     schema:
       $ref: "../definitions/SOL005_def.yaml#/definitions/ProblemDetails"
 
-  406-state-conflict:
-    description: >
-      Error: The operation cannot be executed currently,
-      due to a conflict with the state of the resource.
-      Typically, this is due to the fact that
-      "onboardingState" of the VNF package has a value
-      different from "ONBOARDED".
-      The response body shall contain a ProblemDetails
-      structure, in which the "detail" attribute shall convey
-      more information about the error.
-    headers:
-      Content-Type:
-        description: The MIME type of the body of the response.
-        type: string
-        maximum: 1
-        minimum: 1
-      WWW-Authenticate:
-        description: >
-          Challenge if the corresponding HTTP request has not provided
-          authorization, or error details if the corresponding HTTP
-          request has provided an invalid authorization token.
-        type: string
-        maximum: 1
-        minimum: 0
-      Version:
-        description: >
-          Version of the API used in the response.
-        type: string
-        maximum: 1
-        minimum: 1
-    schema:
-      $ref: "../definitions/SOL005_def.yaml#/definitions/ProblemDetails"
-
   409:
     description: >
       409 CONFLICT
-
-      Error: The operation cannot be executed
-      currently, due to a conflict with the state of
-      the resource.
-      Typically, this is due to any of the following
-      scenarios:
-      - Disable a VNF package resource of
-      hich the operational state is not
-      ENABLED
-      - Enable a VNF package resource of
-      which the operational state is not
-      DISABLED
-      The response body shall contain a
-      ProblemDetails structure, in which the
-      "detail" attribute shall convey more
-      information about the error.
-    headers:
-      Content-Type:
-        description: The MIME type of the body of the response.
-        type: string
-        maximum: 1
-        minimum: 1
-      WWW-Authenticate:
-        description: >
-          Challenge if the corresponding HTTP request has not provided
-          authorization, or error details if the corresponding HTTP
-          request has provided an invalid authorization token.
-        type: string
-        maximum: 1
-        minimum: 0
-      Version:
-        description: >
-          Version of the API used in the response.
-        type: string
-        maximum: 1
-        minimum: 1
-    schema:
-      $ref: "../definitions/SOL005_def.yaml#/definitions/ProblemDetails"
-
-  409-another-nsd-operation-ongoing:
-    description: >
-      409 CONFLICT
-
-      The operation cannot be executed currently, due to a conflict with the
-      state of the NS instance resource.
-      Typically, this is due to the fact that another Descriptor operation is
-      ongoing.
-      The response body shall contain a ProblemDetails structure, in which the
-      "detail" attribute should convey more information about the error.
-    headers:
-      Content-Type:
-        description: The MIME type of the body of the response.
-        type: string
-        maximum: 1
-        minimum: 1
-      WWW-Authenticate:
-        description: >
-          Challenge if the corresponding HTTP request has not provided
-          authorization, or error details if the corresponding HTTP
-          request has provided an invalid authorization token.
-        type: string
-        maximum: 1
-        minimum: 0
-      Version:
-        description: >
-          Version of the API used in the response.
-        type: string
-        maximum: 1
-        minimum: 1
-    schema:
-      $ref: "../definitions/SOL005_def.yaml#/definitions/ProblemDetails"
-  409-inconsistent-state:
-    description: >
-      409 CONFLICT
-
-      Another request is in progress that prohibits the fulfilment of
-      the current request, or the current resource state is inconsistent
-      with the request.
-    headers:
-      Content-Type:
-        description: The MIME type of the body of the response.
-        type: string
-        maximum: 1
-        minimum: 1
-      WWW-Authenticate:
-        description: >
-          Challenge if the corresponding HTTP request has not provided
-          authorization, or error details if the corresponding HTTP
-          request has provided an invalid authorization token.
-        type: string
-        maximum: 1
-        minimum: 0
-      Version:
-        description: >
-          Version of the API used in the response.
-        type: string
-        maximum: 1
-        minimum: 1
-    schema:
-      $ref: "../definitions/SOL005_def.yaml#/definitions/ProblemDetails"
-  409-state-conflict-INSTANTIATED:
-    description: >
-      409 CONFLICT
-
-      The operation cannot be executed currently, due to a conflict with the
-      state of the NS instance resource.
-      Typically, this is due to the fact that the NS instance resource is in
-      INSTANTIATED state.
-      The response body shall contain a ProblemDetails structure, in which the
-      "detail" attribute should convey more information about the error.
-    headers:
-      Content-Type:
-        description: The MIME type of the body of the response.
-        type: string
-        maximum: 1
-        minimum: 1
-      WWW-Authenticate:
-        description: >
-          Challenge if the corresponding HTTP request has not provided
-          authorization, or error details if the corresponding HTTP
-          request has provided an invalid authorization token.
-        type: string
-        maximum: 1
-        minimum: 0
-      Version:
-        description: >
-          Version of the API used in the response.
-        type: string
-        maximum: 1
-        minimum: 1        
-    schema:
-      $ref: "../definitions/SOL005_def.yaml#/definitions/ProblemDetails"
-  409-state-conflict-not-FAILED_TEMP:
-    description: >
-      409 CONFLICT
-
-      The operation cannot be executed currently, due to a conflict with the
-      state of the NS instance resource.
-      Typically, this is due to the fact that the NS instance resource is
-      not in FAILED_TEMP state, or another error handling action is starting,
-      such as rollback or fail.
-      The response body shall contain a ProblemDetails structure, in which the
-      "detail" attribute should convey more information about the error.
-    headers:
-      Content-Type:
-        description: The MIME type of the body of the response.
-        type: string
-        maximum: 1
-        minimum: 1
-      WWW-Authenticate:
-        description: >
-          Challenge if the corresponding HTTP request has not provided
-          authorization, or error details if the corresponding HTTP
-          request has provided an invalid authorization token.
-        type: string
-        maximum: 1
-        minimum: 0
-      Version:
-        description: >
-          Version of the API used in the response.
-        type: string
-        maximum: 1
-        minimum: 1
-    schema:
-      $ref: "../definitions/SOL005_def.yaml#/definitions/ProblemDetails"
-  409-state-conflict-NOT-INSTANTIATED:
-    description: >
-      409 CONFLICT
-
-      The operation cannot be executed currently, due to a conflict with the
-      state of the NS instance resource.
-      Typically, this is due to the fact that the NS instance resource is in
-      NOT-INSTANTIATED state, or that another lifecycle management operation
-      is ongoing.
-      The response body shall contain a ProblemDetails structure, in which the
-      "detail" attribute should convey more information about the error.
-    headers:
-      Content-Type:
-        description: The MIME type of the body of the response.
-        type: string
-        maximum: 1
-        minimum: 1
-      WWW-Authenticate:
-        description: >
-          Challenge if the corresponding HTTP request has not provided
-          authorization, or error details if the corresponding HTTP
-          request has provided an invalid authorization token.
-        type: string
-        maximum: 1
-        minimum: 0
-      Version:
-        description: >
-          Version of the API used in the response.
-        type: string
-        maximum: 1
-        minimum: 1
-    schema:
-      $ref: "../definitions/SOL005_def.yaml#/definitions/ProblemDetails"
-  409-state-conflict-ONBOARDING:
-    description: >
-      409 CONFLICT
-
-      Error: The operation cannot be executed currently,
-      due to a conflict with the state of the resource.
-      Typically, this is due to the fact that "onboardingState"
-      of the VNF package has a value different from "ONBOARDED".
-      The response body shall contain a ProblemDetails
-      structure, in which the "detail" attribute shall convey
-      more information about the error.
-    headers:
-      Content-Type:
-        description: The MIME type of the body of the response.
-        type: string
-        maximum: 1
-        minimum: 1
-      WWW-Authenticate:
-        description: >
-          Challenge if the corresponding HTTP request has not provided
-          authorization, or error details if the corresponding HTTP
-          request has provided an invalid authorization token.
-        type: string
-        maximum: 1
-        minimum: 0
-      Version:
-        description: >
-          Version of the API used in the response.
-        type: string
-        maximum: 1
-        minimum: 1
-    schema:
-      $ref: "../definitions/SOL005_def.yaml#/definitions/ProblemDetails"
-  409-state-conflict-ONBOARDING-NOT-CREATED:
-    description: >
-      409 CONFLICT
-
-      Error: The operation cannot be executed currently,
-      due to a conflict with the state of the resource.
-      Typically, this is due to the fact that the on boarding
-      state of the VNF package resource is not CREATED .
-      The response body shall contain a ProblemDetails
-      structure, in which the "detail" attribute shall convey
-      more information about the error.
     headers:
       Content-Type:
         description: The MIME type of the body of the response.
@@ -664,6 +395,7 @@ responses:
   413:
     description: >
       413 PAYLOAD TOO LARGE
+
       If the payload body of a request is larger than the amount of data the API producer is willing or able to process,
       it shall respond with this response code, following the provisions in IETF RFC 7231 for the use
       of the "Retry-After" HTTP header and for closing the connection. The "ProblemDetails" structure may be omitted.
@@ -693,6 +425,7 @@ responses:
   414:
     description: >
       414 URI TOO LONG
+
       If the request URI of a request is longer than the API producer is willing or able to process,
       it shall respond with this response code. This condition can e.g. be caused by passing long queries
       in the request URI of a GET request. The "ProblemDetails" structure may be omitted.
@@ -748,6 +481,7 @@ responses:
   422:
     description: >
       422 UNPROCESSABLE ENTITY
+
       If the payload body of a request contains syntactically correct data (e.g. well-formed JSON) but the data
       cannot be processed (e.g. because it fails validation against a schema), the API producer shall respond
       with this response code. The "ProblemDetails" structure shall be provided, and should include in the "detail"
@@ -780,6 +514,7 @@ responses:
   429:
     description: >
       429 TOO MANY REQUESTS
+
       If the API consumer has sent too many requests in a defined period of time and the API producer is able
       to detect that condition ("rate limiting"), the API producer shall respond with this response code,
       following the provisions in IETF RFC 6585 [17] for the use of the "Retry-After" HTTP header.
@@ -814,6 +549,7 @@ responses:
   500:
     description: >
       500 INTERNAL SERVER ERROR
+
       If there is an application error not related to the client's input that cannot be easily mapped to any other
       HTTP response code ("catch all error"), the API producer shall respond with this response code.
       The "ProblemDetails" structure shall be provided, and shall include in the "detail" attribute more information
@@ -844,6 +580,7 @@ responses:
   503:
     description: >
       503 SERVICE UNAVAILABLE
+
       If the API producer encounters an internal overload situation of itself or of a system it relies on,
       it should respond with this response code, following the provisions in IETF RFC 7231 for the use of
       the "Retry-After" HTTP header and for the alternative to refuse the connection. The "ProblemDetails"
@@ -874,6 +611,7 @@ responses:
   504:
     description: >
       504 GATEWAY TIMEOUT
+
       If the API producer encounters a timeout while waiting for a response from an upstream server
       (i.e. a server that the API producer communicates with when fulfilling a request), it should respond
       with this response code.