diff --git a/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml b/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml
index c1dabb7515fe47dc1fbd8cad458a505603ab4793..deaa4594c01c30148625f5f03b06a06a3974d0ff 100644
--- a/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml
+++ b/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml
@@ -1,6 +1,6 @@
 swagger: "2.0"
 info:
-  version: "1.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
+  version: "1.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:2"
   title: "SOL005 - NS Lifecycle Management Interface"
   description: >
     SOL005 - NS Lifecycle Management Interface
diff --git a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml
index 30f35a382a1d2a2ba27b50c19e51c7225e527bbf..63f923adb64cb9ff62fa8504d4fdb44e06fce2dc 100644
--- a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml
+++ b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml
@@ -759,9 +759,7 @@ definitions:
           Identifiers of the CP instances attached to the
           constituent VNFs and PNFs or the SAP instances of the
           VNFFG. See note.
-        type: array
-        items:
-          $ref: "#/definitions/NsCpHandle"
+        $ref: "#/definitions/NsCpHandle"
 
   NfpInfo:
     description: >
@@ -800,7 +798,7 @@ definitions:
         type: array
         minItems: 1
         items:
-          $ref: "#/definitions/NsCpHandle"
+          $ref: "#/definitions/CpGroupInfo"
       totalCp:
         description: >
           Total number of CP and SAP instances in this NFP instance.
@@ -1588,9 +1586,7 @@ definitions:
           sapInfo item in the NS instance.
           There shall be at most one link port associated with any
           connection point instance.
-        type: array
-        items:
-          $ref: "#/definitions/NsCpHandle"
+        $ref: "#/definitions/NsCpHandle"
 
   AffinityOrAntiAffinityRule:
     description: >
@@ -2825,58 +2821,6 @@ definitions:
         items:
           $ref: "#/definitions/PnfExtCpData"
 
-  AffectedVirtualLink:
-    description: >
-      This type provides information about added, deleted, modified and
-      temporary VLs.
-    type: object
-    required:
-      - id
-      - virtualLinkDescId
-      - changeType
-      - networkResource
-    properties:
-      id:
-        description: >
-          Identifier of the virtual link instance, identifying the applicable
-          "vnfVirtualLinkResourceInfo" entry in the "VnfInstance" data type.
-        $ref: "#/definitions/IdentifierInVnf"
-      virtualLinkDescId:
-        description: >
-          Identifier of the related VLD in the VNFD.
-        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
-      changeType:
-        description: >
-          Signals the type of change. Permitted values:
-          * ADDED
-          * REMOVED
-          * MODIFIED
-          * TEMPORARY
-          * LINK_PORT_ADDED
-          * LINK_PORT_REMOVED
-          For a temporary resource, an AffectedVirtualLink structure exists as
-          long as the temporary resource exists.
-        type: string
-        enum:
-          - ADDED
-          - REMOVED
-          - MODIFIED
-          - TEMPORARY
-          - LINK_PORT_ADDED
-          - LINK_PORT_REMOVED
-      networkResource:
-        description: >
-          Reference to the VirtualNetwork resource. Detailed information is
-          (for new and modified resources) or has been (for removed
-          resources) available from the VIM.
-        $ref: "../../definitions/SOL005_def.yaml#/definitions/ResourceHandle"
-      metadata:
-        description: >
-          Metadata about this resource.
-          The content of this attribute shall be a copy of the content of the
-          "metadata" attribute of the VnfVirtualLinkResourceInfo structure.
-        $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs"
-
   AffectedVirtualStorage:
     description: >
       This type provides information about added, deleted, modified and
@@ -3076,7 +3020,7 @@ definitions:
           - ROLLED_BACK
           - FAILED
 
-  AffectedVl:
+  AffectedVirtualLink:
     description: >
       This type provides information about added, deleted and modified VLs. 
       It shall comply with the provisions in Table 6.5.3.4-1.