diff --git a/src/SOL002/VNFConfiguration/VNFConfiguration.yaml b/src/SOL002/VNFConfiguration/VNFConfiguration.yaml
index 0732d9bf7f17e4dcc2249eb8f5d0cddd5c17cd13..b92967a6c266e5a2adf9220e3dce985dd1c44a6d 100644
--- a/src/SOL002/VNFConfiguration/VNFConfiguration.yaml
+++ b/src/SOL002/VNFConfiguration/VNFConfiguration.yaml
@@ -2,14 +2,15 @@ swagger: "2.0"
 
 info: 
   version: "1.1.1"
-  title: DRAFT - SOL002 - VNF Configuration interface
+  title: SOL002 - VNF Configuration interface
   description: >
-    DRAFT VNF Configuration interface of ETSI NFV SOL002
+    VNF Configuration interface of ETSI NFV SOL002
+
 
     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.
+    version of the ETSI Group Specification it refers to. 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&list_id=61&product=NFV&resolution=---
   license:
diff --git a/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml
index 79c12c376feec115b366477c8a15e6f04f21a520..8d7b06aea5a8730d5b682707836273d032abdab4 100644
--- a/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml
+++ b/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml
@@ -2,14 +2,15 @@ swagger: "2.0"
 
 info: 
   version: "1.1.1"
-  title: DRAFT - SOL002 - VNF Configuration interface
+  title: SOL002 - VNF Configuration interface
   description: >
-    DRAFT VNF Configuration interface of ETSI NFV SOL002
+    VNF Configuration interface of ETSI NFV SOL002
+
 
     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.
+    version of the ETSI Group Specification it refers to. 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&list_id=61&product=NFV&resolution=---
   
diff --git a/src/SOL002/VNFIndicator/VNFIndicator.yaml b/src/SOL002/VNFIndicator/VNFIndicator.yaml
index c98c28c91499861d3ece9a6e3b261524a49b0025..168c818edfe1e8881e6477da79e1612d4c89bde1 100644
--- a/src/SOL002/VNFIndicator/VNFIndicator.yaml
+++ b/src/SOL002/VNFIndicator/VNFIndicator.yaml
@@ -3,17 +3,18 @@ swagger: "2.0"
 
 info: 
   version: "1.1.1"
-  title: "DRAFT - SOL002 - VNF Indicator interface"
+  title: "SOL002 - VNF Indicator interface"
   description: >
-    DRAFT VNF Indicator interface of ETSI NFV SOL002.
+    VNF Indicator interface of ETSI NFV SOL002.
     
     This API allows the EM/VNF to provide information on value changes of VNF related indicators. 
     VNF related indicators are declared in the VNFD.
-    
+
+
     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.
+    version of the ETSI Group Specification it refers to. 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
   
diff --git a/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml b/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml
index 806b8114de37dab0c500204b5bbe7956c0523678..8d6814cc0a762e615ea5280a2cf6df06446b6b5c 100644
--- a/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml
+++ b/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml
@@ -2,14 +2,15 @@ swagger: "2.0"
 
 info: 
   version: "1.1.1"
-  title: "DRAFT - SOL002 - VNF Indicator Notification Endpoint interface"
+  title: "SOL002 - VNF Indicator Notification Endpoint interface"
   description: >
-    DRAFT VNF Indicator Notification Endpoint interface of ETSI NFV SOL002
+    VNF Indicator Notification Endpoint interface of ETSI NFV SOL002
+
 
     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.
+    version of the ETSI Group Specification it refers to. 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&list_id=61&product=NFV&resolution=---
   
diff --git a/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml
index 7750d7aa029a9414f2c03075d2e40ec9dc08d07a..a840bbb4769891d689f31cad3868190f420d1b86 100644
--- a/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml
+++ b/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml
@@ -2,14 +2,15 @@ swagger: "2.0"
 
 info: 
   version: "1.1.1"
-  title: "DRAFT - SOL002 - VNF Configuration interface"
+  title: "SOL002 - VNF Configuration interface"
   description: >
-    DRAFT VNF Configuration interface of ETSI NFV SOL002
+    VNF Configuration interface of ETSI NFV SOL002
+
 
     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.
+    version of the ETSI Group Specification it refers to. 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&list_id=61&product=NFV&resolution=---
   license:
@@ -396,165 +397,6 @@ paths:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500"
         503:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"
-    get:
-      description: >
-        Information about an individual VNF instance was queried successfully.
-      parameters:
-        - name: vnfInstanceId
-          description: >
-            Identifier of the VNF instance. This identifier can be retrieved from
-            the resource referenced by the "Location" HTTP header in the response
-            to a POST request creating a new VNF instance resource. It can also
-            be retrieved from the "id" attribute in the payload body of that
-            response.
-          in: path
-          type: string
-          required: true
-      responses:
-        200:
-          description: > 
-            OK
-
-            Information about zero or more VNF instances was queried
-            successfully. The response body shall contain
-            representations of zero or more VNF instances.
-          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
-          schema:
-            $ref: "definitions/VNFLifecycleManagement_def.yaml#/definitions/VnfInstance"
-        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/404"
-        406:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/406"
-        409:
-          $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/409-inconsistent-state"
-        416:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/416"
-        500:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500"
-        503:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"
-    patch:
-      #SOL003 location: 5.4.3.3.4
-      description: >
-        This method modifies an individual VNF instance resource. Changes to
-        the VNF configurable properties are applied to the configuration in
-        the VNF instance, and are reflected in the representation of this
-        resource. Other changes are applied to the VNF instance information
-        managed by the VNFM, and are reflected in the representation of this
-        resource
-      parameters:
-        - name: vnfInfoModifications
-          description: Input parameters for VNF info modification
-          required: true
-          in: body
-          schema:
-            $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfInfoModifications"
-        - name: vnfInstanceId
-          description: >
-            Identifier of the VNF instance. This identifier can be retrieved from
-            the resource referenced by the "Location" HTTP header in the response
-            to a POST request creating a new VNF instance resource. It can also
-            be retrieved from the "id" attribute in the payload body of that
-            response.
-          in: path
-          type: string
-          required: true
-      responses:
-        202:
-          $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location"
-        400:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400-attr-selector"
-        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/404"
-        406:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/406"
-        409:
-          $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/409-inconsistent-state"
-        412:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/412"
-        500:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500"
-        503:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"
-    delete:
-      #SOL003 location: 5.4.3.3.5
-      description: >
-        This method deletes an individual VNF instance resource.
-      parameters: 
-        - name: vnfInstanceId
-          description: >
-            Identifier of the VNF instance. This identifier can be retrieved from
-            the resource referenced by the "Location" HTTP header in the response
-            to a POST request creating a new VNF instance resource. It can also
-            be retrieved from the "id" attribute in the payload body of that
-            response.
-          in: path
-          type: string
-          required: true
-      responses:
-        204:
-          description: > 
-            No Content
-
-            The VNF instance resource and the associated VNF identifier were
-            deleted successfully.
-            The response body shall be empty.
-          headers:
-            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
-        400:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400-attr-selector"
-        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/404"
-        406:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/406"
-        409:
-          $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/409-inconsistent-state"
-        412:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/412"
-        500:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500"
-        503:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"
 ###############################################################################
 # Scale VNF task                                                              #
 ###############################################################################
diff --git a/src/SOL002/VNFLifecycleManagement/definitions/VNFLifecycleManagement_def.yaml b/src/SOL002/VNFLifecycleManagement/definitions/VNFLifecycleManagement_def.yaml
index 35e34777a5bf8e415994d01ae889af947f92ebcd..57789274791505480f390d358024ad3c285e73c2 100644
--- a/src/SOL002/VNFLifecycleManagement/definitions/VNFLifecycleManagement_def.yaml
+++ b/src/SOL002/VNFLifecycleManagement/definitions/VNFLifecycleManagement_def.yaml
@@ -576,7 +576,7 @@ definitions:
           notifications this subscription relates to. A particular
           notification is sent to the subscriber if the filter matches, or if
           there is no filter.
-        $ref: "#/definitions/LifecycleChangeNotificationsFilter"
+        $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LifecycleChangeNotificationsFilter"
       callbackUri:
         description: >
           The URI of the endpoint to send the notification to.
@@ -607,7 +607,7 @@ definitions:
           notifications this subscription relates to. A particular
           notification is sent to the subscriber if the filter matches, or if
           there is no filter.
-        $ref: "#/definitions/LifecycleChangeNotificationsFilter"
+        $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LifecycleChangeNotificationsFilter"
       callbackUri:
         description: >
           The URI of the endpoint to send the notification to.
@@ -642,58 +642,6 @@ definitions:
       - ROLLING_BACK
       - ROLLED_BACK
 
-  LifecycleChangeNotificationsFilter:
-    description: >
-      This type represents a subscription filter related to notifications
-      about VNF lifecycle changes.
-      At a particular nesting level in the filter structure, the following
-      applies: All attributes shall match in order for the filter to match
-      (logical "and" between different filter attributes). If an attribute is
-      an array, the attribute shall match if at least one of the values in
-      the array matches (logical "or" between the values of one filter
-      attribute).
-    type: object
-    properties:
-      vnfInstanceSubscriptionFilter:
-        description: >
-          Filter criteria to select VNF instances about which to notify.
-        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VnfInstanceSubscriptionFilter"
-      notificationTypes:
-        description: >
-          Match particular notification types.
-          Permitted values:
-          * VnfLcmOperationOccurrenceNotification
-          * VnfIdentifierCreationNotification
-          * VnfIdentifierDeletionNotification
-          The permitted values of the "notificationTypes" attribute are
-          spelled exactly as the names of the notification types to
-          facilitate automated code generation systems.
-        type: string
-        enum:
-          - VnfLcmOperationOccurrenceNotification
-          - VnfIdentifierCreationNotification
-          - VnfIdentifierDeletionNotification
-      operationTypes:
-        description: >
-          Match particular VNF lifecycle operation types for the notification
-          of type VnfLcmOperationOccurrenceNotification.
-          May be present if the "notificationTypes" attribute contains the
-          value "VnfLcmOperationOccurrenceNotification", and shall be absent
-          otherwise.
-        type: array
-        items: 
-          $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/LcmOperationType"
-      operationStates:
-        description: >
-          Match particular LCM operation state values as reported in
-          notifications of type VnfLcmOperationOccurrenceNotification.
-          May be present if the "notificationTypes" attribute contains the
-          value "VnfLcmOperationOccurrenceNotification", and shall be absent
-          otherwise.
-        type: array
-        items: 
-          $ref: "#/definitions/LcmOperationStateType"
-
   NetworkAddressInfo:
     description: >
       This type represents information about a network address that has been assigned.
diff --git a/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml b/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml
index af192e54c380bebb90e21b74da05b30cb17508c0..c817856313cd777d8a2078e7a921ce2c2955d737 100644
--- a/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml
+++ b/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml
@@ -2,14 +2,15 @@ swagger: "2.0"
 
 info: 
   version: "1.1.1"
-  title: "DRAFT - SOL002 - VNF Configuration interface"
+  title: "SOL002 - VNF Configuration interface"
   description: >
-    DRAFT VNF Configuration interface of ETSI NFV SOL002
+    VNF Configuration interface of ETSI NFV SOL002
+
 
     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.
+    version of the ETSI Group Specification it refers to. 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&list_id=61&product=NFV&resolution=---
 
diff --git a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml
index 7f53c668bc8a7d398a1b3821ea1b332fa215b187..6bac2e1ab441c9b0740c44f7af2dd736686d818c 100644
--- a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml
+++ b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml
@@ -2,14 +2,15 @@ swagger: "2.0"
 
 info:
   version: "1.1.1"
-  title: DRAFT - SOL003 - VNF Fault Management interface
+  title: SOL003 - VNF Fault Management interface
   description: >
-    DRAFT - SOL003 - VNF Fault Management interface
+    SOL003 - VNF Fault Management 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.
+    version of the ETSI Group Specification it refers to. In case of
+    discrepancies the published ETSI Group Specification takes precedence.
+
     
     In clause 4.3.2 of ETSI GS NFV-SOL 003 v2.4.1, an attribute-based
     filtering mechanism is defined. This mechanism is currently not
diff --git a/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml b/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml
index c3322b0a6e0803a83bb8142eac42bc28cdac7438..013de2429138686acfc93df5a20d2f96a827c81b 100644
--- a/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml
+++ b/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml
@@ -2,14 +2,15 @@ swagger: "2.0"
 
 info:
   version: "1.1.1"
-  title: DRAFT - SOL003 - VNF Fault Management Notification interface
+  title: SOL003 - VNF Fault Management Notification interface
   description: >
-    DRAFT - SOL003 - VNF Fault Management Notification interface
+    SOL003 - VNF Fault Management Notification 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.
+    version of the ETSI Group Specification it refers to. In case of
+    discrepancies the published ETSI Group Specification takes precedence.
+
     
     In clause 4.3.2 of ETSI GS NFV-SOL 003 v2.4.1, an attribute-based
     filtering mechanism is defined. This mechanism is currently not
diff --git a/src/SOL003/VNFIndicator/VNFIndicator.yaml b/src/SOL003/VNFIndicator/VNFIndicator.yaml
index 2087dc67d81f6731bcc6502115a3b02fdd756b0a..355eb1a426ce337fd27b8c0ab2045ea106121699 100644
--- a/src/SOL003/VNFIndicator/VNFIndicator.yaml
+++ b/src/SOL003/VNFIndicator/VNFIndicator.yaml
@@ -2,13 +2,15 @@ swagger: "2.0"
 
 info:
   version: "1.1.1"
-  title: DRAFT - SOL003 - VNF Indicator interface
+  title: SOL003 - VNF Indicator interface
   description: >
-    DRAFT - SOL003 - VNF Indicator interface
+    SOL003 - VNF Indicator 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.
+    version of the ETSI Group Specification it refers to. In case of
+    discrepancies the published ETSI Group Specification takes precedence.
+
     
     In clause 4.3.2 of ETSI GS NFV-SOL 003 v2.4.1, an attribute-based
     filtering mechanism is defined. This mechanism is currently not
diff --git a/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml b/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml
index 2bafe43ad7d82bef1491887e0624430f12991b68..e12cb9f9ba15c892405659beff0acf35295af436 100644
--- a/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml
+++ b/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml
@@ -2,14 +2,15 @@ swagger: "2.0"
 
 info:
   version: "1.1.1"
-  title: DRAFT - SOL003 - VNF Indicator Notification interface
+  title: SOL003 - VNF Indicator Notification interface
   description: >
-    DRAFT - SOL003 - VNF Indicator Notification interface
-    
+    SOL003 - VNF Indicator Notification 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.
+    version of the ETSI Group Specification it refers to. In case of
+    discrepancies the published ETSI Group Specification takes precedence.
+
     
     In clause 4.3.2 of ETSI GS NFV-SOL 003 v2.4.1, an attribute-based
     filtering mechanism is defined. This mechanism is currently not
diff --git a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml
index 57fdbbf2676bd465a31b03202231370ff97f57df..7c5239887dfb485785d35faae7fc2482bfa880f8 100644
--- a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml
+++ b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml
@@ -2,14 +2,15 @@ swagger: "2.0"
 
 info:
   version: "1.1.1"
-  title: DRAFT - SOL003 - VNF Lifecycle Management interface
+  title: SOL003 - VNF Lifecycle Management interface
   description: >
-    DRAFT - SOL003 - VNF Lifecycle Management interface definition
+    SOL003 - VNF Lifecycle Management interface definition
+
 
     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.
+    version of the ETSI Group Specification it refers to. In case of
+    discrepancies the published ETSI Group Specification takes precedence.
+
     
     In clause 4.3.2 of ETSI GS NFV-SOL 003 v2.4.1, an attribute-based
     filtering mechanism is defined. This mechanism is currently not
@@ -240,7 +241,7 @@ paths:
           required: true
           in: body
           schema:
-            $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/VnfInfoModificationRequest"
+            $ref: "../definitions/SOL003_def.yaml#/definitions/VnfInfoModificationRequest"
         - name: Content-Type
           description: >
             The Content-Type header shall be set to
@@ -332,21 +333,21 @@ paths:
           schema:
             $ref: "definitions/VNFLifecycleManagement_def.yaml#/definitions/InstantiateVnfRequest"
       responses:
-        200:
+        202:
           description: > 
-            OK
+            Accepted
 
-            Information about zero or more VNF instances was queried
-            successfully. The response body shall contain
-            representations of zero or more VNF instances.
+            The request was accepted for processing, but the  processing has
+            not been completed.
+            The response body shall be empty.
+            The HTTP response shall include a "Location" HTTP header that
+            contains the URI of the newly-created "VNF LCM operation
+            occurrence" resource corresponding to the operation.
           headers:
-            Content-Type:
-              description: The MIME type of the body of the response.
+            Location:
+              description: The resource URI of the created VNF instance
               type: string
-              maximum: 1
-              minimum: 1
-          schema:
-            $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfInstance"
+              format: url
         400:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"
         401:
@@ -367,148 +368,6 @@ paths:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500"
         503:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"
-    get:
-      description: >
-        Information about an individual VNF instance was queried successfully.
-      parameters:
-        - name: vnfInstanceId
-          description: >
-            Identifier of the VNF instance. This identifier can be retrieved from
-            the resource referenced by the "Location" HTTP header in the response
-            to a POST request creating a new VNF instance resource. It can also
-            be retrieved from the "id" attribute in the payload body of that
-            response.
-          in: path
-          type: string
-          required: true
-      responses:
-        200:
-          description: > 
-            OK
-
-            Information about zero or more VNF instances was queried
-            successfully. The response body shall contain
-            representations of zero or more VNF instances.
-          headers:
-            Content-Type:
-              description: The MIME type of the body of the response.
-              type: string
-              maximum: 1
-              minimum: 1
-          schema:
-            $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfInstance"
-        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/404"
-        406:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/406"
-        409:
-          $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/409-inconsistent-state"
-        416:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/416"
-        500:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500"
-        503:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"
-    patch:
-      #SOL003 location: 5.4.3.3.4
-      description: >
-        This method modifies an individual VNF instance resource. Changes to
-        the VNF configurable properties are applied to the configuration in
-        the VNF instance, and are reflected in the representation of this
-        resource. Other changes are applied to the VNF instance information
-        managed by the VNFM, and are reflected in the representation of this
-        resource
-      parameters:
-        - name: VnfInfoModificationRequest
-          description: Input parameters for VNF info modification
-          required: true
-          in: body
-          schema:
-            $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/VnfInfoModificationRequest"
-        - name: vnfInstanceId
-          description: >
-            Identifier of the VNF instance. This identifier can be retrieved from
-            the resource referenced by the "Location" HTTP header in the response
-            to a POST request creating a new VNF instance resource. It can also
-            be retrieved from the "id" attribute in the payload body of that
-            response.
-          in: path
-          type: string
-          required: true
-      responses:
-        202:
-          $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location"
-        400:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400-attr-selector"
-        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/404"
-        406:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/406"
-        409:
-          $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/409-inconsistent-state"
-        412:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/412"
-        500:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500"
-        503:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"
-    delete:
-      #SOL003 location: 5.4.3.3.5
-      description: >
-        This method deletes an individual VNF instance resource.
-      parameters: 
-        - name: vnfInstanceId
-          description: >
-            Identifier of the VNF instance. This identifier can be retrieved from
-            the resource referenced by the "Location" HTTP header in the response
-            to a POST request creating a new VNF instance resource. It can also
-            be retrieved from the "id" attribute in the payload body of that
-            response.
-          in: path
-          type: string
-          required: true
-      responses:
-        204:
-          description: > 
-            No Content
-
-            The VNF instance resource and the associated VNF identifier were
-            deleted successfully.
-            The response body shall be empty.
-        400:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400-attr-selector"
-        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/404"
-        406:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/406"
-        409:
-          $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/409-inconsistent-state"
-        412:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/412"
-        500:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500"
-        503:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"
 ###############################################################################
 # Scale VNF task                                                              #
 ###############################################################################
diff --git a/src/SOL003/VNFLifecycleManagement/definitions/VNFLifecycleManagement_def.yaml b/src/SOL003/VNFLifecycleManagement/definitions/VNFLifecycleManagement_def.yaml
index 89893befe2fde7497822cd5df160091266a18145..54710f2ad9a6d2f9708b301d932af0f5aef9db07 100644
--- a/src/SOL003/VNFLifecycleManagement/definitions/VNFLifecycleManagement_def.yaml
+++ b/src/SOL003/VNFLifecycleManagement/definitions/VNFLifecycleManagement_def.yaml
@@ -185,96 +185,6 @@ definitions:
           "InstantiateVnfOpConfig".
         $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
 
-  LccnLinks:
-    description: >
-      This type represents the links to resources that a notification can
-      contain.
-    type: object
-    required: 
-      - vnfInstance
-      - subscription
-    properties: 
-      vnfInstance:
-        description: >
-          Link to the resource representing the VNF instance to which the
-          notified change applies.
-        $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/Link"
-      subscription:
-        description: >
-          Link to the related subscription.
-        $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/Link"
-      vnfLcmOpOcc:
-        description: >
-          Link to the VNF lifecycle management operation occurrence that this
-          notification is related to. Shall be present if there is a related
-          lifecycle operation occurrence.
-        $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/Link"
-
-  LccnSubscription:
-    description: >
-      This type represents a subscription related to notifications about VNF
-      lifecycle changes.
-    type: object
-    required:
-      - id
-      - callbackUri
-      - _links
-    properties:
-      id:
-        description: >
-          Identifier of this subscription resource.
-        $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
-      filter:
-        description: >
-          Filter settings for this subscription, to define the subset of all
-          notifications this subscription relates to. A particular
-          notification is sent to the subscriber if the filter matches, or if
-          there is no filter.
-        $ref: "#/definitions/LifecycleChangeNotificationsFilter"
-      callbackUri:
-        description: >
-          The URI of the endpoint to send the notification to.
-        $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/Uri"
-      _links:
-        description: >
-          Links to resources related to this resource.
-        type: object
-        required:
-          - self
-        properties:
-          self:
-            description: >
-              URI of this resource.
-            $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/Uri"
-
-  LccnSubscriptionRequest:
-    description: >
-      This type represents a subscription request related to notifications
-      about VNF lifecycle changes.
-    type: object
-    required:
-      - callbackUri
-    properties:
-      filter: 
-        description: >
-          Filter settings for this subscription, to define the subset of all
-          notifications this subscription relates to. A particular
-          notification is sent to the subscriber if the filter matches, or if
-          there is no filter.
-        $ref: "#/definitions/LifecycleChangeNotificationsFilter"
-      callbackUri:
-        description: >
-          The URI of the endpoint to send the notification to.
-        $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/Uri"
-      authentication:
-        description: >
-          Authentication parameters to configure the use of Authorization when
-          sending notifications corresponding to this subscription, as defined
-          in clause 4.5.3.4.
-          This attribute shall only be present if the subscriber requires
-          authorization of notifications.
-        $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication"
-
   LcmOperationStateType:
     description: >
       Value | Description
@@ -296,58 +206,6 @@ definitions:
       - ROLLING_BACK
       - ROLLED_BACK
 
-  LifecycleChangeNotificationsFilter:
-    description: >
-      This type represents a subscription filter related to notifications
-      about VNF lifecycle changes.
-      At a particular nesting level in the filter structure, the following
-      applies: All attributes shall match in order for the filter to match
-      (logical "and" between different filter attributes). If an attribute is
-      an array, the attribute shall match if at least one of the values in
-      the array matches (logical "or" between the values of one filter
-      attribute).
-    type: object
-    properties:
-      vnfInstanceSubscriptionFilter:
-        description: >
-          Filter criteria to select VNF instances about which to notify.
-        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VnfInstanceSubscriptionFilter"
-      notificationTypes:
-        description: >
-          Match particular notification types.
-          Permitted values:
-          * VnfLcmOperationOccurrenceNotification
-          * VnfIdentifierCreationNotification
-          * VnfIdentifierDeletionNotification
-          The permitted values of the "notificationTypes" attribute are
-          spelled exactly as the names of the notification types to
-          facilitate automated code generation systems.
-        type: string
-        enum:
-          - VnfLcmOperationOccurrenceNotification
-          - VnfIdentifierCreationNotification
-          - VnfIdentifierDeletionNotification
-      operationTypes:
-        description: >
-          Match particular VNF lifecycle operation types for the notification
-          of type VnfLcmOperationOccurrenceNotification.
-          May be present if the "notificationTypes" attribute contains the
-          value "VnfLcmOperationOccurrenceNotification", and shall be absent
-          otherwise.
-        type: array
-        items: 
-          $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/LcmOperationType"
-      operationStates:
-        description: >
-          Match particular LCM operation state values as reported in
-          notifications of type VnfLcmOperationOccurrenceNotification.
-          May be present if the "notificationTypes" attribute contains the
-          value "VnfLcmOperationOccurrenceNotification", and shall be absent
-          otherwise.
-        type: array
-        items: 
-          $ref: "#/definitions/LcmOperationStateType"
-
   OperateVnfRequest:
     description: >
       This type represents request parameters for the "Operate VNF" operation.
@@ -396,58 +254,6 @@ definitions:
           declared in the VNFD as part of "OperateVnfOpConfig".
         $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
 
-  ScaleInfo:
-    required:
-      - aspectId
-      - scaleLevel
-    type: object
-    properties:
-      aspectId:
-        description: >
-          Identifier of the scaling aspect.
-        $ref: "#/definitions/IdentifierInVnfd"
-      scaleLevel:
-        description: >
-          Indicates the scale level. The minimum value shall be 0 and the
-          maximum value shall be <= maxScaleLevel as described in the VNFD.
-        type: integer
-
-  ScaleVnfRequest:
-    type: object
-    required:
-      - type
-      - aspectId
-    properties:
-      type:
-        description: >
-          Indicates the type of the scale operation requested.
-          Permitted values:
-          * SCALE_OUT: adding additional VNFC instances to the VNF to increase
-            capacity
-          * SCALE_IN: removing VNFC instances from the VNF in order to release
-            unused capacity.
-        type: string
-        enum: 
-          - SCALE_OUT
-          - SCALE_IN
-      aspectId:
-        description: >
-          Identifier of the scaling aspect.
-        $ref: "#/definitions/IdentifierInVnfd"
-      numberOfSteps:
-        description: >
-          Number of scaling steps to be executed as part of this Scale VNF
-          operation. It shall be a positive number and the default value
-          shall be 1.
-        type: integer
-        default: 1
-      additionalParams:
-        description: >
-          Additional parameters passed by the NFVO as input to the scaling
-          process, specific to the VNF being scaled, as declared in the VNFD
-          as part of "ScaleVnfOpConfig".
-        $ref: "#/definitions/KeyValuePairs"
-  
   ScaleVnfToLevelRequest:
     description: >
       This type represents request parameters for the "Scale VNF to Level"
@@ -716,10 +522,3 @@ definitions:
               for this VNF LCM operation occurrence, if declaring as failed is
               currently allowed.
             $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link"
-
-  VnfOperationalStateType:
-    type: string
-    enum:
-      - STARTED
-      - STOPPED
-      - ERROR
diff --git a/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml b/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml
index dde7ce58fe1a852a9be70737d21b4eb9cb5b76f4..607dcff6805e218bd1a5e4319e12e0690f03925e 100644
--- a/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml
+++ b/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml
@@ -2,14 +2,15 @@ swagger: "2.0"
 
 info:
   version: "1.1.1"
-  title: DRAFT - SOL003 - VNF Lifecycle Management Notification interface
+  title: SOL003 - VNF Lifecycle Management Notification interface
   description: >
-    DRAFT - SOL003 - VNF Lifecycle Management Notification interface
+    SOL003 - VNF Lifecycle Management Notification 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.
+    version of the ETSI Group Specification it refers to. In case of
+    discrepancies the published ETSI Group Specification takes precedence.
+
     
     In clause 4.3.2 of ETSI GS NFV-SOL 003 v2.4.1, an attribute-based
     filtering mechanism is defined. This mechanism is currently not
diff --git a/src/SOL003/VNFLifecycleManagementNotification/definitions/VNFLifecycleManagementNotification_def.yaml b/src/SOL003/VNFLifecycleManagementNotification/definitions/VNFLifecycleManagementNotification_def.yaml
index 35c4845399e4113843d2cfd577efb9aee2030b56..ff7f255c7c4772b2c526c50f596df47056365f8c 100644
--- a/src/SOL003/VNFLifecycleManagementNotification/definitions/VNFLifecycleManagementNotification_def.yaml
+++ b/src/SOL003/VNFLifecycleManagementNotification/definitions/VNFLifecycleManagementNotification_def.yaml
@@ -153,7 +153,7 @@ definitions:
           the operation has performed any changes to VNF instance information,
           including VNF configurable properties. 
           Shall be absent otherwise.
-        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VnfInfoModificationRequest"
+        $ref: "../../definitions/SOL003_def.yaml#/definitions/VnfInfoModificationRequest"
       changedExtConnectivity:
         description: >
           Information about changed external connectivity, if this
diff --git a/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml b/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml
index 25e4fac12826483c5469c0c47f64f06fcafa28a2..24f63f141978aee5e4c02815a2ccd19be6d1a0a0 100644
--- a/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml
+++ b/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml
@@ -2,14 +2,15 @@ swagger: "2.0"
 
 info:
   version: "1.1.1"
-  title: DRAFT - SOL003 - VNF Lifecycle Operation Granting interface
+  title: SOL003 - VNF Lifecycle Operation Granting interface
   description: >
-    DRAFT - SOL003 - VNF Lifecycle Operation Granting interface
+    SOL003 - VNF Lifecycle Operation Granting 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.
+    version of the ETSI Group Specification it refers to. In case of
+    discrepancies the published ETSI Group Specification takes precedence.
+
     
     In clause 4.3.2 of ETSI GS NFV-SOL 003 v2.4.1, an attribute-based
     filtering mechanism is defined. This mechanism is currently not
diff --git a/src/SOL003/VNFLifecycleOperationGranting/definitions/VNFLifecycleOperationGranting_def.yaml b/src/SOL003/VNFLifecycleOperationGranting/definitions/VNFLifecycleOperationGranting_def.yaml
index 73ed75d36cbb5036026094b830a7598e276c1af5..035719e32672845f0df3527130de36b0c8c04503 100644
--- a/src/SOL003/VNFLifecycleOperationGranting/definitions/VNFLifecycleOperationGranting_def.yaml
+++ b/src/SOL003/VNFLifecycleOperationGranting/definitions/VNFLifecycleOperationGranting_def.yaml
@@ -90,7 +90,9 @@ definitions:
           release, it is recommended in the present document that the number
           of entries in the "vims" attribute in the Grant is not greater than
           1.
-        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo"
+        type: array
+        items:
+          $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo"
       zones:
         description: >
           Identifies resource zones where the resources are approved to be
diff --git a/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml b/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml
index 44e156a0f93dbcb2a41a16bbcf9c79b9f6ecf59d..cae74123c42ef605edf4e6d0b88ace870461b86a 100644
--- a/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml
+++ b/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml
@@ -2,14 +2,15 @@ swagger: "2.0"
 
 info:
   version: "1.1.1"
-  title: DRAFT - SOL003 - VNF Package Management interface
+  title: SOL003 - VNF Package Management interface
   description: >
-    DRAFT - SOL003 - VNF Package Management interface
+    SOL003 - VNF Package Management 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.
+    version of the ETSI Group Specification it refers to. In case of
+    discrepancies the published ETSI Group Specification takes precedence.
+
     
     In clause 4.3.2 of ETSI GS NFV-SOL 003 v2.4.1, an attribute-based
     filtering mechanism is defined. This mechanism is currently not
diff --git a/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml b/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml
index 9be5c6a404a8a9afc8888f2130534ef93e185057..7043b294583de38252ffe49fe1cbb0d42c49d67f 100644
--- a/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml
+++ b/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml
@@ -2,14 +2,15 @@ swagger: "2.0"
 
 info:
   version: "1.1.1"
-  title: DRAFT - SOL003 - VNF Package Management Notification interface
+  title: SOL003 - VNF Package Management Notification interface
   description: >
-    DRAFT - SOL003 - VNF Package Management Notification interface
+    SOL003 - VNF Package Management Notification 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.
+    version of the ETSI Group Specification it refers to. In case of
+    discrepancies the published ETSI Group Specification takes precedence.
+
     
     In clause 4.3.2 of ETSI GS NFV-SOL 003 v2.4.1, an attribute-based
     filtering mechanism is defined. This mechanism is currently not
diff --git a/src/SOL003/VNFPackageManagementNotification/definitions/VNFPackageManagementNotification_def.yaml b/src/SOL003/VNFPackageManagementNotification/definitions/VNFPackageManagementNotification_def.yaml
index e7a01e06b6bf9ab10cd12ad1483a92a5da05e54c..8a7b061ed3f1740ae53f35203491d3f34ad19136 100644
--- a/src/SOL003/VNFPackageManagementNotification/definitions/VNFPackageManagementNotification_def.yaml
+++ b/src/SOL003/VNFPackageManagementNotification/definitions/VNFPackageManagementNotification_def.yaml
@@ -9,7 +9,6 @@ definitions:
     type: string
     enum: 
       - OP_STATE_CHANGE
-      - DELETE_PEND_CHANGE
       - PKG_DELETE
 
   PackageOperationalStateType:
diff --git a/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml b/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml
index 70bdd99320ecca297c9b69d1bd5a8fb65ec5b9cc..486450effd0db2696b1113aeec1098539a8b321a 100644
--- a/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml
+++ b/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml
@@ -2,14 +2,15 @@ swagger: "2.0"
 
 info:
   version: "1.1.1"
-  title: DRAFT - SOL003 - VNF Performance Management interface
+  title: SOL003 - VNF Performance Management interface
   description: >
-    DRAFT - SOL003 - VNF Performance Management interface
+    SOL003 - VNF Performance Management 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.
+    version of the ETSI Group Specification it refers to. In case of
+    discrepancies the published ETSI Group Specification takes precedence.
+
     
     In clause 4.3.2 of ETSI GS NFV-SOL 003 v2.4.1, an attribute-based
     filtering mechanism is defined. This mechanism is currently not
diff --git a/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml b/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml
index 23f2a00aae3ee1bb68e75086f26caccfaac4701d..17507ac345e0fe0b4e74e54fb02eb6bca7451df8 100644
--- a/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml
+++ b/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml
@@ -2,14 +2,15 @@ swagger: "2.0"
 
 info:
   version: "1.1.1"
-  title: DRAFT - SOL003 - VNF Performance Management Notification interface
+  title: SOL003 - VNF Performance Management Notification interface
   description: >
-    DRAFT - SOL003 - VNF Performance Management Notification interface
+    SOL003 - VNF Performance Management Notification 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.
+    version of the ETSI Group Specification it refers to. In case of
+    discrepancies the published ETSI Group Specification takes precedence.
+
     
     In clause 4.3.2 of ETSI GS NFV-SOL 003 v2.4.1, an attribute-based
     filtering mechanism is defined. This mechanism is currently not
diff --git a/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml b/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml
index 7d7cfee0bc19dcd698fd4ae538a3c6046ae7d1ab..e521c8b1df83ea2a21aa794bf92257c45186591f 100644
--- a/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml
+++ b/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml
@@ -2,14 +2,15 @@ swagger: "2.0"
 
 info:
   version: "1.1.1"
-  title: DRAFT - SOL003 - Virtualised Resources Quota Available Notification interface
+  title: SOL003 - Virtualised Resources Quota Available Notification interface
   description: >
-    DRAFT - SOL003 - Virtualised Resources Quota Available Notification interface 
+    SOL003 - Virtualised Resources Quota Available Notification 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.
+    version of the ETSI Group Specification it refers to. In case of
+    discrepancies the published ETSI Group Specification takes precedence.
+
     
     In clause 4.3.2 of ETSI GS NFV-SOL 003 v2.4.1, an attribute-based
     filtering mechanism is defined. This mechanism is currently not
diff --git a/src/SOL003/VirtualisedResourcesQuotaAvailableNotificationNotification/VirtualisedResourcesQuotaAvailableNotificationNotification.yaml b/src/SOL003/VirtualisedResourcesQuotaAvailableNotificationNotification/VirtualisedResourcesQuotaAvailableNotificationNotification.yaml
index 2c5a7622a2b63244e2a543d5a65edf8017c48060..5540f28a7f532fc885f26883978920ec08380da5 100644
--- a/src/SOL003/VirtualisedResourcesQuotaAvailableNotificationNotification/VirtualisedResourcesQuotaAvailableNotificationNotification.yaml
+++ b/src/SOL003/VirtualisedResourcesQuotaAvailableNotificationNotification/VirtualisedResourcesQuotaAvailableNotificationNotification.yaml
@@ -2,14 +2,15 @@ swagger: "2.0"
 
 info:
   version: "1.1.1"
-  title: DRAFT - SOL003 - Virtualised Resources Quota Available Notification Notification interface
+  title: SOL003 - Virtualised Resources Quota Available Notification Notification interface
   description: >
-    DRAFT - SOL003 - Virtualised Resources Quota Available Notification Notification interface
+    SOL003 - Virtualised Resources Quota Available Notification Notification 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.
+    version of the ETSI Group Specification it refers to. In case of
+    discrepancies the published ETSI Group Specification takes precedence.
+
     
     In clause 4.3.2 of ETSI GS NFV-SOL 003 v2.4.1, an attribute-based
     filtering mechanism is defined. This mechanism is currently not
diff --git a/src/SOL003/definitions/SOL003_def.yaml b/src/SOL003/definitions/SOL003_def.yaml
index 50307d9fe98e64eec914bb37719e58dfdfe8a71b..5e1cc0197ae58578b3632f41c63f83339c03153f 100644
--- a/src/SOL003/definitions/SOL003_def.yaml
+++ b/src/SOL003/definitions/SOL003_def.yaml
@@ -165,4 +165,52 @@ definitions:
             description: >
               Link to the related subscription.
             $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/Link"
+            
+  VnfInfoModificationRequest:
+    description: >
+      This type represents attribute modifications for an
+      "Individual VNF instance" resource, i.e. modifications to a resource
+      representation based on the "VnfInstance" data type.
+    type: object
+    properties:
+      vnfInstanceName:
+        description: >
+          New value of the "vnfInstanceName" attribute in "VnfInstance", or
+          "null" to remove the attribute.      
+        type: string
+      vnfInstanceDescription:
+        description: >
+          New value of the "vnfInstanceDescription" attribute in
+          "VnfInstance", or "null" to remove the attribute.  
+        type: string
+      vnfPkgId:
+        description: >
+          New value of the "vnfPkgId" attribute in "VnfInstance".
+          The value "null" is not permitted.  
+        $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
+      vnfConfigurableProperties:
+        description: >
+          Modifications of the "vnfConfigurableProperties" attribute in
+          "VnfInstance". If present, these modifications shall be applied
+          according to the rules of JSON Merge PATCH (see IETF RFC 7396).
+        $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
+      metadata:
+        description: >
+          Modifications of the "metadata" attribute in "VnfInstance". If
+          present, these modifications shall be applied according to the rules
+          of JSON Merge PATCH (see IETF RFC 7396).
+        $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
+      extensions:
+        description: >
+          Modifications of the "extensions" attribute in "VnfInstance". If
+          present, these modifications shall be applied according to the rules
+          of JSON Merge PATCH (see IETF RFC 7396).
+        $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
+      vimConnectionInfo:
+        description: >
+          New content of certain entries in the "vimConnectionInfo" attribute
+          array in "VnfInstance", as defined below this table.
+        type: array
+        items: 
+          $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo"
   
\ No newline at end of file
diff --git a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml
index 83b249b9167b43ab9e4a16ae16009ebbf89ffe62..797de94271591e830fe281d5f338f55bc1b85e32 100644
--- a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml
+++ b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml
@@ -222,9 +222,9 @@ definitions:
       extLinkPorts:
         description: >
           Link ports of this VL.
-          type: array
-          items:
-            $ref: "#/definitions/ExtLinkPortInfo"
+        type: array
+        items:
+          $ref: "#/definitions/ExtLinkPortInfo"
 
   IpOverEthernetAddressInfo:
     description: >
@@ -356,7 +356,7 @@ definitions:
           self:
             description: >
               URI of this resource.
-            $ref: "SOL002SOL003_def.yaml#/definitions/Uri"
+            $ref: "SOL002SOL003_def.yaml#/definitions/Link"
 
   LccnSubscriptionRequest:
     description: >
@@ -433,11 +433,13 @@ definitions:
           The permitted values of the "notificationTypes" attribute are
           spelled exactly as the names of the notification types to
           facilitate automated code generation systems.
-        type: string
-        enum:
-          - VnfLcmOperationOccurrenceNotification
-          - VnfIdentifierCreationNotification
-          - VnfIdentifierDeletionNotification
+        type: array
+        items:
+          type: string
+          enum:
+            - VnfLcmOperationOccurrenceNotification
+            - VnfIdentifierCreationNotification
+            - VnfIdentifierDeletionNotification
       operationTypes:
         description: >
           Match particular VNF lifecycle operation types for the notification
@@ -1213,7 +1215,6 @@ definitions:
     enum:
       - STARTED
       - STOPPED
-      - ERROR
 
   VnfVirtualLinkResourceInfo:
     description: >
diff --git a/src/definitions/SOL002SOL003_def.yaml b/src/definitions/SOL002SOL003_def.yaml
index abac310e3d2cc90ec51e6129bc924acfa204024f..743226cb2cdaa248bcf624dce59b4d4383b3f04c 100644
--- a/src/definitions/SOL002SOL003_def.yaml
+++ b/src/definitions/SOL002SOL003_def.yaml
@@ -711,52 +711,6 @@ definitions:
         items:
           $ref: "#/definitions/VnfExtCpConfig"
 
-  VnfInfoModificationRequest:
-    description: >
-      This type represents attribute modifications for an
-      "Individual VNF instance" resource, i.e. modifications to a resource
-      representation based on the "VnfInstance" data type.
-    type: object
-    properties:
-      vnfInstanceName:
-        description: >
-          New value of the "vnfInstanceName" attribute in "VnfInstance", or
-          "null" to remove the attribute.      
-        type: string
-      vnfInstanceDescription:
-        description: >
-          New value of the "vnfInstanceDescription" attribute in
-          "VnfInstance", or "null" to remove the attribute.  
-        type: string
-      vnfPkgId:
-        description: >
-          New value of the "vnfPkgId" attribute in "VnfInstance".
-          The value "null" is not permitted.  
-        $ref: "#/definitions/Identifier"
-      vnfConfigurableProperties:
-        description: >
-          Modifications of the "vnfConfigurableProperties" attribute in
-          "VnfInstance". If present, these modifications shall be applied
-          according to the rules of JSON Merge PATCH (see IETF RFC 7396).
-        $ref: "#/definitions/KeyValuePairs"
-      metadata:
-        description: >
-          Modifications of the "metadata" attribute in "VnfInstance". If
-          present, these modifications shall be applied according to the rules
-          of JSON Merge PATCH (see IETF RFC 7396).
-        $ref: "#/definitions/KeyValuePairs"
-      extensions:
-        description: >
-          Modifications of the "extensions" attribute in "VnfInstance". If
-          present, these modifications shall be applied according to the rules
-          of JSON Merge PATCH (see IETF RFC 7396).
-        $ref: "#/definitions/KeyValuePairs"
-      vimConnectionInfo:
-        description: >
-          New content of certain entries in the "vimConnectionInfo" attribute
-          array in "VnfInstance", as defined below this table.
-        $ref: "#/definitions/VimConnectionInfo"
-
   VnfInstanceSubscriptionFilter:
     description: >
       This type represents subscription filter criteria to match VNF