diff --git a/Readme.md b/Readme.md
index b87803ada9cace801b0a1764050d3c1216cb8449..34878d5f15dd2c527df0e38b664b3260dbb8796e 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,7 +1,7 @@
 # NFV SOL002 and SOL003 APIs
 
 This repository hosts the [OpenAPI](https://www.openapis.org/) specificatons and other documentation
-for the APIs defined in ETSI NFV GSs SOL002 and SOL003 v5.2.1.
+for the APIs defined in ETSI NFV GSs SOL002 and SOL003 v5.3.1.
 
 The APIs described in this repository are defined for the following reference points:
 
diff --git a/src/SOL002/APIVersion/APIVersion.yaml b/src/SOL002/APIVersion/APIVersion.yaml
index a792d68ac5c4a00975913aaa26db3337f3b88ce0..044016b25ff2f410d9ece81d802a9d9b306abfea 100644
--- a/src/SOL002/APIVersion/APIVersion.yaml
+++ b/src/SOL002/APIVersion/APIVersion.yaml
@@ -19,8 +19,8 @@ info:
   version: 1.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf
+  description: ETSI GS NFV-SOL 002 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.03.01_60/gs_NFV-SOL002v050301p.pdf
 
 paths:
   /vnfconfig/api_versions:
diff --git a/src/SOL002/General_Definitions/SOL002_def.yaml b/src/SOL002/General_Definitions/SOL002_def.yaml
index 531e8af14657932168524dd2512ce2fdc0d84d4f..ae8eeed8a3cf3d8851705ed95b7e567610ca434e 100644
--- a/src/SOL002/General_Definitions/SOL002_def.yaml
+++ b/src/SOL002/General_Definitions/SOL002_def.yaml
@@ -269,6 +269,11 @@ definitions:
         type: object
         additionalProperties:
           $ref: "#/definitions/Number"
+      cpuPowerStateRequirements:
+        description: >
+          Requirements of virtual CPU power state configuration data for the OS container resource.
+        $ref: "#/definitions/CpuPowerStateData"
+
   VirtualComputeDescData:
     description: >
       This type represents selected values for capacity related VDU attributes of the virtual compute resource of a VM.
@@ -318,6 +323,50 @@ definitions:
         type: object
         additionalProperties:
           $ref: "#/definitions/Number"
+      cpuPowerStateRequirements:
+        description: >
+          Requirements of virtual CPU power state configuration data for the virtual compute resource.
+        $ref: "#/definitions/CpuPowerStateData"
+
+  CpuPowerStateData:
+    description: >
+      This type provides virtual CPU power state configuration data for the virtual compute or OS container resource.
+
+      * NOTE 1: In case the value of the cpuPowerStateManagementPolicy attribute
+                is "DYNAMIC", dynamic adjustment of CPU power states of logical CPU cores
+                should adhere to the range of CPU P and C states defined in the
+                cpuOperationalPowerStates attribute.
+      * NOTE 2: In case the value of the cpuPowerStateManagementPolicy attribute
+                is "STATIC", the cpuOperationalPowerStates attribute shall contain only
+                one set of CPU P and C states requested for the virtual CPU.
+                If the value of the cpuPowerStateManagementPolicy attribute is
+                "DYNAMIC", multiple CPU P and C states can be defined to indicate the
+                range of allowed P/C state values during dynamic power state management.
+    type: object
+    required:
+      - cpuPowerStateManagementPolicy
+    properties:
+      cpuPowerStateManagementPolicy:
+        description: >
+          Indicates the policy for CPU power state management.
+          Permitted values:
+            * STATIC
+            * DYNAMIC
+          In case of "STATIC", the virtual CPU cores are requested to be
+          allocated to logical CPU cores according to the
+          cpuOperationalPowerStates attribute.
+          In case of "DYNAMIC", the CPU power states of virtual CPU cores
+          can be allocated to logical CPU cores whose power states can be
+          adjusted dynamically depending on core utilization (see note 1).
+        type: string
+        enum:
+          - STATIC
+          - DYNAMIC
+      cpuOperationalPowerStates:
+        description: >
+          Provides the list of operational power states (i.e. P and C states)
+          defined for the virtual CPU (see note 2).
+        $ref: "#/definitions/KeyValuePairs"
 
   VirtualStorageDescData:
     description: >
@@ -776,7 +825,19 @@ definitions:
         type: array
         items:
           $ref: "#/definitions/CpProtocolData"
-
+      cpSecurityGroupData:
+        description: >
+          Parameters for modifying and overriding security groups
+          information bound to this CP. The parameters identify
+          which "SecurityGroupRule" specified in the VNFD is
+          activated/deactivated and for an activated security group
+          rule the values of attributes defined in the VNFD that can
+          be overridden such as "portRangeMin" and "portRangeMax".
+          If no security group configuration is provided for a given
+          "SecurityGroupRule" specified in the VNFD as part of this
+          attribute, the VNFM shall use the configuration as specified
+          in the VNFD.
+        $ref: "#/definitions/CpSecurityGroupData"      
       netAttDefResourceId:
         description: >
           Identifier of the “NetAttDefResourceData” structure that
@@ -838,6 +899,36 @@ definitions:
           the fully qualified domain names.
         type: string
 
+  CpSecurityGroupData:
+    description: >
+      This type provides input parameters for modifying and overriding security groups.
+      The parameters identify which "SecurityGroupRule" specified in the VNFD is activated/deactivated
+      and for an activated security group rule the values of attributes defined in the VNFD that can be
+      overriden such as "portRangeMin" and "portRangeMax".
+    type: object
+    required:
+      - securityGroupRuleId
+    properties:
+      securityGroupRuleId:
+        description: >
+          Identifier of the security group rule policy in the VNFD.
+        $ref: "#/definitions/IdentifierInVnfd"
+      isActivated:
+        description: >
+          Indicates whether the rule is to be active (true) or inactive (false). If no attribute value
+          is provided, the Security Group Rule is activated by default.
+        type: boolean
+      portRangeMin:
+        description: >
+          Value for the minimum port number in the range that is matched by the security group rule.
+          The value shall be within the range "0 - 65535".
+        type: integer
+      portRangeMax:
+        description: >
+          Value for the maximum port number in the range that is matched by the security group rule.
+          The value shall be within the range "0 - 65535".
+        type: integer
+
   IpOverEthernetAddressData:
     description: >
       This type represents network address data for IP over Ethernet.
@@ -1501,32 +1592,6 @@ definitions:
       Representation: string of variable length.
     type: string
 
-  Checksum: #no definition found
-    description: >
-      Cheksum description
-    type: string
-
-########################################################################################################################
-# TO CHECK IF INCLUDE THESE DATA TYPES IN ANOTHER DEF FILES
-
-  VnfLinkPortData:
-    description: >
-      This type represents an externally provided link port to be used to connect a VNFC connection point 
-      to an exernally managed VL.
-    type: object
-    required:
-    - vnfLinkPortId
-    - resourceHandle
-    properties:
-      vnfLinkPortId:
-        description: >
-          Identifier of this link port as provided by the entity that has created the link port.
-        $ref: "#/definitions/Identifier"
-      resourceHandle:
-        description: >
-          Resource handle of the virtualised resource that realizes the link port.
-        $ref: "#/definitions/ResourceHandle"
-
   ExtLinkPortData:
     description: >
       This type represents an externally provided link port to be used to
@@ -1855,4 +1920,4 @@ definitions:
       - MODIFY_INFO
       - CREATE_SNAPSHOT
       - REVERT_TO_SNAPSHOT
-      - CHANGE_VNFPKG
\ No newline at end of file
+      - CHANGE_VNFPKG
diff --git a/src/SOL002/VNFConfiguration/VNFConfiguration.yaml b/src/SOL002/VNFConfiguration/VNFConfiguration.yaml
index 9d1c851b199a077a9284cc24b62fc179682264db..9a3b4d4d6955dd6b7aa37018ac2cad6e6d1f0d75 100644
--- a/src/SOL002/VNFConfiguration/VNFConfiguration.yaml
+++ b/src/SOL002/VNFConfiguration/VNFConfiguration.yaml
@@ -19,8 +19,8 @@ info:
   version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf
+  description: ETSI GS NFV-SOL 002 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.03.01_60/gs_NFV-SOL002v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/vnfconfig/v1
@@ -89,8 +89,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
         "412":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/412
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
diff --git a/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml
index 6c5037c292409fd2a1c15e5b82557b89f3c451cb..370fa975996a34520566c2e74cbaa4a99ce356c2 100644
--- a/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml
+++ b/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml
@@ -19,8 +19,8 @@ info:
   version: 1.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf
+  description: ETSI GS NFV-SOL 002 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.03.01_60/gs_NFV-SOL002v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/vnffm/v1
@@ -57,8 +57,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -96,8 +94,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -138,8 +134,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
         "412":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/412
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -177,8 +171,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -218,8 +210,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -256,10 +246,8 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
+          $ref: '#/components/responses/Subscriptions.Post.422'
         "429":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/429
         "500":
@@ -296,8 +284,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -327,8 +313,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -346,7 +330,7 @@ components:
       name: filter
       description: >
         Attribute-based filtering expression according to clause 5.2 of ETSI
-        GS NFV-SOL 013 [6].
+        GS NFV-SOL 013.
         The VNFM shall support receiving this parameter as part of the URI query
         string. The EM may supply this parameter. The VNF may supply its instance
         Id as an attribute filter.
@@ -361,7 +345,7 @@ components:
       name: filter
       description: >
         Attribute-based filtering expression according to clause 5.2 of ETSI
-        GS NFV-SOL 013 [6].
+        GS NFV-SOL 013.
         The VNFM shall support receiving this parameter as part of the URI query string. The
         EM may supply this parameter. The VNF may supply its instance Id as an attribute
         filter.
@@ -433,7 +417,7 @@ components:
         contain in an array the representations of zero or more alarms as defined in clause 7.5.2.4. If the "filter"
         URI parameter was supplied in the request, the data in the response body  shall have been transformed according
         to the rules specified in clause 5.2.2 of  ETSI GS NFV-SOL 013. If the VNFM supports alternative 2 (paging)
-        according to clause 5.4.2.1 of  ETSI GS NFV-SOL 013for this resource, inclusion of the Link HTTP header in this
+        according to clause 5.4.2.1 of  ETSI GS NFV-SOL 013 for this resource, inclusion of the Link HTTP header in this
         response  shall follow the provisions in clause 5.4.2.3 of ETSI GS NFV-SOL 013.
       headers:
         Version:
@@ -699,6 +683,45 @@ components:
           schema:
             $ref: definitions/SOL002VNFFaultManagement_def.yaml#/definitions/FmSubscription
 
+    Subscriptions.Post.422:
+      description: |
+        422 Unprocessable Content
+
+        Shall be returned upon the following error: The content type of the message content is supported 
+        and the message content of a request contains syntactically correct data but the data cannot be processed.
+        The general cause for this error and its handling is specified in clause 6.4 of ETSI GS NFV-SOL 013, 
+        including rules for the presence of the response body.
+        Specifically in case of this resource, the response code 422 shall also be returned if the VNFM has tested 
+        the Notification endpoint as described in clause 7.4.7.3.2 and the test has failed.
+        In this case, the "detail" attribute in the "ProblemDetails" structure shall convey more information 
+        about the error.
+      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.
+          style: simple
+          explode: false
+          schema:
+            type: string
+        Version:
+          description: Version of the API used in the response.
+          style: simple
+          explode: false
+          schema:
+            type: string
+        Content-Type:
+          description: |
+            The MIME type of the body of the response. Reference: IETF RFC 7231
+          style: simple
+          explode: false
+          schema:
+            type: string
+      content:
+        application/json:
+          schema:
+            $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails"
+    
     IndividualSubscription.Get.200:
       description: |
         200 OK
diff --git a/src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml b/src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml
index b230f470d7cf3daf7d769b6d3493a039c7ab5d68..8781229b9cae94b548815cdd099d055b5d21be05 100644
--- a/src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml
+++ b/src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml
@@ -11,7 +11,7 @@ definitions:
       changes in the state of virtualised resources:
         - One of the entries in the array shall provide information about the anticipated time of maintenance in the
           following format: "anticipatedTime=$time", wherein "$time" shall be formatted as a "DateTime", as specified
-          in ETSI GS NFV-SOL 013 [6].
+          in ETSI GS NFV-SOL 013.
         - One of the entries in the array shall provide identification information about the affinity/anti-affinity group
           defined in the VNFD that is associated to the affected virtualised resource indicated by "rootCauseFaultyResource" 
           in the following format: "affinityOrAntiAffinityGroupId=$group", wherein "$group" shall be equal to the 
diff --git a/src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml b/src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml
index 4909cb90e5fa5c61a724a00a9cf935c358fd350e..88c958559d9cf96cc56ab206752563b1315fddd0 100644
--- a/src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml
+++ b/src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml
@@ -19,8 +19,8 @@ info:
   version: 1.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf
+  description: ETSI GS NFV-SOL 002 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.03.01_60/gs_NFV-SOL002v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/callback/v1
diff --git a/src/SOL002/VNFIndicator/VNFIndicator.yaml b/src/SOL002/VNFIndicator/VNFIndicator.yaml
index 300e7c5b403041ef1df91036fbd6e1cb24672d75..64744e8d143279bb469dccda09f8b0af3dfddccc 100644
--- a/src/SOL002/VNFIndicator/VNFIndicator.yaml
+++ b/src/SOL002/VNFIndicator/VNFIndicator.yaml
@@ -19,8 +19,8 @@ info:
   version: 1.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf
+  description: ETSI GS NFV-SOL 002 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.03.01_60/gs_NFV-SOL002v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/vnfind/v1
@@ -55,8 +55,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -94,8 +92,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -131,8 +127,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -170,8 +164,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -208,10 +200,8 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
+          $ref: '#/components/responses/VnfIndicatorSubscription.Post.422'
         "429":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/429
         "500":
@@ -244,8 +234,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -275,8 +263,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -294,7 +280,7 @@ components:
       name: filter
       description: >
         Attribute-based filtering expression according to clause 5.2 of ETSI
-        GS NFV-SOL 013 [6].
+        GS NFV-SOL 013.
         The EM shall and the VNF may support receiving this parameter as part of the URI
         query string. The VNFM may supply this parameter.
         All attribute names that appear in the VnfIndicatorSubscription data type and in data
@@ -310,7 +296,7 @@ components:
       name: filter
       description: >
         Attribute-based filtering expression according to clause 5.2 of ETSI
-        GS NFV-SOL 013 [6].
+        GS NFV-SOL 013.
         The API producer shall support receiving this parameter as part of the URI query
         string. The VNFM may supply this parameter.
         All attribute names that appear in the VnfIndicator data type and in data types
@@ -324,7 +310,7 @@ components:
       name: filter
       description: >
         Attribute-based filtering expression according to clause 5.2 of ETSI
-        GS NFV-SOL 013 [6].
+        GS NFV-SOL 013.
         The API producer shall support receiving this parameter as part of the URI query
         string. The VNFM may supply this parameter.
         All attribute names that appear in the VnfIndicator data type and in data types
@@ -564,6 +550,45 @@ components:
             items:
               $ref: definitions/SOL002VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription
 
+    VnfIndicatorSubscription.Post.422:
+      description: |
+        422 Unprocessable Content
+
+        Shall be returned upon the following error: The content type of the message content is supported 
+        and the message content of a request contains syntactically correct data but the data cannot be processed.
+        The general cause for this error and its handling is specified in clause 6.4 of ETSI GS NFV-SOL 013, 
+        including rules for the presence of the response body.
+        Specifically in case of this resource, the response code 422 shall also be returned if the VNFM has tested 
+        the Notification endpoint as described in clause 8.4.7.3.2 and the test has failed.
+        In this case, the "detail" attribute in the "ProblemDetails" structure shall convey more information 
+        about the error.
+      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.
+          style: simple
+          explode: false
+          schema:
+            type: string
+        Version:
+          description: Version of the API used in the response.
+          style: simple
+          explode: false
+          schema:
+            type: string
+        Content-Type:
+          description: |
+            The MIME type of the body of the response. Reference: IETF RFC 7231
+          style: simple
+          explode: false
+          schema:
+            type: string
+      content:
+        application/json:
+          schema:
+            $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails"
+    
     VnfIndicatorSubscription.Get.200:
       description: |
         200 OK
diff --git a/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml b/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml
index 09a3393bfc98d475f9344817dcf712af8dbf631b..3878ed06a6bf7e56ce364d456ced907ccb86d2d5 100644
--- a/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml
+++ b/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml
@@ -19,8 +19,8 @@ info:
   version: 1.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf
+  description: ETSI GS NFV-SOL 002 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.03.01_60/gs_NFV-SOL002v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/callback/v1
diff --git a/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml b/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml
index 9b8163db261f5769131cb827478eb3475a646e8f..269c85d8002a66e9a8e035252f8c6c75d5b7bf86 100644
--- a/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml
+++ b/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml
@@ -19,8 +19,8 @@ info:
   version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf
+  description: ETSI GS NFV-SOL 002 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.03.01_60/gs_NFV-SOL002v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/lcmcoord/v1
@@ -98,8 +98,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -137,8 +135,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
diff --git a/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml
index 896bf346392a0db048da0acf7dd30968bcc96a63..96414673e2d39cb551d9911047abc70ad03eb862 100644
--- a/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml
+++ b/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml
@@ -16,11 +16,11 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: 2.15.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
+  version: 2.16.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf
+  description: ETSI GS NFV-SOL 002 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.03.01_60/gs_NFV-SOL002v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/vnflcm/v2
@@ -60,8 +60,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -97,10 +95,8 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
+          $ref: '#/components/responses/VnfInstances.Post.422'
         "429":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/429
         "500":
@@ -133,8 +129,7 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
+
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -166,8 +161,7 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
+
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -206,8 +200,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
         "412":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/412
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -247,8 +239,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -287,8 +277,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -327,8 +315,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -367,8 +353,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -407,8 +391,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -448,8 +430,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -488,8 +468,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -528,8 +506,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -568,8 +544,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -609,8 +583,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -652,8 +624,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -689,8 +659,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -729,8 +697,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -769,8 +735,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -808,8 +772,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -848,8 +810,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -887,8 +847,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -922,10 +880,8 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
+          $ref: '#/components/responses/Subscriptions.Post.422'
         "429":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/429
         "500":
@@ -959,8 +915,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -990,8 +944,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -1017,8 +969,6 @@ paths:
       responses:
         "202":
           $ref: '#/components/responses/VnfInstanceCreateSnapshot.Post.202'
-        "409":
-          $ref: '#/components/responses/VnfInstanceCreateSnapshot.Post.409'
         "400":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/400
         "401":
@@ -1026,15 +976,15 @@ paths:
         "403":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/403
         "404":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/404
+          $ref: '#/components/responses/VnfInstanceCreateSnapshot.Post.404'
         "405":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
+        "409":
+          $ref: '#/components/responses/VnfInstanceCreateSnapshot.Post.409'
         "422":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
+          $ref: '#/components/responses/VnfInstanceCreateSnapshot.Post.422'
         "429":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/429
         "500":
@@ -1071,8 +1021,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -1110,8 +1058,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
         "409":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/409
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -1149,8 +1095,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -1186,8 +1130,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -1220,8 +1162,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -1239,7 +1179,7 @@ components:
       name: filter
       description: >
         Attribute-based filtering expression according to clause 5.2 of ETSI
-        GS NFV-SOL 013 [6].
+        GS NFV-SOL 013.
         The VNFM shall support receiving this parameter as part of the URI
         query string. The EM may supply this parameter.
         All attribute names that appear in the VnfSnapshot and in data types
@@ -1255,7 +1195,7 @@ components:
       in: query
       description: >-
         Indicates to exclude the following complex attributes from the
-        response. See clause 5.3 of ETSI GS NFV-SOL 013 [6] for details.
+        response. See clause 5.3 of ETSI GS NFV-SOL 013 for details.
         The VNFM shall support this parameter.
         The following attributes shall be excluded from the VnfSnapshot
         structure in the response body if this parameter is provided, or none
@@ -1271,7 +1211,7 @@ components:
       name: filter
       description: >
         Attribute-based filtering expression according to clause 5.2 of ETSI
-        GS NFV-SOL 013 [6].
+        GS NFV-SOL 013.
         The VNFM shall support receiving this parameter as part of the URI query string. The
         EM may supply this parameter.
         All attribute names that appear in the LccnSubscription and in data types referenced
@@ -1285,7 +1225,7 @@ components:
       name: filter
       description: >
         Attribute-based filtering expression according to clause 5.2 of ETSI
-        GS NFV-SOL 013 [6].
+        GS NFV-SOL 013.
         The VNFM shall support receiving this parameter as part of the URI query string.
         The EM/VNF may supply this parameter.
         All attribute names that appear in the VnfLcmOpOcc and in data types referenced
@@ -1300,7 +1240,7 @@ components:
       in: query
       description: >
         Indicates to exclude the following complex attributes from the response. See
-        clause 5.3 of ETSI GS NFV-SOL 013 [6] for details. The VNFM shall support this
+        clause 5.3 of ETSI GS NFV-SOL 013 for details. The VNFM shall support this
         parameter.
         The following attributes shall be excluded from the VnfLcmOpOcc structure in the
         response body if this parameter is provided, or none of the parameters
@@ -1321,7 +1261,7 @@ components:
       name: filter
       description: >
         Attribute-based filtering expression according to clause 5.2 of ETSI
-        GS NFV-SOL 013 [6].
+        GS NFV-SOL 013.
         The VNFM shall support receiving this parameter as part of the URI query string.
         The EM may supply this parameter.
         All attribute names that appear in the VnfInstance and in data types referenced from
@@ -1336,7 +1276,7 @@ components:
       in: query
       description: >-
         Indicates to exclude the following complex attributes from the response. See
-        clause 5.3 of ETSI GS NFV-SOL 013 [6] for details. The VNFM shall support this
+        clause 5.3 of ETSI GS NFV-SOL 013 for details. The VNFM shall support this
         parameter.
         The following attributes shall be excluded from the VnfInstance structure in the
         response body if this parameter is provided, or none of the parameters "all_fields",
@@ -1541,8 +1481,16 @@ components:
     VnfInstances.Get.200:
       description: |
         200 OK
-        Information about zero or more VNF instances has been queried successfully. The response body shall contain in
-        an array the representations of zero or more VNF instances.
+        Shall be returned when information about zero or more VNF instances has been queried successfully.
+        The response body shall contain in an array the representations of zero or more VNF instances,
+        as defined in clause 5.5.2.2.
+        If the "filter" URI parameter or one of the "all_fields", "fields" (if supported), "exclude_fields"
+        (if supported) or "exclude_default" URI parameters was supplied in the request, the data in the response
+        body shall have been transformed according to the rules specified in clauses 5.2.2 and 5.3.2 of
+        ETSI GS NFV-SOL 013, respectively.
+        If the VNFM supports alternative 2 (paging) according to clause 5.4.2.1 of ETSI GS NFV-SOL 013
+        for this resource, inclusion of the Link HTTP header in this response shall follow the provisions
+        in clause 5.4.2.3 of ETSI GS NFV-SOL 013.
       headers:
         Version:
           description: The used API version.
@@ -1614,6 +1562,46 @@ components:
           schema:
             $ref: ./definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/VnfInstance
 
+    VnfInstances.Post.422:
+      description: |
+        422 Unprocessable Content
+
+        Shall be returned upon the following error: The content type of the message content is supported and the
+        message content of a request contains syntactically correct data but the data cannot be processed.
+        The general cause for this error and its handling is specified in clause 6.4 of ETSI GS NFV-SOL 013,
+        including rules for the presence of the response body.
+        Specifically in case of this resource, the response code 422 shall also be returned if the VNF package
+        referenced by the "vnfdId" attribute in the "CreateVnfRequest" structure is not in the "ENABLED"
+        state or does not exist. In this case, the "detail" attribute in the "ProblemDetails" structure shall convey
+        more information about the error.
+      headers:
+        Content-Type:
+          description: The MIME type of the body of the response.
+          schema:
+            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.
+          schema:
+            type: string
+            maximum: 1
+            minimum: 0
+        Version:
+          description: >
+            Version of the API used in the response.
+          schema:
+            type: string
+            maximum: 1
+            minimum: 1
+      content:
+        application/json:
+          schema:
+            $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails"
+    
     IndividualVnfInstance.Get.200:
       description: |
         200 OK
@@ -2879,9 +2867,15 @@ components:
     Subscriptions.Get.200:
       description: |
         200 OK
-        The list of subscriptions has been queried successfully. The response body shall contain in an array the
-        representations of all active subscriptions of the functional block that invokes the method, i.e. zero or
-        more representations of lifecycle change notification subscriptions as defined in clause 5.5.2.16.
+        Shall be returned when the list of subscriptions has been queried successfully.
+        The response body shall contain in an array the representations of all active subscriptions of
+        the functional block that invokes the method, i.e. zero or more representations of lifecycle change
+        notification subscriptions as defined in clause 5.5.2.16.
+        If the "filter" URI parameter was supplied in the request, the data in the response body shall have been
+        transformed according to the rules specified in clause 5.2.2 of ETSI GS NFV-SOL 013.
+        If the VNFM supports alternative 2 (paging) according to clause 5.4.2.1 of ETSI GS NFV-SOL 013
+        for this resource, inclusion of the Link HTTP header in this response shall follow the provisions
+        in clause 5.4.2.3 of ETSI GS NFV-SOL 013.
       headers:
         Version:
           description: The used API version.
@@ -2947,6 +2941,46 @@ components:
           schema:
             $ref: definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/LccnSubscription
 
+    Subscriptions.Post.422:
+      description: |
+        422 Unprocessable Content
+
+        Shall be returned upon the following error: The content type of the message content is supported
+        and the message content of a request contains syntactically correct data but the data cannot be
+        processed.
+        The general cause for this error and its handling is specified in clause 6.4 of ETSI GS NFV-SOL 013,
+        including rules for the presence of the response body.
+        Specifically in case of this resource, the response code 422 shall also be returned if the VNFM has
+        tested the Notification endpoint as described in clause 5.4.20.3.2 and the test has failed.
+        In this case, the "detail" attribute in the "ProblemDetails" structure shall convey more
+        information about the error.
+      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.
+          style: simple
+          explode: false
+          schema:
+            type: string
+        Version:
+          description: Version of the API used in the response.
+          style: simple
+          explode: false
+          schema:
+            type: string
+        Content-Type:
+          description: |
+            The MIME type of the body of the response. Reference: IETF RFC 7231
+          style: simple
+          explode: false
+          schema:
+            type: string
+      content:
+        application/json:
+          schema:
+            $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails"
+    
     IndividualSubscription.Get.200:
       description: |
         200 OK
@@ -3038,19 +3072,55 @@ components:
             format: url
       content: {}
 
+    VnfInstanceCreateSnapshot.Post.404:
+      description: |
+        404 Not Found
+
+        Shall be returned upon the following error: The API producer did not find a current representation
+        for the target resource or is not willing to disclose that one exists.
+        The general cause for this error and its handling is specified in clause 6.4 of ETSI
+        GS NFV-SOL 013, including rules for the presence of the response body.
+        Specifically in case of this task resource, the response code 404 shall also be returned if the
+        task is not supported for the VNF instance represented by the parent resource, which means
+        that the task resource consequently does not exist.
+        In this case, the response body shall be present, and shall contain a ProblemDetails structure, in
+        which the "detail" attribute shall convey more information about the error. 
+      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.
+          style: simple
+          explode: false
+          schema:
+            type: string
+        Version:
+          description: Version of the API used in the response.
+          style: simple
+          explode: false
+          schema:
+            type: string
+        Content-Type:
+          description: |
+            The MIME type of the body of the response. Reference: IETF RFC 7231
+          style: simple
+          explode: false
+          schema:
+            type: string
+      content:
+        application/json:
+          schema:
+            $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails"
+    
     VnfInstanceCreateSnapshot.Post.409:
       description: |
         409 CONFLICT
 
-        Shall be returned upon the following error: The
-        operation cannot be executed currently, due to a
+        Shall be returned upon the following 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 VNF
-        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 shall
+        Typically, this is due to the fact that the VNF 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 shall
         convey more information about the error.
       headers:
         WWW-Authenticate:
@@ -3079,6 +3149,46 @@ components:
           schema:
             $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails"
 
+    VnfInstanceCreateSnapshot.Post.422:
+      description: |
+        422 Unprocessable Content
+
+        Shall be returned upon the following error: The content type of the message content is supported
+        and the message content of a request contains syntactically correct data but the data cannot be
+        processed.
+        The general cause for this error and its handling is specified in clause 6.4 of ETSI
+        GS NFV-SOL 013, including rules for the presence of the response body.
+        Specifically in case of this resource, the response code 422 shall also be returned if the provided
+        identifier of the target "Individual VNF snapshot" resource for the VNF snapshot is invalid.
+        In this case, the "detail" attribute in the "ProblemDetails" structure shall convey more
+        information about the error.
+      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.
+          style: simple
+          explode: false
+          schema:
+            type: string
+        Version:
+          description: Version of the API used in the response.
+          style: simple
+          explode: false
+          schema:
+            type: string
+        Content-Type:
+          description: |
+            The MIME type of the body of the response. Reference: IETF RFC 7231
+          style: simple
+          explode: false
+          schema:
+            type: string
+      content:
+        application/json:
+          schema:
+            $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails"
+    
     VnfInstanceRevertToSnapshot.Post.202:
       description: |
         202 ACCEPTED
diff --git a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml
index 060e72b18df426ec5297be6098ce5eb434b97a8b..51bab13aa9623ddc9e4de2b91f312d2e45e0f3c1 100644
--- a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml
+++ b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml
@@ -39,7 +39,16 @@ definitions:
                 modules, the “scaleStatus” indicates the scale level that would be applicable to the aspect if a VNF LCM 
                 operation changes the selected deployable modules and the related VNFCs are instantiated, unless the VNF 
                 LCM operation explicitly indicates the scale level for the aspect.
-
+      * NOTE 9: The recentVnfLcmOperationLinks attribute does not provide a complete historical record of LCM changes
+                that a VNF instance experienced during its lifecycle. The information in this attribute should not be used to
+                create a chronological order of events that cannot be inferred by looking only at the most recent operation
+                occurrences due to potential gaps in timeline. This is because there can be many possible combination of
+                LCM changes that a VNF may have gone through between two operation occurrences recorded in the
+                recentVnfLcmOperationLinks attribute. For example, there can be many scaling related LCM changes since
+                an individual VNF instance has been instantiated until the most recent scaling operation occurrence linked in
+                the attribute. In another example, the most recent LCM operation occurrence related to instantiate VNF
+                operation may be more recent than the one that caused the VNF instance to be terminated last time, which
+                prevents the possibility to create a meaningful chronological timeline of VNF LCM events.
     type: object
     required:
       - id
@@ -151,6 +160,12 @@ definitions:
             description: >
               The state of the VNF instance.
             $ref: "#/definitions/VnfOperationalStateType"
+          vnfPowerState:
+            description: >
+              The power state of the VNF instance. Only present if the VNF instance
+              is in a power state or a scale status (refer to attribute "scaleStatus")
+              that has an associated power profile, as defined in the VNFD.
+            $ref: "#/definitions/PowerStateInfo"
           scaleStatus:
             description: >
               Scale status of the VNF, one entry per aspect. Represents for every
@@ -418,7 +433,82 @@ definitions:
               possible based on the current status of this VNF instance resource (i.e. VNF instance is 
               in INSTANTIATED state).
             $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link"
-            
+      recentVnfLcmOperationLinks:
+        description: >
+          Links to the most recent LCM operation occurrences related to this resource. See note 9.
+        type: object
+        properties:
+          recentVnfLcmOperation:
+            description: >
+              Link to the most recent LCM operation occurrence of any type that has been triggered
+              on this VNF instance, such as Instantiate, Scale or Heal.
+            $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link"
+          recentVnfLcmInstantiation:
+            description: >
+              Link to the most recent LCM operation occurrence of type "INSTANTIATE" that has been
+              triggered on this VNF instance.
+            $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link"
+          recentVnfLcmScale:
+            description: >
+              Link to the most recent LCM operation occurrence of type "SCALE" that has been
+              triggered on this VNF instance.
+            $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link"
+          recentVnfLcmScaleToLevel:
+            description: >
+              Link to the most recent LCM operation occurrence of type "SCALE_TO_LEVEL" that has been
+              triggered on this VNF instance.
+            $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link"
+          recentVnfLcmChangeFlavour:
+            description: >
+              Link to the most recent LCM operation occurrence of type "CHANGE_FLAVOUR" that has been
+              triggered on this VNF instance.
+            $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link"
+          recentVnfLcmTerminate:
+            description: >
+              Link to the most recent LCM operation occurrence of type "TERMINATE" that has been
+              triggered on this VNF instance.
+            $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link"
+          recentVnfLcmHeal:
+            description: >
+              Link to the most recent LCM operation occurrence of type "HEAL" that has been
+              triggered on this VNF instance.
+            $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link"
+          recentVnfLcmOperate:
+            description: >
+              Link to the most recent LCM operation occurrence of type "OPERATE" that has been
+              triggered on this VNF instance.
+            $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link"
+          recentVnfLcmChangeExtConn:
+            description: >
+              Link to the most recent LCM operation occurrence of type "CHANGE_EXT_CONN"
+              that has been triggered on this VNF instance.
+            $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link"
+          recentVnfLcmModifyInfo:
+            description: >
+              Link to the most recent LCM operation occurrence of type "MODIFY_INFO"
+              that has been triggered on this VNF instance.
+            $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link"
+          recentVnfLcmCreateSnapshot:
+            description: >
+              Link to the most recent LCM operation occurrence of type "CREATE_SNAPSHOT"
+              that has been triggered on this VNF instance.
+            $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link"
+          recentVnfLcmRevertToSnapshot:
+            description: >
+              Link to the most recent LCM operation occurrence of type "REVERT_TO_SNAPSHOT"
+              that has been triggered on this VNF instance.
+            $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link"
+          recentVnfLcmChangeVnfPkg:
+            description: >
+              Link to the most recent LCM operation occurrence of type "CHANGE_VNFPKG"
+              that has been triggered on this VNF instance.
+            $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link"
+          recentVnfLcmSelectDplMods:
+            description: >
+              Link to the most recent LCM operation occurrence of type "SELECT_DEPL_MODS"
+              that has been triggered on this VNF instance.
+            $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link"
+      
   SelectVnfDeployableModulesRequest:
     description: >
       This type represents request parameters for the "Select VNF deployable modules" operation.
@@ -2354,14 +2444,15 @@ definitions:
     description: >
       This type represents request parameters for the "Scale VNF to Level" operation.
 
-      NOTE 1:	Either the instantiationLevelId attribute or the scaleInfo attribute shall 
-            be included.
-      NOTE 2: If the referenced instantiationLevel or the scaleInfo attribute contain information related to VNFCs that are not
-              going to be instantiated due to the selection of deployable modules, the information is stored in the VNFM for
-              later use and included in the instantiatedVnfInfo. If, during the lifecycle of the VNF, as a result of a change of
-              the selected deployable modules any of those VNFCs is going to be instantiated, the stored information
-              determines the number of instances, unless the request that triggered the change also contains information
-              about the number of instances.
+      NOTE 1:	Either the instantiationLevelId attribute or the scaleInfo attribute or the powerProfileId attribute shall 
+            be included, but not multiple of them.
+      NOTE 2: If the referenced instantiationLevel, the scaleInfo or powerProfileId attribute contain information related to VNFCs
+            that are not going to be instantiated due to the selection of deployable modules, the information is stored in the 
+            VNFM for later use and included in the instantiatedVnfInfo. If, during the lifecycle of the VNF, as a result of 
+            a change of the selected deployable modules any of those VNFCs is going to be instantiated, the stored information
+            determines the number of instances, unless the request that triggered the change also contains information
+            about the number of instances.
+
     type: object
     anyOf:
       - oneOf:
@@ -2369,6 +2460,8 @@ definitions:
               - instantiationLevelId
           - required:
               - scaleInfo
+          - required:
+              - powerProfileId
     properties:
       instantiationLevelId:
         description: >
@@ -2384,6 +2477,13 @@ definitions:
         type: array
         items:
           $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ScaleInfo"
+      powerProfileId:
+        description: >
+          Identifier of the target power profile in the current deployment flavour, as
+          defined in the VNFD, from which the target power state can be selected and
+          be switched to.
+          See notes 1 and 2.
+        $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd"
       additionalParams:
         description: >
           Additional parameters passed by the NFVO as input to the scaling
@@ -2686,6 +2786,50 @@ definitions:
         items:
           type: string
 
+  CpSecurityGroupInfo:
+    description: >
+      This type provides the list of active security group rules applied to an external CP instance.
+      The type identifies which "SecurityGroupRule" specified in the VNFD are activated and the values
+      of its attributes.
+    type: object
+    required:
+      - securityGroupRuleId
+      - etherType
+      - protocol
+      - portRangeMin
+      - portRangeMax
+    properties:
+      securityGroupRuleId:
+        description: >
+          Identifier of the security group rule policy in the VNFD.
+        $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd"
+      description:
+        description: >
+          Human readable description of the security group rule.
+        type: string
+      etherType:
+        description: >
+          Indicates the protocol carried over the Ethernet layer.
+          Permitted values: IPV4, IPV6.
+        type: string
+        enum:
+          - IPV4
+          - IPV6
+      protocol:
+        description: >
+          Indicates the protocol carried over the IP layer.
+          Permitted values: any protocol defined in the IANA protocol
+          registry (refer to clause 9.10.1.2 ofd ETSI GS NFV-SOL 001 for further information).
+        type: string
+      portRangeMin:
+        description: >
+          Value for the minimum port number in the range that is matched by the security group rule.
+        type: integer
+      portRangeMax:
+        description: >
+          Value for the maximum port number in the range that is matched by the security group rule.
+        type: integer
+
   IpOverEthernetAddressInfo:
     description: >
       This type represents information about a network address that has been assigned.
@@ -2880,19 +3024,69 @@ definitions:
           notification is related to. Shall be present if there is a related
           lifecycle operation occurrence.
         $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/NotificationLink"
+  PowerStateInfo:
+    description: >
+      This type represents information about the power state of a VNF instance.
+
+    type: object
+    required:
+      - powerProfileId
+      - name
+    properties:
+      powerProfileId:
+         description: >
+           Identifier of the power profile, as defined in the VNFD,
+           applied to the VNF instance.
+         $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd"
+      name:
+         description: >
+          Name of the power profile as provided in the VNFD.
+         type: string
+      powerConsumptionInfo:
+         description: >
+           Estimated power consumption information of the resources
+           associated with this power profile, as provided in the VNFD.
+           VNFM exposes and can use this information to control the VNF
+           instance to operate according to the power profile and selected
+           power state, e.g. monitoring actual energy or power consumption
+           of the VNF instance and compare against the estimated one.
+         $ref: "#/definitions/PowerConsumptionInfo"
+
+  PowerConsumptionInfo:
+    description: >
+      This type represents information about estimated power consumption of the resources associated
+      with the power profile, as provided in the VNFD.
+    type: object
+    required:
+      - minPowerConsumption
+      - maxPowerConsumption
+      - averagePowerConsumption
+    properties:
+      minPowerConsumption:
+         description: >
+           Minimum power consumption of this power profile. Unit is KW/h.
+         type: integer
+      maxPowerConsumption:
+         description: >
+           Maximum power consumption of this power profile. Unit is KW/h.
+         type: integer
+      averagePowerConsumption:
+         description: >
+           Average power consumption of this power profile. Unit is KW/h.
+         type: integer
 
   VnfExtCpInfo:
     description: >
       This type represents information about an external CP of a VNF.
 
-      NOTE 1:	The attributes "associatedVnfcCpId", "associatedVipCpId", "associatedVirtualCpId" and 
-              "associatedVnfVirtualLinkId" are mutually exclusive. Exactly one shall be present.
-      NOTE 2:	An external CP instance is not associated to a link port in the cases indicated for the 
-              “extLinkPorts” attribute in clause 4.4.1.11.
-      NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network 
-              attachment definition resource is needed to fulfil the connectivity requirements of the external 
-              CP, e.g. to build a link redundant mated pair in SR-IOV cases.
-      NOTE 4: When more than one netAttDefResourceId is indicated, all shall belong to the same namespace.
+      * NOTE 1:	The attributes "associatedVnfcCpId", "associatedVipCpId", "associatedVirtualCpId" and 
+                "associatedVnfVirtualLinkId" are mutually exclusive. Exactly one shall be present.
+      * NOTE 2:	An external CP instance is not associated to a link port in the cases indicated for the 
+                “extLinkPorts” attribute in clause 4.4.1.11.
+      * NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network 
+                attachment definition resource is needed to fulfil the connectivity requirements of the external 
+                CP, e.g. to build a link redundant mated pair in SR-IOV cases.
+      * NOTE 4: When more than one netAttDefResourceId is indicated, all shall belong to the same namespace.
     type: object
     required:
       - id
@@ -2981,7 +3175,11 @@ definitions:
           This attribute shall be supported when delegation mode in certificate management is applicable.
         type: array
         $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier"
-
+      cpSecurityGroupInfo:
+        description: >
+          List of active security group rules applied to this external CP instance. The attribute identifies which
+          "SecurityGroupRule" specified in the VNFD are activated and the values of its attributes.
+        $ref: "#/definitions/CpSecurityGroupInfo"
   CertificateInfo:
     description: >
       This type provides input information related to certificate and certificate management.
@@ -3767,4 +3965,4 @@ definitions:
         description: >
           Name of an address pool from which an IP address is 
           assigned to the virtual CP.
-        type: string
\ No newline at end of file
+        type: string
diff --git a/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml b/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml
index 7a61e5b6f15ee52a299fd1d779a3532ae1fb81e1..681683c564b5a19974ddbd2ae115be77aec4497e 100644
--- a/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml
+++ b/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml
@@ -16,11 +16,11 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: 2.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
+  version: 2.16.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf
+  description: ETSI GS NFV-SOL 002 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.03.01_60/gs_NFV-SOL002v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/callback/v2
diff --git a/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml b/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml
index 9f5372aa9322a5c101e73215303699556256168e..37412bd1ecc69401e5fec231c84ce9263953399f 100644
--- a/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml
+++ b/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml
@@ -19,8 +19,8 @@ info:
   version: 2.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf
+  description: ETSI GS NFV-SOL 002 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.03.01_60/gs_NFV-SOL002v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/vnfpm/v2
@@ -61,8 +61,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -97,10 +95,8 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
+          $ref: '#/components/responses/PmJobs.Post.422'
         "429":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/429
         "500":
@@ -135,8 +131,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -166,8 +160,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -206,10 +198,8 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/409
         "412":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/412
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
+          $ref: '#/components/responses/IndividualPmJob.Patch.422'
         "429":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/429
         "500":
@@ -245,8 +235,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -284,8 +272,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -320,10 +306,8 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
+          $ref: '#/components/responses/Thresholds.Post.422'
         "429":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/429
         "500":
@@ -358,8 +342,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -391,8 +373,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         "406":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         "429":
@@ -431,10 +411,8 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/409
         "412":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/412
-        "416":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         "422":
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
+          $ref: '#/components/responses/IndividualThreshold.Patch.422'
         "429":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/429
         "500":
@@ -450,7 +428,7 @@ components:
       name: filter
       description: >
         Attribute-based filtering expression according to clause 5.2 of ETSI
-        GS NFV-SOL 013 [6].
+        GS NFV-SOL 013.
         The VNFM shall support receiving this parameter as part of the URI query string.
         The API consumer may supply this parameter.
         All attribute names that appear in the Thresholds data type and in data types
@@ -465,7 +443,7 @@ components:
       in: query
       description: >
         Indicates to exclude the following complex attributes from the response. See
-        clause 5.3 of ETSI GS NFV-SOL 013 [6] for details. The VNFM shall support this
+        clause 5.3 of ETSI GS NFV-SOL 013 for details. The VNFM shall support this
         parameter.
         The following attributes shall be excluded from the PmJob structure in the response
         body if this parameter is provided, or none of the parameters "all_fields", "fields",
@@ -479,7 +457,7 @@ components:
       name: filter
       description: >
         Attribute-based filtering expression according to clause 5.2 of ETSI
-        GS NFV-SOL 013 [6].
+        GS NFV-SOL 013.
         The VNFM shall support receiving this parameter as part of the URI query string. The
         API consumer may supply this parameter.
         All attribute names that appear in the PmJob and in data types referenced from it shall
@@ -646,6 +624,46 @@ components:
           schema:
             $ref: definitions/SOL002VNFPerformanceManagement_def.yaml#/definitions/PmJob
 
+    PmJobs.Post.422:
+      description: |
+        422 Unprocessable Content
+
+        Shall be returned upon the following error: The content type of the message content is supported
+        and the message content of a request contains syntactically correct data but the data cannot be
+        processed.
+        The general cause for this error and its handling is specified in clause 6.4 of ETSI GS NFV-SOL 013,
+        including rules for the presence of the response body.
+        Specifically in case of this resource, the response code 422 shall also be returned if the VNFM has
+        tested the Notification endpoint as described in clause 6.4.9.3.2 and the test has failed.
+        In this case, the "detail" attribute in the "ProblemDetails" structure shall convey more
+        information about the error. 
+      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.
+          style: simple
+          explode: false
+          schema:
+            type: string
+        Version:
+          description: Version of the API used in the response.
+          style: simple
+          explode: false
+          schema:
+            type: string
+        Content-Type:
+          description: |
+            The MIME type of the body of the response. Reference: IETF RFC 7231
+          style: simple
+          explode: false
+          schema:
+            type: string
+      content:
+        application/json:
+          schema:
+            $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails"
+    
     IndividualPmJob.Get.200:
       description: |
         200 OK
@@ -765,6 +783,45 @@ components:
           schema:
             $ref: definitions/SOL002VNFPerformanceManagement_def.yaml#/definitions/PmJobModifications
 
+    IndividualPmJob.Patch.422:
+      description: |
+        422 Unprocessable Content
+
+        Shall be returned upon the following error: The content type of the message content is supported 
+        and the message content of a request contains syntactically correct data but the data cannot be processed.
+        The general cause for this error and its handling is specified in clause 6.4 of ETSI GS NFV-SOL 013, 
+        including rules for the presence of the response body.
+        Specifically in case of this resource, the response code 422 shall also be returned if the VNFM has tested 
+        the Notification endpoint as described in clause 6.4.9.3.2 and the test has failed.
+        In this case, the "detail" attribute in the "ProblemDetails" structure shall convey more information 
+        about the error.
+      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.
+          style: simple
+          explode: false
+          schema:
+            type: string
+        Version:
+          description: Version of the API used in the response.
+          style: simple
+          explode: false
+          schema:
+            type: string
+        Content-Type:
+          description: |
+            The MIME type of the body of the response. Reference: IETF RFC 7231
+          style: simple
+          explode: false
+          schema:
+            type: string
+      content:
+        application/json:
+          schema:
+            $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails"
+    
     IndividualPmJobReport.Get.200:
       description: |
         200 OK
@@ -880,6 +937,45 @@ components:
           schema:
             $ref: definitions/SOL002VNFPerformanceManagement_def.yaml#/definitions/Threshold
 
+    Thresholds.Post.422:
+      description: |
+        422 Unprocessable Content
+
+        Shall be returned upon the following error: The content type of the message content is supported 
+        and the message content of a request contains syntactically correct data but the data cannot be processed.
+        The general cause for this error and its handling is specified in clause 6.4 of ETSI GS NFV-SOL 013, 
+        including rules for the presence of the response body.
+        Specifically in case of this resource, the response code 422 shall also be returned if the VNFM has tested 
+        the Notification endpoint as described in clause 6.4.9.3.2 and the test has failed.
+        In this case, the "detail" attribute in the "ProblemDetails" structure shall convey more information 
+        about the error.
+      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.
+          style: simple
+          explode: false
+          schema:
+            type: string
+        Version:
+          description: Version of the API used in the response.
+          style: simple
+          explode: false
+          schema:
+            type: string
+        Content-Type:
+          description: |
+            The MIME type of the body of the response. Reference: IETF RFC 7231
+          style: simple
+          explode: false
+          schema:
+            type: string
+      content:
+        application/json:
+          schema:
+            $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails"
+    
     IndividualThreshold.Get.200:
       description: |
         200 OK
@@ -991,4 +1087,43 @@ components:
       content:
         application/json:
           schema:
-            $ref: definitions/SOL002VNFPerformanceManagement_def.yaml#/definitions/ThresholdModifications
\ No newline at end of file
+            $ref: definitions/SOL002VNFPerformanceManagement_def.yaml#/definitions/ThresholdModifications
+
+    IndividualThreshold.Patch.422:
+      description: |
+        422 Unprocessable Content
+
+        Shall be returned upon the following error: The content type of the message content is supported 
+        and the message content of a request contains syntactically correct data but the data cannot be processed.
+        The general cause for this error and its handling is specified in clause 6.4 of ETSI GS NFV-SOL 013 , 
+        including rules for the presence of the response body.
+        Specifically in case of this resource, the response code 422 shall also be returned if the VNFM has tested 
+        the Notification endpoint as described in clause 6.4.9.3.2 and the test has failed.
+        In this case, the "detail" attribute in the "ProblemDetails" structure shall convey more information 
+        about the error.
+      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.
+          style: simple
+          explode: false
+          schema:
+            type: string
+        Version:
+          description: Version of the API used in the response.
+          style: simple
+          explode: false
+          schema:
+            type: string
+        Content-Type:
+          description: |
+            The MIME type of the body of the response. Reference: IETF RFC 7231
+          style: simple
+          explode: false
+          schema:
+            type: string
+      content:
+        application/json:
+          schema:
+            $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails"
\ No newline at end of file
diff --git a/src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml b/src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml
index a41622e7ef5212fec58a5b7b80b6ccdedbb3b723..ed712135b7f9f7639392fc1da35a56be90baf365 100644
--- a/src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml
+++ b/src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml
@@ -19,8 +19,8 @@ info:
   version: 2.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf
+  description: ETSI GS NFV-SOL 002 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.03.01_60/gs_NFV-SOL002v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/callback/v2
diff --git a/src/SOL003/APIVersion/APIVersion.yaml b/src/SOL003/APIVersion/APIVersion.yaml
index 2b3e5523088840e21b82f043b791a45730354168..267beabaf6a0f50e5d2518dab23c3deb81cb6e03 100644
--- a/src/SOL003/APIVersion/APIVersion.yaml
+++ b/src/SOL003/APIVersion/APIVersion.yaml
@@ -20,8 +20,8 @@ info:
   version: "1.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
 
 externalDocs:
-  description: ETSI GS NFV-SOL 003 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.02.01_60/gs_NFV-SOL003v050201p.pdf
+  description: ETSI GS NFV-SOL 003 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.03.01_60/gs_NFV-SOL003v050301p.pdf
 
 paths:
   /vrqan/api_versions:
diff --git a/src/SOL003/General_Definitions/SOL003_def.yaml b/src/SOL003/General_Definitions/SOL003_def.yaml
index 56fab7b4cce1fb4f6c1cae0c728c5e4bd4ec9d5c..ddcc403eed14e08d0b1eb57cdba9b692d33b8275 100644
--- a/src/SOL003/General_Definitions/SOL003_def.yaml
+++ b/src/SOL003/General_Definitions/SOL003_def.yaml
@@ -498,6 +498,19 @@ definitions:
         type: array
         items:
           $ref: "#/definitions/CpProtocolData"
+      cpSecurityGroupData:
+        description: >
+          Parameters for modifying and overriding security groups
+          information bound to this CP. The parameters identify
+          which "SecurityGroupRule" specified in the VNFD is 
+          activated/deactivated and for an activated security group
+          rule the values of attributes defined in the VNFD that can
+          be overridden such as "portRangeMin" and "portRangeMax".
+          If no security group configuration is provided for a given
+          "SecurityGroupRule" specified in the VNFD as part of this 
+          attribute, the VNFM shall use the configuration as specified
+          in the VNFD.
+        $ref: "#/definitions/CpSecurityGroupData"
 
   CpProtocolData:
     description: >
@@ -550,6 +563,36 @@ definitions:
         items:
           type: string
 
+  CpSecurityGroupData:
+    description: >
+      This type provides input parameters for modifying and overriding security groups.
+      The parameters identify which "SecurityGroupRule" specified in the VNFD is activated/deactivated
+      and for an activated security group rule the values of attributes defined in the VNFD that can be
+      overriden such as "portRangeMin" and "portRangeMax".
+    type: object
+    required:
+      - securityGroupRuleId
+    properties:
+      securityGroupRuleId:
+        description: >
+          Identifier of the security group rule policy in the VNFD.
+        $ref: "#/definitions/IdentifierInVnfd"
+      isActivated:
+        description: >
+          Indicates whether the rule is to be active (true) or inactive (false). If no attribute value
+          is provided, the Security Group Rule is activated by default.
+        type: boolean
+      portRangeMin:
+        description: >
+          Value for the minimum port number in the range that is matched by the security group rule.
+          The value shall be within the range "0 - 65535".
+        type: integer
+      portRangeMax:
+        description: >
+          Value for the maximum port number in the range that is matched by the security group rule.
+          The value shall be within the range "0 - 65535".
+        type: integer
+      
   IpOverEthernetAddressData:
     description: >
       This type represents network address data for IP over Ethernet.
@@ -970,6 +1013,10 @@ definitions:
         type: object
         additionalProperties:
           $ref: "#/definitions/Number"
+      cpuPowerStateRequirements:
+        description: >
+          Requirements of virtual CPU power state configuration data for the OS container resource.
+        $ref: "#/definitions/CpuPowerStateData"
 
   VirtualComputeDescData:
     description: >
@@ -1019,6 +1066,50 @@ definitions:
         type: object
         additionalProperties:
           $ref: "#/definitions/Number"
+      cpuPowerStateRequirements:
+        description: >
+          Requirements of virtual CPU power state configuration data for the virtual compute resource.
+        $ref: "#/definitions/CpuPowerStateData"
+
+  CpuPowerStateData:
+    description: >
+      This type provides virtual CPU power state configuration data for the virtual compute or OS container resource.
+
+      * NOTE 1: In case the value of the cpuPowerStateManagementPolicy attribute
+                is "DYNAMIC", dynamic adjustment of CPU power states of logical CPU cores
+                should adhere to the range of CPU P and C states defined in the
+                cpuOperationalPowerStates attribute.
+      * NOTE 2: In case the value of the cpuPowerStateManagementPolicy attribute
+                is "STATIC", the cpuOperationalPowerStates attribute shall contain only
+                one set of CPU P and C states requested for the virtual CPU.
+                If the value of the cpuPowerStateManagementPolicy attribute is
+                "DYNAMIC", multiple CPU P and C states can be defined to indicate the
+                range of allowed P/C state values during dynamic power state management.
+    type: object
+    required:
+      - cpuPowerStateManagementPolicy
+    properties:
+      cpuPowerStateManagementPolicy:
+        description: >
+          Indicates the policy for CPU power state management.
+          Permitted values:
+            * STATIC
+            * DYNAMIC
+          In case of "STATIC", the virtual CPU cores are requested to be
+          allocated to logical CPU cores according to the
+          cpuOperationalPowerStates attribute.
+          In case of "DYNAMIC", the CPU power states of virtual CPU cores
+          can be allocated to logical CPU cores whose power states can be
+          adjusted dynamically depending on core utilization (see note 1).
+        type: string
+        enum:
+          - STATIC
+          - DYNAMIC
+      cpuOperationalPowerStates:
+        description: >
+          Provides the list of operational power states (i.e. P and C states)
+          defined for the virtual CPU (see note 2).
+        $ref: "#/definitions/KeyValuePairs"
 
   VirtualStorageDescData:
     description: >
@@ -1614,4 +1705,4 @@ definitions:
       - MODIFY_INFO
       - CREATE_SNAPSHOT
       - REVERT_TO_SNAPSHOT
-      - CHANGE_VNFPKG
\ No newline at end of file
+      - CHANGE_VNFPKG
diff --git a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml
index 045884c507a7da8d920ac3462ede3750d800c9d2..5f52657fdce1e657ceb6bf46bf4a207ed41032c0 100644
--- a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml
+++ b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml
@@ -19,8 +19,8 @@ info:
   version: "1.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
 
 externalDocs:
-  description: ETSI GS NFV-SOL 003 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.02.01_60/gs_NFV-SOL003v050201p.pdf
+  description: ETSI GS NFV-SOL 003 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.03.01_60/gs_NFV-SOL003v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/vnffm/v1
diff --git a/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml b/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml
index 2ea58c3ab120b6540446c62e51d48837aa6c8b65..6d6c258285e35c0fff22804497d449620229b793 100644
--- a/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml
+++ b/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml
@@ -19,8 +19,8 @@ info:
   version: 1.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 003 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.02.01_60/gs_NFV-SOL003v050201p.pdf
+  description: ETSI GS NFV-SOL 003 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.03.01_60/gs_NFV-SOL003v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/callback/v1
diff --git a/src/SOL003/VNFIndicator/VNFIndicator.yaml b/src/SOL003/VNFIndicator/VNFIndicator.yaml
index e3aae199719696b638adc0f97ffe55dedba2e2f3..36bb2aac475f421e2527beaa8e971eecb680756c 100644
--- a/src/SOL003/VNFIndicator/VNFIndicator.yaml
+++ b/src/SOL003/VNFIndicator/VNFIndicator.yaml
@@ -19,8 +19,8 @@ info:
   version: "1.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
 
 externalDocs:
-  description: ETSI GS NFV-SOL 003 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.02.01_60/gs_NFV-SOL003v050201p.pdf
+  description: ETSI GS NFV-SOL 003 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.03.01_60/gs_NFV-SOL003v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/vnfind/v1
diff --git a/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml b/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml
index cc7775ba76fcfc94a0a9855aad27c61c7e70bcc5..c3c68f73a91b2f629aea54e41f1e7e47cc3a698e 100644
--- a/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml
+++ b/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml
@@ -19,8 +19,8 @@ info:
   version: "1.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
 
 externalDocs:
-  description: ETSI GS NFV-SOL 003 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.02.01_60/gs_NFV-SOL003v050201p.pdf
+  description: ETSI GS NFV-SOL 003 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.03.01_60/gs_NFV-SOL003v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/callback/v1
diff --git a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml
index 42746fedfa0a56582e813afae380415d18a05c7f..c67aacacb80350d763be241af8129249e0c0efd6 100644
--- a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml
+++ b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml
@@ -16,11 +16,11 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: "2.15.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
+  version: "2.16.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
 
 externalDocs:
-  description: ETSI GS NFV-SOL 003 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.02.01_60/gs_NFV-SOL003v050201p.pdf
+  description: ETSI GS NFV-SOL 003 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.03.01_60/gs_NFV-SOL003v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/vnflcm/v2
@@ -97,8 +97,6 @@ paths:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/405"
         406:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/406"
-        416:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/416"
         500:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/500"
         503:
@@ -136,8 +134,6 @@ paths:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/405"
         406:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/406"
-        416:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/416"
         500:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/500"
         503:
@@ -199,8 +195,6 @@ paths:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/406"
         409:
           $ref: '#/components/responses/IndividualVnfInstance.Delete.409'
-        412:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/412"
         500:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/500"
         503:
@@ -240,8 +234,6 @@ paths:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/406"
         409:
           $ref: '#/components/responses/InstantiateVnfInstance.Post.409'
-        416:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/416"
         500:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/500"
         503:
@@ -1083,8 +1075,6 @@ paths:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/405"
         406:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/406"
-        416:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/416"
         500:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/500"
         503:
@@ -1123,8 +1113,6 @@ paths:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/405"
         406:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/406"
-        416:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/416"
         500:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/500"
         503:
@@ -1162,8 +1150,6 @@ paths:
           $ref: '#/components/responses/IndividualVnfSnapshot.Patch.409'
         412:
           $ref: '#/components/responses/IndividualVnfSnapshot.Patch.412'
-        416:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/416"
         500:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/500"
         503:
@@ -1193,8 +1179,7 @@ paths:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/406"
         409:
           $ref: '#/components/responses/IndividualVnfSnapshot.Delete.409'
-        412:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/412"
+
         500:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/500"
         503:
@@ -1691,7 +1676,7 @@ components:
         "CreateVnfRequest" structure is not in the "ENABLED"
         state or does not exist. In this case, the "detail"
         attribute in the "ProblemDetails" structure shall convey
-        more information about the erro
+        more information about the error
       headers:
         Location:
           description: |
@@ -1738,9 +1723,9 @@ components:
         (if supported) or "exclude_default" URI parameters was supplied in the request, the data in the response
         body shall have been transformed according to the rules specified in clauses 5.2.2 and 5.3.2 of
         ETSI GS NFV-SOL 013, respectively.
-        If the VNFM supports alternative 2 (paging) according to clause 5.4.7.2.1 of ETSI GS NFV-SOL 013
+        If the VNFM supports alternative 2 (paging) according to clause 5.4.2.1 of ETSI GS NFV-SOL 013
         for this resource, inclusion of the Link HTTP header in this response shall follow the provisions
-        in clause 4.7.2.3.5.4.2.3 of ETSI GS NFV-SOL 013.
+        in clause 5.4.2.3 of ETSI GS NFV-SOL 013.
       headers:
         WWW-Authenticate:
           description: |
@@ -3266,7 +3251,7 @@ components:
 
         Shall be returned when the state of the VNF lifecycle management operation occurrence
         has been changed successfully.
-        The response bofyshall include a representation of the "Individual VNF lifecycle operation occurrence" 
+        The response body shall include a representation of the "Individual VNF lifecycle operation occurrence" 
         resource.
       headers:
         WWW-Authenticate:
@@ -3641,9 +3626,9 @@ components:
         notification subscriptions as defined in clause 5.5.2.16.
         If the "filter" URI parameter was supplied in the request, the data in the response body shall have been
         transformed according to the rules specified in clause 5.2.2 of ETSI GS NFV-SOL 013.
-        If the VNFM supports alternative 2 (paging) according to clause 5.4.7.2.1 of ETSI GS NFV-SOL 013
+        If the VNFM supports alternative 2 (paging) according to clause 5.4.2.1 of ETSI GS NFV-SOL 013
         for this resource, inclusion of the Link HTTP header in this response shall follow the provisions
-        in clause 4.7.2.3.5.4.2.3 of ETSI GS NFV-SOL 013.
+        in clause 5.4.2.3 of ETSI GS NFV-SOL 013.
       headers:
         WWW-Authenticate:
           description: |
diff --git a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml
index 1da90b1dac8caafffc10227740bf155644ba334e..fc510f9d3599c5eeafd218d572083cd532d3c71f 100644
--- a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml
+++ b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml
@@ -42,7 +42,7 @@ definitions:
       instantiationLevelId:
         description: >
           Identifier of the instantiation level of the deployment
-          flavour to be instantiated. See note 3 and 5.
+          flavour to be instantiated. See notes 3 and 5.
         $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd"
       targetScaleLevelInfo:
         description: >
@@ -1027,6 +1027,16 @@ definitions:
               modules, the “scaleStatus” indicates the scale level that would be applicable to the aspect if a VNF LCM 
               operation changes the selected deployable modules and the related VNFCs are instantiated, unless the 
               VNF LCM operation explicitly indicates the scale level for the aspect.
+      NOTE 9: The recentVnfLcmOperationLinks attribute does not provide a complete historical record of LCM changes
+              that a VNF instance experienced during its lifecycle. The information in this attribute should not be used to
+              create a chronological order of events that cannot be inferred by looking only at the most recent operation
+              occurrences due to potential gaps in timeline. This is because there can be many possible combination of
+              LCM changes that a VNF may have gone through between two operation occurrences recorded in the
+              recentVnfLcmOperationLinks attribute. For example, there can be many scaling related LCM changes since
+              an individual VNF instance has been instantiated until the most recent scaling operation occurrence linked in
+              the attribute. In another example, the most recent LCM operation occurrence related to instantiate VNF
+              operation may be more recent than the one that caused the VNF instance to be terminated last time, which
+              prevents the possibility to create a meaningful chronological timeline of VNF LCM events.
     type: object
     required:
       - id
@@ -1183,6 +1193,12 @@ definitions:
             description: >
               The state of the VNF instance.
             $ref: "#/definitions/VnfOperationalStateType"
+          vnfPowerState:
+            description: >
+              The power state of the VNF instance. Only present if the VNF instance
+              is in a power state or a scale status (refer to attribute "scaleStatus")
+              that has an associated power profile, as defined in the VNFD.
+            $ref: "#/definitions/PowerStateInfo"
           scaleStatus:
             description: >
               Scale status of the VNF, one entry per aspect. Represents for every scaling aspect 
@@ -1442,7 +1458,82 @@ definitions:
               operation is possible based on the current status of this VNF instance resource
               (i.e. VNF instance is in INSTANTIATED state).
             $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link"
-
+      recentVnfLcmOperationLinks:
+        description: >
+          Links to the most recent LCM operation occurrences related to this resource. See note 9.
+        type: object
+        properties:
+          recentVnfLcmOperation:
+            description: >
+              Link to the most recent LCM operation occurrence of any type that has been triggered
+              on this VNF instance, such as Instantiate, Scale or Heal.
+            $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link"
+          recentVnfLcmInstantiation:
+            description: >
+              Link to the most recent LCM operation occurrence of type "INSTANTIATE" that has been
+              triggered on this VNF instance.
+            $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link"
+          recentVnfLcmScale:
+            description: >
+              Link to the most recent LCM operation occurrence of type "SCALE" that has been
+              triggered on this VNF instance.
+            $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link"
+          recentVnfLcmScaleToLevel:
+            description: >
+              Link to the most recent LCM operation occurrence of type "SCALE_TO_LEVEL" that has been
+              triggered on this VNF instance.
+            $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link"
+          recentVnfLcmChangeFlavour:
+            description: >
+              Link to the most recent LCM operation occurrence of type "CHANGE_FLAVOUR" that has been
+              triggered on this VNF instance.
+            $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link"
+          recentVnfLcmTerminate:
+            description: >
+              Link to the most recent LCM operation occurrence of type "TERMINATE" that has been
+              triggered on this VNF instance.
+            $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link"
+          recentVnfLcmHeal:
+            description: >
+              Link to the most recent LCM operation occurrence of type "HEAL" that has been
+              triggered on this VNF instance.
+            $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link"
+          recentVnfLcmOperate:
+            description: >
+              Link to the most recent LCM operation occurrence of type "OPERATE" that has been
+              triggered on this VNF instance.
+            $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link"
+          recentVnfLcmChangeExtConn:
+            description: >
+              Link to the most recent LCM operation occurrence of type "CHANGE_EXT_CONN"
+              that has been triggered on this VNF instance.
+            $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link"
+          recentVnfLcmModifyInfo:
+            description: >
+              Link to the most recent LCM operation occurrence of type "MODIFY_INFO"
+              that has been triggered on this VNF instance.
+            $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link"
+          recentVnfLcmCreateSnapshot:
+            description: >
+              Link to the most recent LCM operation occurrence of type "CREATE_SNAPSHOT"
+              that has been triggered on this VNF instance.
+            $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link"
+          recentVnfLcmRevertToSnapshot:
+            description: >
+              Link to the most recent LCM operation occurrence of type "REVERT_TO_SNAPSHOT"
+              that has been triggered on this VNF instance.
+            $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link"
+          recentVnfLcmChangeVnfPkg:
+            description: >
+              Link to the most recent LCM operation occurrence of type "CHANGE_VNFPKG"
+              that has been triggered on this VNF instance.
+            $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link"
+          recentVnfLcmSelectDplMods:
+            description: >
+              Link to the most recent LCM operation occurrence of type "SELECT_DEPL_MODS"
+              that has been triggered on this VNF instance.
+            $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link"
+          
   ExtManagedVirtualLinkInfo:
     description: >
       This type provides information about an externally-managed virtual link.
@@ -3331,14 +3422,15 @@ definitions:
     description: >
       This type represents request parameters for the "Scale VNF to Level" operation.
 
-      NOTE 1:	Either the instantiationLevelId attribute or the scaleInfo attribute shall 
-              be included.
-      NOTE 2: If the referenced instantiationLevel or the scaleInfo attribute contain information related to VNFCs that are not 
-              going to be instantiated due to the selection of deployable modules, the information is stored in the VNFM for 
-              later use and included in the instantiatedVnfInfo. If, during the lifecycle of the VNF, as a result of a change of 
-              the selected deployable modules any of those VNFCs is going to be instantiated, the stored information 
+      NOTE 1:	Either the instantiationLevelId attribute or the scaleInfo attribute or the powerProfileId attribute shall 
+              be included, but not multiple of them.
+      NOTE 2: If the referenced instantiationLevel, the scaleInfo or powerProfileId attribute contain information related to VNFCs 
+              that are not going to be instantiated due to the selection of deployable modules, the information is stored in the 
+              VNFM for later use and included in the instantiatedVnfInfo. If, during the lifecycle of the VNF, as a result of a 
+              change of the selected deployable modules any of those VNFCs is going to be instantiated, the stored information 
               determines the number of instances, unless the request that triggered the change also contains information 
               about the number of instances
+
     type: object
     anyOf:
       - oneOf:
@@ -3346,21 +3438,30 @@ definitions:
               - instantiationLevelId
           - required:
               - scaleInfo
+          - required:
+              - powerProfileId
     properties:
       instantiationLevelId:
         description: >
           Identifier of the target instantiation level of the current
           deployment flavour to which the VNF is requested to be scaled.
-          See note 1 and 2.
+          See notes 1 and 2.
         $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd"
       scaleInfo:
         description: >
           For each scaling aspect of the current deployment flavour, indicates
           the target scale level to which the VNF is to be scaled.
-          See note 1 and 2.
+          See notes 1 and 2.
         type: array
         items:
           $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ScaleInfo"
+      powerProfileId:
+        description: >
+          Identifier of the target power profile in the current deployment flavour, as
+          defined in the VNFD, from which the target power state can be selected and
+          be switched to.
+          See notes 1 and 2.
+        $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd"
       additionalParams:
         description: >
           Additional parameters passed by the NFVO as input to the scaling
@@ -3663,6 +3764,50 @@ definitions:
         items:
           type: string
 
+  CpSecurityGroupInfo:
+    description: >
+      This type provides the list of active security group rules applied to an external CP instance.
+      The type identifies which "SecurityGroupRule" specified in the VNFD are activated and the values
+      of its attributes.
+    type: object
+    required:
+      - securityGroupRuleId
+      - etherType
+      - protocol
+      - portRangeMin
+      - portRangeMax
+    properties:
+      securityGroupRuleId:
+        description: >
+          Identifier of the security group rule policy in the VNFD.
+        $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd"
+      description:
+        description: >
+          Human readable description of the security group rule.
+        type: string
+      etherType:
+        description: >
+          Indicates the protocol carried over the Ethernet layer.
+          Permitted values: IPV4, IPV6.
+        type: string
+        enum:
+          - IPV4
+          - IPV6
+      protocol:
+        description: >
+          Indicates the protocol carried over the IP layer.
+          Permitted values: any protocol defined in the IANA protocol
+          registry (refer to clause 9.10.1.2 ofd ETSI GS NFV-SOL 001 for further information).
+        type: string
+      portRangeMin:
+        description: >
+          Value for the minimum port number in the range that is matched by the security group rule.
+        type: integer
+      portRangeMax:
+        description: >
+          Value for the maximum port number in the range that is matched by the security group rule.
+        type: integer
+
   IpOverEthernetAddressInfo:
     description: >
       This type represents information about a network address that has been assigned.
@@ -3859,19 +4004,69 @@ definitions:
           notification is related to. Shall be present if there is a related
           lifecycle operation occurrence.
         $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/NotificationLink"
+  PowerStateInfo:
+    description: >
+      This type represents information about the power state of a VNF instance.
 
+    type: object
+    required:
+      - powerProfileId
+      - name
+    properties:
+      powerProfileId:
+         description: >
+           Identifier of the power profile, as defined in the VNFD,
+           applied to the VNF instance.
+         $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd"
+      name:
+         description: >
+           Name of the power profile as provided in the VNFD.
+         type: string
+      powerConsumptionInfo:
+         description: >
+           Estimated power consumption information of the resources
+           associated with this power profile, as provided in the VNFD.
+           VNFM exposes and can use this information to control the VNF
+           instance to operate according to the power profile and selected
+           power state, e.g. monitoring actual energy or power consumption
+           of the VNF instance and compare against the estimated one.
+         $ref: "#/definitions/PowerConsumptionInfo"
+
+  PowerConsumptionInfo:
+    description: >
+      This type represents information about estimated power consumption of the resources associated
+      with the power profile, as provided in the VNFD.
+    type: object
+    required:
+      - minPowerConsumption
+      - maxPowerConsumption
+      - averagePowerConsumption
+    properties:
+      minPowerConsumption:
+         description: >
+           Minimum power consumption of this power profile. Unit is KW/h.
+         type: integer
+      maxPowerConsumption:
+         description: >
+           Maximum power consumption of this power profile. Unit is KW/h.
+         type: integer
+      averagePowerConsumption:
+         description: >
+           Average power consumption of this power profile. Unit is KW/h.
+         type: integer
+         
   VnfExtCpInfo:
     description: >
       This type represents information about an external CP of a VNF.
 
-      NOTE 1:	The attributes "associatedVnfcCpId", "associatedVipCpId", "associatedVirtualCpId" and 
-              "associatedVnfVirtualLinkId" are mutually exclusive. Exactly one shall be present.
-      NOTE 2:	An external CP instance is not associated to a link port in the cases indicated for the 
-              “extLinkPorts” attribute in clause 4.4.1.11.
-      NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network 
-              attachment definition resource is needed to fulfil the connectivity requirements of the external 
-              CP, e.g. to build a link redundant mated pair in SR-IOV cases.
-      NOTE 4: When more than one netAttDefResourceId is indicated, all shall belong to the same namespace.
+      * NOTE 1:	The attributes "associatedVnfcCpId", "associatedVipCpId", "associatedVirtualCpId" and 
+                "associatedVnfVirtualLinkId" are mutually exclusive. Exactly one shall be present.
+      * NOTE 2:	An external CP instance is not associated to a link port in the cases indicated for the 
+                “extLinkPorts” attribute in clause 4.4.1.11.
+      * NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network 
+                attachment definition resource is needed to fulfil the connectivity requirements of the external 
+                CP, e.g. to build a link redundant mated pair in SR-IOV cases.
+      * NOTE 4: When more than one netAttDefResourceId is indicated, all shall belong to the same namespace.
     type: object
     required:
       - id
@@ -3962,6 +4157,11 @@ definitions:
         type: array
         items:
           $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier"
+      cpSecurityGroupInfo:
+        description: >
+          List of active security group rules applied to this external CP instance. The attribute identifies which
+          "SecurityGroupRule" specified in the VNFD are activated and the values of its attributes.
+        $ref: "#/definitions/CpSecurityGroupInfo"
   VnfOperationalStateType:
     description: >
       STARTED: The VNF instance is up and running.
@@ -4676,4 +4876,4 @@ definitions:
         description: >
           Name of an address pool from which an IP address is
           assigned to the virtual CP.
-        type: string
\ No newline at end of file
+        type: string
diff --git a/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml b/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml
index 4b0d443c7bb88277428130e15674fb98ed2c6f19..7805ae6e15e84fbecd1be0b86175200f8850c61f 100644
--- a/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml
+++ b/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml
@@ -16,11 +16,11 @@ info:
   license:
     name: "ETSI Forge copyright notice"
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: "2.15.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
+  version: "2.16.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
 
 externalDocs:
-  description: ETSI GS NFV-SOL 003 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.02.01_60/gs_NFV-SOL003v050201p.pdf
+  description: ETSI GS NFV-SOL 003 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.03.01_60/gs_NFV-SOL003v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/callback/v2
diff --git a/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml b/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml
index 3d76f1c52b82d7498978b38a89d2474bdb2e5033..1898a800c6c145adc20ea4d07f5d7899ec6ac0f3 100644
--- a/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml
+++ b/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml
@@ -19,8 +19,8 @@ info:
   version: "1.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
 
 externalDocs:
-  description: ETSI GS NFV-SOL 003 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.02.01_60/gs_NFV-SOL003v050201p.pdf
+  description: ETSI GS NFV-SOL 003 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.03.01_60/gs_NFV-SOL003v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/grant/v1
diff --git a/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml b/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml
index 57328f63809300b88a574efe62a492e9b5a9dd28..8d1461aa96088040899076c60831c20d1bc0a9dc 100644
--- a/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml
+++ b/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml
@@ -36,7 +36,7 @@ definitions:
       NOTE 7: The target size for VNF instantiation may be specified in either instantiationLevelId or
               targetScaleLevelInfo, but not both.
       NOTE 8: If targetScaleLevelInfo is specified, information provided in targetScaleLevelInfo shall be used for
-              scalable constituents of the VNF (e.g, VDUs/VLs) in the granting process. For scaling aspects not
+              scalable constituents of the VNF (e.g. VDUs/VLs) in the granting process. For scaling aspects not
               specified in targetScaleLevelInfo or for the VNF constituents (e.g.,VDUs/VLs) that are not scalable,
               the default instantiation level as declared in the VNFD shall be used in the granting process.
       NOTE 9: For resources related to a VDU that has the attribute isNumOfInstancesClusterBased set to TRUE, 
diff --git a/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml b/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml
index 5e7b0453da7d6f83e3e56e5ac0c345b31087d1a0..5e01052033564f7f9a2514ee78633ba6cec4f216 100644
--- a/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml
+++ b/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml
@@ -19,8 +19,8 @@ info:
   version: "2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
 
 externalDocs:
-  description: ETSI GS NFV-SOL 003 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.02.01_60/gs_NFV-SOL003v050201p.pdf
+  description: ETSI GS NFV-SOL 003 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.03.01_60/gs_NFV-SOL003v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/vnfpkgm/v2
@@ -104,8 +104,6 @@ paths:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/404"
         405:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/405"
-        416:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/416"
         500:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/500"
         503:
@@ -138,8 +136,6 @@ paths:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/405"
         406:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/406"
-        416:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/416"
         500:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/500"
         503:
@@ -176,8 +172,6 @@ paths:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/405"
         409:
           $ref: '#/components/responses/VnfdInIndividualVnfPackage.Get.409'
-        416:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/416"
         500:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/500"
         503:
@@ -211,8 +205,6 @@ paths:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/405"
         409:
           $ref: '#/components/responses/VnfdInIndividualOnboardedVnfPackage.Get.409'
-        416:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/416"
         500:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/500"
         503:
@@ -251,8 +243,6 @@ paths:
           $ref: '#/components/responses/ManifestInIndividualVnfPackage.Get.406'
         409:
           $ref: '#/components/responses/ManifestInIndividualVnfPackage.Get.409'
-        416:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/416"
         500:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/500"
         503:
@@ -288,8 +278,6 @@ paths:
           $ref: '#/components/responses/ManifestInIndividualOnboardedVnfPackage.Get.406'
         409:
           $ref: '#/components/responses/ManifestInIndividualOnboardedVnfPackage.Get.409'
-        416:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/416"
         500:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/500"
         503:
diff --git a/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml b/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml
index a3741db2157ec17855e47d3e7c71d1c6fcb284ca..69e0114e5daef5e1a2d334c8adb8c0a1ba19cf79 100644
--- a/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml
+++ b/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml
@@ -19,8 +19,8 @@ info:
   version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 003 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.02.01_60/gs_NFV-SOL003v050201p.pdf
+  description: ETSI GS NFV-SOL 003 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.03.01_60/gs_NFV-SOL003v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/callback/v2
diff --git a/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml b/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml
index 18dce358f3fc2ecf12883a0e15b1ff1fbbd817e9..a1bfad78920211a2c503a7732a0493982d47e641 100644
--- a/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml
+++ b/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml
@@ -19,8 +19,8 @@ info:
   version: 2.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 003 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.02.01_60/gs_NFV-SOL003v050201p.pdf
+  description: ETSI GS NFV-SOL 003 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.03.01_60/gs_NFV-SOL003v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/vnfpm/v2
diff --git a/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml b/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml
index a7c720ea6cde768e516af20bece246464bd9fc72..e8b6005bf055f7151362289c6a9c4b4112459494 100644
--- a/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml
+++ b/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml
@@ -19,8 +19,8 @@ info:
   version: 2.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 003 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.02.01_60/gs_NFV-SOL003v050201p.pdf
+  description: ETSI GS NFV-SOL 003 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.03.01_60/gs_NFV-SOL003v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/callback/v2
diff --git a/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml b/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml
index 9b84ddbce82c41eaf4d949d9baa98aff663b4743..ee501e82d5517c6b9ef41f066f2689016fa26ef6 100644
--- a/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml
+++ b/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml
@@ -19,8 +19,8 @@ info:
   version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 003 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.02.01_60/gs_NFV-SOL003v050201p.pdf
+  description: ETSI GS NFV-SOL 003 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.03.01_60/gs_NFV-SOL003v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/vnfsnapshotpkgm/v1
@@ -64,8 +64,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         406:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        416:
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         422:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         429:
@@ -103,8 +101,6 @@ paths:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
         406:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/406
-        416:
-          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/416
         422:
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/422
         429:
diff --git a/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml b/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml
index 935806ad780d65cc845a8d337bdf99e03940064f..3dcb66048124d730aaa49c231bcc1497562d0d8c 100644
--- a/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml
+++ b/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml
@@ -19,8 +19,8 @@ info:
   version: "1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
 
 externalDocs:
-  description: ETSI GS NFV-SOL 003 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.02.01_60/gs_NFV-SOL003v050201p.pdf
+  description: ETSI GS NFV-SOL 003 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.03.01_60/gs_NFV-SOL003v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/vrqan/v1