diff --git a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml
index e52f38bd1d703a27a2a805ba1986f99e43a19fa6..de3ae9da2fe1cb25641523c82fe049657e31c02a 100644
--- a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml
+++ b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml
@@ -2070,26 +2070,36 @@ definitions:
         description: >
           Identifier of the NFP to be modified. It shall be present
           for modified NFPs and shall be absent for the new NFP.
+          It shall be present for modified NFPs and shall be absent 
+          for the new NFP.
         $ref: "SOL005_def.yaml#/definitions/IdentifierInNs"
       nfpName:
         description: >
           Human readable name for the NFP. It shall be present
           for the new NFP, and it may be present otherwise.
+          It shall be present for the new NFP, and it may be 
+          present otherwise.
         type: string
       description:
         description: >
           Human readable description for the NFP. It shall be
           present for the new NFP, and it may be present otherwise.
+          It shall be present for the new NFP, and it may be 
+          present otherwise.
         type: string
-      nsCpHandle:
+      cpGroup:
         description: >
-          Identifier(s) of the CPs and SAPs which the NFP passes by.
+          Group(s) of CPs and/or SAPs which the NFP passes by.
           Cardinality can be 0 if only updated or newly created
           NFP classification and selection rule which applied to an
           existing NFP is provided.
+          At least a CP or an nfpRule shall be present.
+          When multiple identifiers are included, the position of 
+          the identifier in the cpGroup value specifies the position 
+          of the group in the path.
         type: array
         items:
-          $ref: "#/definitions/NsCpHandle"
+          $ref: "#/definitions/CpGroupInfo"
       nfpRule:
         description: >
           NFP classification and selection rule. See note 1.