diff --git a/SOL002/VNFPerformanceManagement-API/ApiVersion.robot b/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
index 19cb6597b93d310da1209bfc73d2008ee8757e9f..359048058f864d71e7eb3f10eb3aee3b7272af92 100644
--- a/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
+++ b/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
@@ -11,7 +11,7 @@ POST API Version - Method not implemented
     ...    Test title: POST API version - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v3.5.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -23,7 +23,7 @@ GET API Version
     ...    Test title: GET API Version
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v3.5.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -36,7 +36,7 @@ PUT API Version - Method not implemented
     ...    Test title: PUT API Version - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v3.5.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -48,7 +48,7 @@ PATCH API Version - Method not implemented
     ...    Test title: PATCH API Version - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v3.5.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -60,7 +60,7 @@ DELETE API Version - Method not implemented
     ...    Test title: DELETE API Version - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v3.5.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -72,7 +72,7 @@ POST API Version with apiMajorVerion - Method not implemented
     ...    Test title: POST API version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v3.5.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -84,7 +84,7 @@ GET API Version with apiMajorVerion
     ...    Test title: GET API Version with apiMajorVerion
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v3.5.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -97,7 +97,7 @@ PUT API Version with apiMajorVerion - Method not implemented
     ...    Test title: PUT API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v3.5.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -109,7 +109,7 @@ PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test title: PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v3.5.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -121,7 +121,7 @@ DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test title: DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v3.5.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
index c76ccecc8ccdd37e09c86133b1aa0da20e86039d..4e73e9b703ddb1d2aa8ab85ea06d74fb7761d56b 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
@@ -13,12 +13,13 @@ GET individual VNF Performance Job
     ...    Test title: Get individual VNF Performance Job
     ...    Test objective: The objective is to test the retrieval of an individual VNF performance monitoring job and perform a JSON schema and content validation of the collected job data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
     GET individual VNF Performance Job
     Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Contains ETag and Last-Modified
     Check HTTP Response Body Json Schema Is   PmJob
     Check HTTP Response Body Pm Job Identifier matches the requested Pm Job
 
@@ -27,7 +28,7 @@ GET individual VNF Performance Job with invalid resource identifier
     ...    Test title: Get individual VNF Performance Job with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual VNF performance monitoring job fails when using an invalid resource identifier, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -40,7 +41,7 @@ DELETE Individual VNF Performance Job
     ...    Test title: Delete Individual VNF Performance Job
     ...    Test objective: The objective is to test the deletion of an individual VNF performance monitoring job
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Job is no more available in the VNFM    
@@ -53,7 +54,7 @@ DELETE Individual VNF Performance Job with invalid resource identifier
     ...    Test title: Delete individual VNF Performance Job with invalid resource identifier
     ...    Test objective: The objective is to test that the deletion of an individual VNF performance monitoring job fails when using an invalid resource identifier, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -66,7 +67,7 @@ POST Individual VNF Performance Job - Method not implemented
     ...    Test title: POST Individual VNF Performance Job - method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF Performance Monitoring Job
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -78,7 +79,7 @@ PUT Individual VNF Performance Job - Method not implemented
     ...    Test title: PUT Individual VNF Performance Job - method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF Performance Monitoring Job
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -90,12 +91,13 @@ PATCH Individual VNF Performance Job
     ...    Test title: PATCH Individual VNF Performance Job
     ...    Test objective: The objective is to test that PATCH method allows to modify an exsisting individual PM job resource.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
     Send Patch request for individual VNF Performance Job
     Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Contains ETag and Last-Modified
     Check HTTP Response Body Json Schema Is    PMJobModifications
     
 PATCH Individual VNF Performance Job - Precondition failed
@@ -103,7 +105,7 @@ PATCH Individual VNF Performance Job - Precondition failed
     ...    Test title: PATCH Individual VNF Performance Job - Precondition failed
     ...    Test objective: The objective is to attempt to Modify an individual alarm resource, where the precondition was not met
     ...    Pre-conditions:  A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  The VNF Performance Job is not modified by the operation
@@ -117,7 +119,7 @@ PATCH Individual VNF Performance Job - UNPROCESSIBLE ENTITY
     ...    Test title: PATCH Individual VNF Performance Job - UNPROCESSIBLE ENTITY
     ...    Test objective: The objective is to test that PATCH method cannot modify an exsisting individual PM job resource when the callback URI provided in the Request body is unreachable by the VNFM.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM cannot reach the Notification endpoint.
     ...    Post-Conditions: none
@@ -235,3 +237,10 @@ Check HTTP Response Body Json Schema Is
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
 
+Check HTTP Response Header Contains ETag and Last-Modified
+    Pass Execution If    ${HEADER_TEST_SUPPORTED} == 0    Headers testing not supported. Skipping the Test.
+    Log    ${response['headers']}
+    Should Contain    ${response['headers']}    Etag
+    Should Contain    ${response['headers']}    Last-Modified
+    Log    Etag and Last-Modified Headers are present
+
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualReport.robot b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
index 8ec2ab61ec568f5ea28665be3f1a552aeb6ceedf..716fdafd289e70905b93db8dbc012635e9e9050f 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
@@ -10,7 +10,7 @@ Get Individual Performance Report
     ...    Test title: Get Individual Performance Report
     ...    Test objective: The objective is to test the retrieval of an individual VNF performance report associated to a monitoring job and perform a JSON schema validation of the collected report data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
-    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -23,7 +23,7 @@ Get Individual Performance Report with invalid resource endpoint
     ...    Test title: Get Individual Performance Report with invalid resource endpoint
     ...    Test objective:  The objective is to test that the retrieval of an individual VNF performance report associated to a monitoring job fails when using an invalid resource endpoint 
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
-    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -36,7 +36,7 @@ POST Individual Performance Report - Method not implemented
     ...    Test title: POST Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF performance report within a monitoring job
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -48,7 +48,7 @@ PUT Individual Performance Report - Method not implemented
     ...    Test title: PUT Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF performance report within a monitoring job
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -60,7 +60,7 @@ PATCH Individual Performance Report - Method not implemented
     ...    Test title: PATCH Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing VNF performance report within a monitoring job
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -72,7 +72,7 @@ DELETE Individual Performance Report - Method not implemented
     ...    Test title: DELETE Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing VNF performance report within a monitoring job
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.4.3.5 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.4.3.5 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
index ef2e945afd1b9b31331350418190641279d7527f..593d3eb05c17a3baec9f7485d75d0532aa18d57b 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -12,12 +12,13 @@ GET Individual Threshold
     ...    Test title: GET Individual Threshold
     ...    Test objective: The objective is to test the retrieval of an individual VNF performance threshold and perform a JSON schema and content validation of the collected threshold data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
     GET individual VNF Performance Threshold
     Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Contains ETag and Last-Modified
     Check HTTP Response Body Json Schema Is   Threshold
     Check HTTP Response Body Threshold Identifier matches the requested Threshold
 
@@ -26,7 +27,7 @@ GET Individual Threshold with invalid resource identifier
     ...    Test title: GET Individual Threshold with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual VNF performance threshold fails when using an invalid resource identifier
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +40,7 @@ DELETE Individual Threshold
     ...    Test title: DELETE Individual Threshold
     ...    Test objective: The objective is to test the deletion of an individual VNF performance threshold
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Threshold is not available anymore in the VNFM    
@@ -52,7 +53,7 @@ DELETE Individual Threshold with invalid resource identifier
     ...    Test title: DELETE Individual Threshold with invalid resource identifier
     ...    Test objective: The objective is to test the deletion of an individual VNF performance threshold
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -65,7 +66,7 @@ POST Individual Threshold - Method not implemented
     ...    Test title: POST Individual Threshold - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF Performance Threshold
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Threshold is not created on the VNFM
@@ -77,7 +78,7 @@ PUT Individual Threshold - Method not implemented
     ...    Test title: PUT Individual Threshold - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF Performance threshold
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -89,12 +90,13 @@ PATCH Individual Threshold
     ...    Test title: PATCH Individual Threshold 
     ...    Test objective: The objective is to test that PATCH method allows to modify an Individual threshold resource.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Threshold is not modified by the operation
     Send Patch request for individual VNF Performance Threshold
     Check HTTP Response Status Code Is    200
+    Check HTTP Response Header Contains ETag and Last-Modified
     Check HTTP Response Body Json Schema Is    ThresholdModifications
        
 PATCH Individual Threshold - Precondition failed
@@ -102,7 +104,7 @@ PATCH Individual Threshold - Precondition failed
     ...    Test title: PATCH Individual Threshold - Preconition failed
     ...    Test objective: The objective is to attempt to modify an individual threshold resource, where the precondition was not met.
     ...    Pre-conditions:  A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  The VNF Performance Job is not modified by the operation
@@ -116,7 +118,7 @@ PATCH Individual Threshold - Unprocessible Entity
     ...    Test title: PATCH Individual Threshold - Unprocessible Entity 
     ...    Test objective: The objective is to test that PATCH method cannot modify an exsisting individual PM job resource when the callback URI provided in the Request body is unreachable by the VNFM.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM cannot reach the Notification endpoint.
     ...    Post-Conditions: The VNF Performance Threshold is not modified by the operation
@@ -234,4 +236,9 @@ Check HTTP Response Body Json Schema Is
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
 
-
+Check HTTP Response Header Contains ETag and Last-Modified
+    Pass Execution If    ${HEADER_TEST_SUPPORTED} == 0    Headers testing not supported. Skipping the Test.
+    Log    ${response['headers']}
+    Should Contain    ${response['headers']}    Etag
+    Should Contain    ${response['headers']}    Last-Modified
+    Log    Etag and Last-Modified Headers are present
diff --git a/SOL002/VNFPerformanceManagement-API/NotificationEndpoint.robot b/SOL002/VNFPerformanceManagement-API/NotificationEndpoint.robot
index 0c4226b666d099c6844c80f6a57bbbab6ebb17e3..c18e20f2c52dc62639adc33534825610cc65f373 100644
--- a/SOL002/VNFPerformanceManagement-API/NotificationEndpoint.robot
+++ b/SOL002/VNFPerformanceManagement-API/NotificationEndpoint.robot
@@ -13,7 +13,7 @@ VNF Performance Information Availability Notification
     ...    Test title: VNF Performance Information Availability Notification
     ...    Test objective: The objective is to test that VNF Performance Information Availability Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A VNF performance job is created, and a subscription for information availability notifications is available in the VNFM.
-    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -25,7 +25,7 @@ VNF Threshold Crossed Notification
     ...    Test title: VNF Threshold Crossed Notification
     ...    Test objective: The objective is to test that VNF Threshold Crossed Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A VNF performance job is created, and a subscription for Threshold Crossed Notification is available in the VNFM.
-    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFPerformanceManagement-API/PMJobs.robot b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
index af2ce1fa4e597f94240383ddce98a632149f8c97..e1a52d741fa5d0c4a76a8858eb6412becfd20473 100644
--- a/SOL002/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
@@ -12,7 +12,7 @@ GET all VNF Performance Monitoring Jobs
     ...    Test title: GET all VNF Performance Monitoring Jobs
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance monitoring jobs and perform a JSON schema and content validation of the collected jobs data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ GET VNF Performance Monitoring Jobs with attribute-based filter
     ...    Test title: GET all VNF Performance Monitoring Jobs with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of VNF performance monitoring jobs using attribute-based filter, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued attribute-based filter
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +39,7 @@ GET all VNF Performance Monitoring Jobs with all_fields attribute selector
     ...    Test title: GET all VNF Performance Monitoring Jobs with all_fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs all_fields attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued all_fileds selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -53,7 +53,7 @@ GET all VNF Performance Monitoring Jobs with exclude_default attribute selector
     ...    Test title: GET all VNF Performance Monitoring Jobs with exclude_default attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs exclude_default attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued exclude_default selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -67,7 +67,7 @@ GET all VNF Performance Monitoring Jobs with fields attribute selector
     ...    Test title: GET all VNF Performance Monitoring Jobs with fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs fields attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued fields selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM supports the use of exclude_fields attribute selector
     ...    Post-Conditions: none
@@ -81,7 +81,7 @@ GET all VNF Performance Monitoring Jobs with exclude_fields attribute selector
     ...    Test title: GET all VNF Performance Monitoring Jobs with exclude_fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs exclude_fields attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued exclude_fields selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM supports the use of exclude_fields attribute selector
     ...    Post-Conditions: none
@@ -95,7 +95,7 @@ GET VNF Performance Monitoring Jobs with invalid attribute-based filter
     ...    Test title: GET VNF Performance Monitoring Jobs with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of VNF performance monitoring jobs fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -108,7 +108,7 @@ GET VNF Performance Monitoring Jobs with invalid resource endpoint
     ...    Test title: GET VNF Performance Monitoring Jobs with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of VNF performance monitoring jobs fails when using invalid resource endpoint, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -121,7 +121,7 @@ POST Create new VNF Performance Monitoring Job - SUCCESSFUL
     ...    Test title:  POST Create a new VNF Performance Monitoring Job - SUCCESSFUL
     ...    Test objective: The objective is to test that the POST method creates a new VNF performance monitoring job and perform the JSON schema validation of the returned job data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Job is successfully created on the VNFM
@@ -135,7 +135,7 @@ PUT all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test title: PUT all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF Performance Monitoring Jobs
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -147,7 +147,7 @@ PATCH all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test title: PATCH all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF Performance Monitoring Jobs
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -159,7 +159,7 @@ DELETE all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test title: DELETE all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to update VNF Performance Monitoring Jobs
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -171,7 +171,7 @@ GET VNF Performance Monitoring Jobs to get Paged Response
     ...    Test title: GET VNF Performance Monitoring Jobs to get Paged Response
     ...    Test objective: The objective is to test the retrieval of VNF performance monitoring jobs to get Paged response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -184,7 +184,7 @@ GET VNF Performance Monitoring Jobs for Bad Request Response too big
     ...    Test title: GET VNF Performance Monitoring Jobs for Bad Request Response too big
     ...    Test objective: The objective is to test that GET method fail retrieving status information about VNF Performance Monitoring when Response is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -197,7 +197,7 @@ GET all VNF Performance Monitoring Jobs with exclude_default and fields attribut
     ...    Test title: GET all VNF Performance Monitoring Jobs with exclude_default and fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs with exclude_default and fields attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued exclude_default selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -210,7 +210,7 @@ POST Create new VNF Performance Monitoring Job - UNPROCESSIBLE ENTITY
     ...    Test title:  POST Create a new VNF Performance Monitoring Job - UNPROCESSIBLE ENTITY
     ...    Test objective: The objective is to test that the POST method cannot create a new VNF performance monitoring job when the callback URI provided in the Request body is unreachable by the VNFM.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM cannot reach the Notification endpoint.
     ...    Post-Conditions: none
diff --git a/SOL002/VNFPerformanceManagement-API/Thresholds.robot b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
index 0c5343f2d088a85de3e6bc1ccaacbef337eaf0f8..6fba18cd26767360867979ccf358dcc4f263fc96 100644
--- a/SOL002/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
@@ -12,7 +12,7 @@ GET All Performance Thresholds
     ...    Test title: GET All Performance Thresholds
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance thresholds and perform a JSON schema validation of the collected thresholds data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ GET Performance Thresholds with attribute-based filter
     ...    Test title: GET Performance Thresholds with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance thresholds when using attribute-based filters, perform a JSON schema validation of the collected thresholds data structure, and verify that the retrieved information matches the issued attribute-based filter
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +39,7 @@ GET Performance Thresholds with invalid attribute-based filter
     ...    Test title: GET Performance Thresholds with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of VNF performance thresholds fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -52,7 +52,7 @@ GET Performance Thresholds with invalid resource endpoint
     ...    Test title: GET Performance Thresholds with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of VNF performance thresholds fails when using invalid resource endpoint, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -65,7 +65,7 @@ POST Create new Performance Threshold
     ...    Test title:  POST Create new Performance Threshold
     ...    Test objective: The objective is to test that the POST method creates a new VNF performance threshold and perform the JSON schema validation of the returned threshold data structure
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Threshold is successfully created on the VNFM
@@ -80,7 +80,7 @@ PUT Performance Thresholds - Method not implemented
     ...    Test title: PUT Performance Thresholds - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF Performance Thresholds
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -92,7 +92,7 @@ PATCH Performance Thresholds - Method not implemented
     ...    Test title: PATCH Performance Thresholds - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify VNF Performance Thresholds
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -104,7 +104,7 @@ DELETE Performance Thresholds - Method not implemented
     ...    Test title: DELETE Performance Thresholds - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to update VNF Performance Thresholds
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -116,7 +116,7 @@ GET Performance Thresholds with Paged Response
     ...    Test title: GET Performance Thresholds with Paged Response
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance thresholds with Paged response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -129,7 +129,7 @@ GET Performance Thresholds for Bad Request Response too big
     ...    Test title: GET Performance Thresholds for Bad Request Response too big
     ...    Test objective: The objective is to test that the retrieval of VNF performance thresholds fails when response is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -142,7 +142,7 @@ POST Create new Performance Threshold - UNPROCESSIBLE ENTITY
     ...    Test title:  POST Create new Performance Threshold
     ...    Test objective: The objective is to test that the POST method does not create a new VNF performance threshold when the callback URI provided in the Request body is unreachable by the VNFM.
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM cannot reach the Notification endpoint.
     ...    Post-Conditions: none
diff --git a/SOL002/VNFPerformanceManagement-API/environment/variables.txt b/SOL002/VNFPerformanceManagement-API/environment/variables.txt
index 0eedfd4a5e0a90732b356e41fc47d96d5c5e620c..927b59b9ba51b41e781bb8415b9b753db8eafd93 100644
--- a/SOL002/VNFPerformanceManagement-API/environment/variables.txt
+++ b/SOL002/VNFPerformanceManagement-API/environment/variables.txt
@@ -16,6 +16,8 @@ ${AUTHORIZATION_HEADER}    Authorization
 ${AUTHORIZATION_TOKEN}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
 ${AUTH_USAGE}    1
 
+${HEADER_TEST_SUPPORTED}    0
+
 ${VNFM_CHECKS_NOTIF_ENDPOINT}    1
 ${callback_uri}    http://localhost
 ${unreachable_callback_uri}    http://not-reachable-uri
diff --git a/SOL002/VNFPerformanceManagement-API/schemas/PMJobModifications.json b/SOL002/VNFPerformanceManagement-API/schemas/PMJobModifications.json
index 7a09620564f077ebb19981dd44bb3d3df07aa67c..10a10761ddc321fb8500d785727f5ad4b8c20a0c 100644
--- a/SOL002/VNFPerformanceManagement-API/schemas/PMJobModifications.json
+++ b/SOL002/VNFPerformanceManagement-API/schemas/PMJobModifications.json
@@ -1,62 +1,75 @@
- {
-    "description": "This type represents modifications to a PM job. It shall comply with the provisions defined in table 6.5.2.12-1.\n",
-    "type": "object",
-    "properties": {
-      "callbackUri": {
-        "description": "String formatted according to IETF RFC 3986.\n",
-        "type": "string"
-      },
-      "authentication": {
-        "type": "object",
-        "required": [
-          "authType"
-        ],
-        "properties": {
-          "authType": {
-            "description": "Defines the types of Authentication / Authorization which the API consumer is willing to accept when receiving a notification. Permitted values: * BASIC: In every HTTP request to the notification endpoint, use\n  HTTP Basic authentication with the client credentials. \n* OAUTH2_CLIENT_CREDENTIALS: In every HTTP request to the\n  notification endpoint, use an OAuth 2.0 Bearer token, obtained\n  using the client credentials grant type.\n* TLS_CERT: Every HTTP request to the notification endpoint is sent\n  over a mutually authenticated TLS session, i.e. not only the\n  server is authenticated, but also the client is authenticated\n  during the TLS tunnel setup.\n",
-            "type": "array",
-            "items": {
-              "type": "string",
-              "enum": [
-                "BASIC",
-                "OAUTH2_CLIENT_CREDENTIALS",
-                "TLS_CERT"
-              ]
-            }
-          },
-          "paramsBasic": {
-            "description": "Parameters for authentication/authorization using BASIC. Shall be present if authType is \"BASIC\" and the contained information has not been provisioned out of band. Shall be absent otherwise.\n",
-            "type": "object",
-            "properties": {
-              "userName": {
-                "description": "Username to be used in HTTP Basic authentication. Shall be present if it has not been provisioned out of band.\n",
-                "type": "string"
-              },
-              "password": {
-                "description": "Password to be used in HTTP Basic authentication. Shall be present if it has not been provisioned out of band.\n",
-                "type": "string"
-              }
+{
+  "description": "This type represents modifications to a PM job.\nNOTE:\tAt least one of the attributes defined in this type shall be present in request bodies.\n",
+  "type": "object",
+  "oneOf": [
+    {
+      "required": [
+        "callbackUri"
+      ]
+    },
+    {
+      "required": [
+        "authentication"
+      ]
+    }
+  ],
+  "properties": {
+    "callbackUri": {
+      "description": "String formatted according to IETF RFC 3986.\n",
+      "type": "string"
+    },
+    "authentication": {
+      "description": "* NOTE: The clientId and clientPassword passed in a subscription shall not be the same as the clientId and\n        clientPassword that are used to obtain authorization for API requests. Client credentials may differ between\n        subscriptions. The value of clientPassword should be generated by a random process\n",
+      "type": "object",
+      "required": [
+        "authType"
+      ],
+      "properties": {
+        "authType": {
+          "description": "Defines the types of Authentication / Authorization which the API consumer is willing to accept when receiving a notification. Permitted values: * BASIC: In every HTTP request to the notification endpoint, use\n  HTTP Basic authentication with the client credentials. \n* OAUTH2_CLIENT_CREDENTIALS: In every HTTP request to the\n  notification endpoint, use an OAuth 2.0 Bearer token, obtained\n  using the client credentials grant type.\n* TLS_CERT: Every HTTP request to the notification endpoint is sent\n  over a mutually authenticated TLS session, i.e. not only the\n  server is authenticated, but also the client is authenticated\n  during the TLS tunnel setup.\n",
+          "type": "array",
+          "items": {
+            "type": "string",
+            "enum": [
+              "BASIC",
+              "OAUTH2_CLIENT_CREDENTIALS",
+              "TLS_CERT"
+            ]
+          }
+        },
+        "paramsBasic": {
+          "description": "Parameters for authentication/authorization using BASIC. Shall be present if authType is \"BASIC\" and the contained information has not been provisioned out of band. Shall be absent otherwise.\n",
+          "type": "object",
+          "properties": {
+            "userName": {
+              "description": "Username to be used in HTTP Basic authentication. Shall be present if it has not been provisioned out of band.\n",
+              "type": "string"
+            },
+            "password": {
+              "description": "Password to be used in HTTP Basic authentication. Shall be present if it has not been provisioned out of band.\n",
+              "type": "string"
             }
-          },
-          "paramsOauth2ClientCredentials": {
-            "description": "Parameters for authentication/authorization using OAUTH2_CLIENT_CREDENTIALS. Shall be present if authType is \"OAUTH2_CLIENT_CREDENTIALS\" and the contained information has not been provisioned out of band. Shall be absent otherwise.\n",
-            "type": "object",
-            "properties": {
-              "clientId": {
-                "description": "Client identifier to be used in the access token request of the OAuth 2.0 client credentials grant type.  Shall be present if it has not been provisioned out of band. The clientId and clientPassword passed in a subscription shall not be the same as the clientId and clientPassword that are used to obtain authorization for API requests. Client credentials may differ between subscriptions. The value of clientPassword should be generated by a random process.\n",
-                "type": "string"
-              },
-              "clientPassword": {
-                "description": "Client password to be used in the access token request of the OAuth 2.0 client credentials grant type.  Shall be present if it has not been provisioned out of band. The clientId and clientPassword passed in a subscription shall not be the same as the clientId and clientPassword that are used to obtain authorization for API requests. Client credentials may differ between subscriptions. The value of clientPassword should be generated by a random process.\n",
-                "type": "string"
-              },
-              "tokenEndpoint": {
-                "description": "String formatted according to IETF RFC 3986.\n",
-                "type": "string"
-              }
+          }
+        },
+        "paramsOauth2ClientCredentials": {
+          "description": "Parameters for authentication/authorization using OAUTH2_CLIENT_CREDENTIALS. Shall be present if authType is \"OAUTH2_CLIENT_CREDENTIALS\" and the contained information has not been provisioned out of band. Shall be absent otherwise.\n",
+          "type": "object",
+          "properties": {
+            "clientId": {
+              "description": "Client identifier to be used in the access token request of the OAuth 2.0 client credentials grant type.  Shall be present if it has not been provisioned out of band. See note.\n",
+              "type": "string"
+            },
+            "clientPassword": {
+              "description": "Client password to be used in the access token request of the OAuth 2.0 client credentials grant type.  Shall be present if it has not been provisioned out of band. See note.\n",
+              "type": "string"
+            },
+            "tokenEndpoint": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
             }
           }
         }
       }
     }
-  }
\ No newline at end of file
+  }
+}
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/schemas/PerformanceReport.schema.json b/SOL002/VNFPerformanceManagement-API/schemas/PerformanceReport.schema.json
index c0a9c444eb6cf2ac6e2a8b8800cccc857683a336..f499d9f467798bcf824e6828160b8b313fd3458d 100644
--- a/SOL002/VNFPerformanceManagement-API/schemas/PerformanceReport.schema.json
+++ b/SOL002/VNFPerformanceManagement-API/schemas/PerformanceReport.schema.json
@@ -1 +1,66 @@
-{  "description": "This type defines the format of a performance report provided by the VNFM to the NFVO as a result of collecting performance information as part of a PM job.\n",  "type": "object",  "properties": {    "entries": {      "description": "List of performance information entries. Each performance report entry is for a given metric of a given object (i.e. VNF instance), but can include multiple collected values.\n",      "type": "array",      "items": {        "type": "object",        "required": [          "objectType",          "objectInstanceId",          "performanceMetric",          "performanceValue"        ],        "properties": {          "objectType": {            "description": "Defines the object type for which performance information is reported (i.e. VNF type). The string value shall be set to the vnfdId of the VNF instance to which the performance information relates.\n",            "type": "string"          },          "objectInstanceId": {            "description": "An identifier with the intention of being globally unique.\n",            "type": "string"          },          "performanceMetric": {            "description": "Name of the metric collected.\n",            "type": "string"          },          "performanceValues": {            "description": "List of performance values with associated timestamp.\n",            "type": "array",            "items": {              "type": "object",              "required": [                "timeStamp",                "performanceValue"              ],              "properties": {                "timeStamp": {                  "description": "Date-time stamp.  Representation: String formatted according to IETF RFC 3339.\n",                  "type": "string",                  "format": "date-time"                },                "value": {                  "description": "Value of the metric collected. The type of the \"value\" attribute (i.e. scalar, structure (Object in JSON), or array (of scalars, arrays or structures / Objects)) is assumed to be defined in the external measurement specification (see ETSI GS NFV-IFA 027).\n",                  "type": "object"                }              }            }          }        }      }    }  }}
\ No newline at end of file
+{
+    "description": "This type defines the format of a performance report provided by the VNFM to the NFVO as a result of collecting  performance information as part of a PM job.\nNOTE:\tThe sub-object allows to structure the measured object but is not to be confused with sub-counters which allow \n      to structure the measurement value.\n\nEXAMPLE:\n  Measured object: VnfInstanceXYZ\n  Sub-object: VnfcInstance1\n  Measurement: vCPU_utilization\n  Sub-counters: vCPU utilization of each of the vCPUs of VnfcInstance1 (vCPU utilization.vCPU1, vCPU_utilization.vCPU2, etc.).\n",
+    "type": "object",
+    "required": [
+        "entries"
+    ],
+    "properties": {
+        "entries": {
+            "description": "List of performance information entries. Each performance report entry is for a given metric of a given object (i.e. VNF instance), but can include multiple collected values.\n",
+            "type": "array",
+            "items": {
+                "type": "object",
+                "required": [
+                    "objectType",
+                    "objectInstanceId",
+                    "performanceMetric",
+                    "performanceValue"
+                ],
+                "properties": {
+                    "objectType": {
+                        "description": "Type of the measured object. The applicable measured object type for a measurement is defined in clause 7.2 of ETSI GS NFV-IFA 027.\n",
+                        "type": "string"
+                    },
+                    "objectInstanceId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                    },
+                    "subObjectInstanceId": {
+                        "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                        "type": "string"
+                    },
+                    "performanceMetric": {
+                        "description": "Name of the metric collected. This attribute shall contain the related \"Measurement Name\" value as defined in clause 7.2 of ETSI GS NFV-IFA 027.\n",
+                        "type": "string"
+                    },
+                    "performanceValues": {
+                        "description": "List of performance values with associated timestamp.\n",
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "required": [
+                                "timeStamp",
+                                "value"
+                            ],
+                            "properties": {
+                                "timeStamp": {
+                                    "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+                                    "type": "string",
+                                    "format": "date-time"
+                                },
+                                "value": {
+                                    "description": "Value of the metric collected. The type of this attribute shall correspond to the related \"Measurement Unit\" as defined in clause 7.2. of ETSI GS NFV-IFA 027.\n",
+                                    "type": "object"
+                                },
+                                "context": {
+                                    "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+                                    "type": "object"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/schemas/PmJob.schema.json b/SOL002/VNFPerformanceManagement-API/schemas/PmJob.schema.json
index 65121412dcdc18bd63c0b3ddf837a3da8073a8d7..2ababaaeadfb3f935aa5279aa53f74b7c601dbdf 100644
--- a/SOL002/VNFPerformanceManagement-API/schemas/PmJob.schema.json
+++ b/SOL002/VNFPerformanceManagement-API/schemas/PmJob.schema.json
@@ -1 +1,153 @@
-{  "description": "This type represents a PM job.\n",  "type": "object",  "required": [    "id",    "objectInstanceIds",    "criteria"  ],  "properties": {    "id": {      "description": "An identifier with the intention of being globally unique.\n",      "type": "string"    },    "objectInstanceIds": {      "description": "Identifiers of the VNF instances for which performance information is collected.\n",      "type": "array",      "items": {        "description": "An identifier with the intention of being globally unique.\n",        "type": "string"      }    },    "criteria": {      "description": "Criteria of the collection of performance information.\n",      "type": "object",      "required": [        "collectionPeriod",        "reportingPeriod"      ],      "properties": {        "performanceMetric": {          "description": "This defines the types of performance metrics for the specified object instances, as specified in ETSI GS NFV-IFA 027). At least one of the two attributes (performance metric or group) shall be present.\n",          "type": "array",          "items": {            "type": "string"          }        },        "performanceMetricGroup": {          "description": "Group of performance metrics. A metric group is a pre-defined list of metrics, known to the producer that it can decompose to individual metrics. At least one of the two attributes (performance metric or group) shall be present.\n",          "type": "array",          "items": {            "type": "string"          }        },        "collectionPeriod": {          "description": "Specifies the periodicity at which the producer will collect performance information. The unit shall be seconds. At the end of each reportingPeriod, the producer will inform the consumer about availability of the performance data collected for each completed collection period during this reportingPeriod. The reportingPeriod should be equal to or a multiple of the collectionPeriod. In the latter case, the performance data for the collection periods within one reporting period are reported together.\n",          "type": "integer"        },        "reportingPeriod": {          "description": "Specifies the periodicity at which the producer will report to the consumer. about performance information. The unit shall be seconds. At the end of each reportingPeriod, the producer will inform the consumer about availability of the performance data collected for each completed collection period during this reportingPeriod. The reportingPeriod should be equal to or a multiple of the collectionPeriod. In the latter case, the performance data for the collection periods within one reporting period are reported together.\n",          "type": "integer"        },        "reportingBoundary": {          "description": "Date-time stamp.  Representation: String formatted according to IETF RFC 3339.\n",          "type": "string",          "format": "date-time"        }      }    },    "reports": {      "description": "Information about available reports collected by this PM job.\n",      "type": "object",      "required": [        "href",        "readyTime",        "_links"      ],      "properties": {        "href": {          "description": "The Uri where the report can be obtained.\n",          "type": "string",          "format": "url"        },        "readyTime": {          "description": "Date-time stamp.  Representation: String formatted according to IETF RFC 3339.\n",          "type": "string",          "format": "date-time"        },        "expiryTime": {          "description": "Date-time stamp.  Representation: String formatted according to IETF RFC 3339.\n",          "type": "string",          "format": "date-time"        },        "fileSize": {          "description": "The size of the report file in bytes, if known.\n",          "type": "integer"        },        "_links": {          "description": "Links for this resource.\n",          "type": "object",          "required": [            "self"          ],          "properties": {            "self": {              "description": "This type represents a link to a resource.\n",              "type": "object",              "required": [                "href"              ],              "properties": {                "href": {                  "description": "URI of the referenced resource.\n",                  "type": "string",                  "format": "url"                }              }            },            "objects": {              "description": "Links to resources representing the VNF instances for which performance information is collected. Shall be present if the VNF instance information is accessible as a resource.\n",              "type": "array",              "items": {                "description": "This type represents a link to a resource.\n",                "type": "object",                "required": [                  "href"                ],                "properties": {                  "href": {                    "description": "URI of the referenced resource.\n",                    "type": "string",                    "format": "url"                  }                }              }            }          }        }      }    }  }}
\ No newline at end of file
+{
+    "description": "This type represents a PM job.\n",
+    "type": "object",
+    "required": [
+      "id",
+      "objectType",
+      "objectInstanceIds",
+      "criteria",
+      "callbackUri",
+      "_links"
+    ],
+    "properties": {
+      "id": {
+        "description": "An identifier with the intention of being globally unique.\n",
+        "type": "string"
+      },
+      "objectType": {
+        "description": "Type of the measured object. The applicable measured object type for a measurement is defined in clause 7.2 of ETSI GS NFV-IFA 027.\n",
+        "type": "string"
+      },
+      "objectInstanceIds": {
+        "description": "Identifiers of the VNF instances for which performance information is collected.\n",
+        "type": "array",
+        "items": {
+          "description": "An identifier with the intention of being globally unique.\n",
+          "type": "string"
+        }
+      },
+      "subObjectInstanceIds": {
+        "description": "Identifiers of the sub-object instances of the measured object instance for which performance information is requested to be collected. May be present if a sub-object is defined in clause 6.2 of ETSI GS NFV-IFA 027 for the related measured object type. If this attribute is present, the cardinality of the \"objectInstanceIds\" attribute shall be 1. If this attribute is absent and a sub-object is defined in clause 6.2 of ETSI GS NFV IFA 027 for the related measured object type, measurements will be taken for all sub-object instances of the measured object instance.\n",
+        "type": "array",
+        "items": {
+          "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+          "type": "string"
+        }
+      },
+      "criteria": {
+        "description": "This type represents collection criteria for PM jobs.\nNOTE 1:\tAt the end of each reportingPeriod, the API producer will inform the API consumer about availability of the \n        performance data collected for each completed collection period during this reportingPeriod. \n        The reportingPeriod should be equal to or a multiple of the collectionPeriod. In the latter case, the performance \n        data for the collection periods within one reporting period are reported together.\nNOTE 2:\tIn particular when choosing short collection and reporting periods, the number of PM jobs that can be supported \n        depends on the capability of the producing entity.\n",
+        "type": "object",
+        "required": [
+          "collectionPeriod",
+          "reportingPeriod"
+        ],
+        "properties": {
+          "performanceMetric": {
+            "description": "This defines the types of performance metrics for the specified object instances. Valid values are specified as \"Measurement Name\" values in clause 7.2 of ETSI GS NFV-IFA 027. At least one of the two attributes (performance metric or group) shall be present.\n",
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "performanceMetricGroup": {
+            "description": "Group of performance metrics. A metric group is a pre-defined list of metrics, known to the API producer that it can decompose to individual metrics. Valid values are specified as \"Measurement Group\" values in clause 7.2 of ETSI GS NFV-IFA 027. At least one of the two attributes (performance metric or group) shall be present.\n",
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "collectionPeriod": {
+            "description": "SSpecifies the periodicity at which the API producer will collect performance information.  The unit shall be seconds. See notes 1 and 2.\n",
+            "type": "integer",
+            "minimum": 0,
+            "maximum": 1024
+          },
+          "reportingPeriod": {
+            "description": "Specifies the periodicity at which the API producer will report to the API consumer  about performance information. The unit shall be seconds. See notes 1 and 2.\n",
+            "type": "integer",
+            "minimum": 0,
+            "maximum": 1024
+          },
+          "reportingBoundary": {
+            "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+            "type": "string",
+            "format": "date-time"
+          }
+        }
+      },
+      "callbackUri": {
+        "description": "String formatted according to IETF RFC 3986.\n",
+        "type": "string"
+      },
+      "reports": {
+        "description": "Information about available reports collected by this PM job.\n",
+        "type": "object",
+        "required": [
+          "href",
+          "readyTime"
+        ],
+        "properties": {
+          "href": {
+            "description": "The URI where the report can be obtained.\n",
+            "type": "string",
+            "format": "url"
+          },
+          "readyTime": {
+            "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+            "type": "string",
+            "format": "date-time"
+          },
+          "expiryTime": {
+            "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+            "type": "string",
+            "format": "date-time"
+          },
+          "fileSize": {
+            "description": "The size of the report file in bytes, if known.\n",
+            "type": "integer",
+            "minimum": 0,
+            "maximum": 1024
+          }
+        }
+      },
+      "_links": {
+        "description": "Links for this resource.\n",
+        "type": "object",
+        "required": [
+          "self"
+        ],
+        "properties": {
+          "self": {
+            "description": "This type represents a link to a resource using an absolute URI.\n",
+            "type": "object",
+            "required": [
+              "href"
+            ],
+            "properties": {
+              "href": {
+                "description": "String formatted according to IETF RFC 3986.\n",
+                "type": "string"
+              }
+            }
+          },
+          "objects": {
+            "description": "Links to resources representing the measure object instances for which performance information is collected. Shall be present if the measured object instance information is accessible as a resource.\n",
+            "type": "array",
+            "items": {
+              "description": "This type represents a link to a resource using an absolute URI.\n",
+              "type": "object",
+              "required": [
+                "href"
+              ],
+              "properties": {
+                "href": {
+                  "description": "String formatted according to IETF RFC 3986.\n",
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/schemas/PmJobs.schema.json b/SOL002/VNFPerformanceManagement-API/schemas/PmJobs.schema.json
index 654acdcf1f41f72b24464e32472a944bbf422120..a623a448c959cb7f17b33a4a388e8eff18ee57f2 100644
--- a/SOL002/VNFPerformanceManagement-API/schemas/PmJobs.schema.json
+++ b/SOL002/VNFPerformanceManagement-API/schemas/PmJobs.schema.json
@@ -5,14 +5,21 @@
     "type": "object",
     "required": [
       "id",
+      "objectType",
       "objectInstanceIds",
-      "criteria"
+      "criteria",
+      "callbackUri",
+      "_links"
     ],
     "properties": {
       "id": {
         "description": "An identifier with the intention of being globally unique.\n",
         "type": "string"
       },
+      "objectType": {
+        "description": "Type of the measured object. The applicable measured object type for a measurement is defined in clause 7.2 of ETSI GS NFV-IFA 027.\n",
+        "type": "string"
+      },
       "objectInstanceIds": {
         "description": "Identifiers of the VNF instances for which performance information is collected.\n",
         "type": "array",
@@ -21,8 +28,16 @@
           "type": "string"
         }
       },
+      "subObjectInstanceIds": {
+        "description": "Identifiers of the sub-object instances of the measured object instance for which performance information is requested to be collected. May be present if a sub-object is defined in clause 6.2 of ETSI GS NFV-IFA 027 for the related measured object type. If this attribute is present, the cardinality of the \"objectInstanceIds\" attribute shall be 1. If this attribute is absent and a sub-object is defined in clause 6.2 of ETSI GS NFV IFA 027 for the related measured object type, measurements will be taken for all sub-object instances of the measured object instance.\n",
+        "type": "array",
+        "items": {
+          "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+          "type": "string"
+        }
+      },
       "criteria": {
-        "description": "Criteria of the collection of performance information.\n",
+        "description": "This type represents collection criteria for PM jobs.\nNOTE 1:\tAt the end of each reportingPeriod, the API producer will inform the API consumer about availability of the \n        performance data collected for each completed collection period during this reportingPeriod. \n        The reportingPeriod should be equal to or a multiple of the collectionPeriod. In the latter case, the performance \n        data for the collection periods within one reporting period are reported together.\nNOTE 2:\tIn particular when choosing short collection and reporting periods, the number of PM jobs that can be supported \n        depends on the capability of the producing entity.\n",
         "type": "object",
         "required": [
           "collectionPeriod",
@@ -30,99 +45,106 @@
         ],
         "properties": {
           "performanceMetric": {
-            "description": "This defines the types of performance metrics for the specified object instances, as specified in ETSI GS NFV-IFA 027). At least one of the two attributes (performance metric or group) shall be present.\n",
+            "description": "This defines the types of performance metrics for the specified object instances. Valid values are specified as \"Measurement Name\" values in clause 7.2 of ETSI GS NFV-IFA 027. At least one of the two attributes (performance metric or group) shall be present.\n",
             "type": "array",
             "items": {
               "type": "string"
             }
           },
           "performanceMetricGroup": {
-            "description": "Group of performance metrics. A metric group is a pre-defined list of metrics, known to the producer that it can decompose to individual metrics. At least one of the two attributes (performance metric or group) shall be present.\n",
+            "description": "Group of performance metrics. A metric group is a pre-defined list of metrics, known to the API producer that it can decompose to individual metrics. Valid values are specified as \"Measurement Group\" values in clause 7.2 of ETSI GS NFV-IFA 027. At least one of the two attributes (performance metric or group) shall be present.\n",
             "type": "array",
             "items": {
               "type": "string"
             }
           },
           "collectionPeriod": {
-            "description": "Specifies the periodicity at which the producer will collect performance information. The unit shall be seconds. At the end of each reportingPeriod, the producer will inform the consumer about availability of the performance data collected for each completed collection period during this reportingPeriod. The reportingPeriod should be equal to or a multiple of the collectionPeriod. In the latter case, the performance data for the collection periods within one reporting period are reported together.\n",
-            "type": "integer"
+            "description": "SSpecifies the periodicity at which the API producer will collect performance information.  The unit shall be seconds. See notes 1 and 2.\n",
+            "type": "integer",
+            "minimum": 0,
+            "maximum": 1024
           },
           "reportingPeriod": {
-            "description": "Specifies the periodicity at which the producer will report to the consumer. about performance information. The unit shall be seconds. At the end of each reportingPeriod, the producer will inform the consumer about availability of the performance data collected for each completed collection period during this reportingPeriod. The reportingPeriod should be equal to or a multiple of the collectionPeriod. In the latter case, the performance data for the collection periods within one reporting period are reported together.\n",
-            "type": "integer"
+            "description": "Specifies the periodicity at which the API producer will report to the API consumer  about performance information. The unit shall be seconds. See notes 1 and 2.\n",
+            "type": "integer",
+            "minimum": 0,
+            "maximum": 1024
           },
           "reportingBoundary": {
-            "description": "Date-time stamp.  Representation: String formatted according to IETF RFC 3339.\n",
+            "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
             "type": "string",
             "format": "date-time"
           }
         }
       },
+      "callbackUri": {
+        "description": "String formatted according to IETF RFC 3986.\n",
+        "type": "string"
+      },
       "reports": {
         "description": "Information about available reports collected by this PM job.\n",
         "type": "object",
         "required": [
           "href",
-          "readyTime",
-          "_links"
+          "readyTime"
         ],
         "properties": {
           "href": {
-            "description": "The Uri where the report can be obtained.\n",
+            "description": "The URI where the report can be obtained.\n",
             "type": "string",
             "format": "url"
           },
           "readyTime": {
-            "description": "Date-time stamp.  Representation: String formatted according to IETF RFC 3339.\n",
+            "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
             "type": "string",
             "format": "date-time"
           },
           "expiryTime": {
-            "description": "Date-time stamp.  Representation: String formatted according to IETF RFC 3339.\n",
+            "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
             "type": "string",
             "format": "date-time"
           },
           "fileSize": {
             "description": "The size of the report file in bytes, if known.\n",
-            "type": "integer"
-          },
-          "_links": {
-            "description": "Links for this resource.\n",
+            "type": "integer",
+            "minimum": 0,
+            "maximum": 1024
+          }
+        }
+      },
+      "_links": {
+        "description": "Links for this resource.\n",
+        "type": "object",
+        "required": [
+          "self"
+        ],
+        "properties": {
+          "self": {
+            "description": "This type represents a link to a resource using an absolute URI.\n",
             "type": "object",
             "required": [
-              "self"
+              "href"
             ],
             "properties": {
-              "self": {
-                "description": "This type represents a link to a resource.\n",
-                "type": "object",
-                "required": [
-                  "href"
-                ],
-                "properties": {
-                  "href": {
-                    "description": "URI of the referenced resource.\n",
-                    "type": "string",
-                    "format": "url"
-                  }
-                }
-              },
-              "objects": {
-                "description": "Links to resources representing the VNF instances for which performance information is collected. Shall be present if the VNF instance information is accessible as a resource.\n",
-                "type": "array",
-                "items": {
-                  "description": "This type represents a link to a resource.\n",
-                  "type": "object",
-                  "required": [
-                    "href"
-                  ],
-                  "properties": {
-                    "href": {
-                      "description": "URI of the referenced resource.\n",
-                      "type": "string",
-                      "format": "url"
-                    }
-                  }
+              "href": {
+                "description": "String formatted according to IETF RFC 3986.\n",
+                "type": "string"
+              }
+            }
+          },
+          "objects": {
+            "description": "Links to resources representing the measure object instances for which performance information is collected. Shall be present if the measured object instance information is accessible as a resource.\n",
+            "type": "array",
+            "items": {
+              "description": "This type represents a link to a resource using an absolute URI.\n",
+              "type": "object",
+              "required": [
+                "href"
+              ],
+              "properties": {
+                "href": {
+                  "description": "String formatted according to IETF RFC 3986.\n",
+                  "type": "string"
                 }
               }
             }
diff --git a/SOL002/VNFPerformanceManagement-API/schemas/ProblemDetails.schema.json b/SOL002/VNFPerformanceManagement-API/schemas/ProblemDetails.schema.json
index 2af3ef9b3f8c0e1dc6bfa39a818ba45e63ca223c..a4c007a5c1501eaf4ae57b5973cda6ef1d4bbea5 100644
--- a/SOL002/VNFPerformanceManagement-API/schemas/ProblemDetails.schema.json
+++ b/SOL002/VNFPerformanceManagement-API/schemas/ProblemDetails.schema.json
@@ -1 +1,32 @@
-{  "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",  "type": "object",  "required": [    "status",    "detail"  ],  "properties": {    "type": {      "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",      "type": "string",      "format": "URI"    },    "title": {      "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",      "type": "string"    },    "status": {      "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",      "type": "integer"    },    "detail": {      "description": "A human-readable explanation specific to this occurrence of the problem.\n",      "type": "string"    },    "instance": {      "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",      "type": "string",      "format": "URI"    }  }}
\ No newline at end of file
+{
+    "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
+    "type": "object",
+    "required": [
+        "status",
+        "detail"
+    ],
+    "properties": {
+        "type": {
+            "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
+            "type": "string",
+            "format": "URI"
+        },
+        "title": {
+            "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
+            "type": "string"
+        },
+        "status": {
+            "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
+            "type": "integer"
+        },
+        "detail": {
+            "description": "A human-readable explanation specific to this occurrence of the problem.\n",
+            "type": "string"
+        },
+        "instance": {
+            "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
+            "type": "string",
+            "format": "URI"
+        }
+    }
+}
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/schemas/Subscriptions.schema.json b/SOL002/VNFPerformanceManagement-API/schemas/Subscriptions.schema.json
index fefb142da9f905120ff32246f73e6b88062978d5..ebc48dfd18579ce3821eb9ad1713559b9f9bea19 100644
--- a/SOL002/VNFPerformanceManagement-API/schemas/Subscriptions.schema.json
+++ b/SOL002/VNFPerformanceManagement-API/schemas/Subscriptions.schema.json
@@ -1 +1,145 @@
-{  "type": "array",  "items": {    "description": "This type represents a subscription.\n",    "type": "object",    "required": [      "id",      "callbackUri",      "_links"    ],    "properties": {      "id": {        "description": "An identifier with the intention of being globally unique.\n",        "type": "string"      },      "filter": {        "description": "This type represents a filter that can be used to subscribe for notifications related to performance management events.\n",        "type": "object",        "properties": {          "vnfInstanceSubscriptionFilter": {            "description": "This type represents subscription filter criteria to match VNF instances.\n",            "type": "object",            "properties": {              "vnfdIds": {                "description": "If present, match VNF instances that were created based on a VNFD identified by one of the vnfdId values listed in this attribute. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",                "type": "array",                "items": {                  "description": "An identifier with the intention of being globally unique.\n",                  "type": "string"                }              },              "vnfProductsFromProviders": {                "description": "If present, match VNF instances that belong to VNF products from certain providers. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",                "type": "array",                "items": {                  "type": "object",                  "required": [                    "vnfProvider"                  ],                  "properties": {                    "vnfProvider": {                      "description": "Name of the VNF provider to match.\n",                      "type": "string"                    },                    "vnfProducts": {                      "description": "If present, match VNF instances that belong to VNF products with certain product names, from one particular provider.\n",                      "type": "array",                      "items": {                        "type": "object",                        "required": [                          "vnfProductName"                        ],                        "properties": {                          "vnfProductName": {                            "description": "Name of the VNF product to match.\n",                            "type": "string"                          },                          "versions": {                            "description": "If present, match VNF instances that belong to VNF products with certain versions and a certain product name, from one particular provider.\n",                            "type": "array",                            "items": {                              "type": "object",                              "required": [                                "vnfSoftwareVersion"                              ],                              "properties": {                                "vnfSoftwareVersion": {                                  "description": "A version.\n",                                  "type": "string"                                },                                "vnfdVersions": {                                  "description": "If present, match VNF instances that belong to VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n",                                  "type": "array",                                  "items": {                                    "description": "A version.\n",                                    "type": "string"                                  }                                }                              }                            }                          }                        }                      }                    }                  }                }              },              "vnfInstanceIds": {                "description": "If present, match VNF instances with an instance identifier listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",                "type": "array",                "items": {                  "description": "An identifier with the intention of being globally unique.\n",                  "type": "string"                }              },              "vnfInstanceNames": {                "description": "If present, match VNF instances with a VNF Instance Name listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",                "type": "array",                "items": {                  "type": "string"                }              }            }          },          "notificationTypes": {            "description": "Match particular notification types. Permitted values: * ThresholdCrossedNotification * PerformanceInformationAvailableNotification The permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.\n",            "type": "string",            "enum": [              "ThresholdCrossedNotification",              "PerformanceInformationAvailableNotification"            ]          }        }      },      "callbackUri": {        "description": "The URI of the endpoint to send the notification to.\n",        "type": "string",        "format": "url"      },      "_links": {        "description": "Links to resources related to this resource.\n",        "type": "object",        "required": [          "self"        ],        "properties": {          "self": {            "description": "This type represents a link to a resource.\n",            "type": "object",            "required": [              "href"            ],            "properties": {              "href": {                "description": "URI of the referenced resource.\n",                "type": "string",                "format": "url"              }            }          }        }      }    }  }}
\ No newline at end of file
+{
+    "type": "array",
+    "items": {
+        "description": "This type represents a subscription.\n",
+        "type": "object",
+        "required": [
+            "id",
+            "callbackUri",
+            "_links"
+        ],
+        "properties": {
+            "id": {
+                "description": "An identifier with the intention of being globally unique.\n",
+                "type": "string"
+            },
+            "filter": {
+                "description": "This type represents a filter that can be used to subscribe for notifications related to performance management events.\n",
+                "type": "object",
+                "properties": {
+                    "vnfInstanceSubscriptionFilter": {
+                        "description": "This type represents subscription filter criteria to match VNF instances.\n",
+                        "type": "object",
+                        "properties": {
+                            "vnfdIds": {
+                                "description": "If present, match VNF instances that were created based on a VNFD identified by one of the vnfdId values listed in this attribute. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
+                                "type": "array",
+                                "items": {
+                                    "description": "An identifier with the intention of being globally unique.\n",
+                                    "type": "string"
+                                }
+                            },
+                            "vnfProductsFromProviders": {
+                                "description": "If present, match VNF instances that belong to VNF products from certain providers. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
+                                "type": "array",
+                                "items": {
+                                    "type": "object",
+                                    "required": [
+                                        "vnfProvider"
+                                    ],
+                                    "properties": {
+                                        "vnfProvider": {
+                                            "description": "Name of the VNF provider to match.\n",
+                                            "type": "string"
+                                        },
+                                        "vnfProducts": {
+                                            "description": "If present, match VNF instances that belong to VNF products with certain product names, from one particular provider.\n",
+                                            "type": "array",
+                                            "items": {
+                                                "type": "object",
+                                                "required": [
+                                                    "vnfProductName"
+                                                ],
+                                                "properties": {
+                                                    "vnfProductName": {
+                                                        "description": "Name of the VNF product to match.\n",
+                                                        "type": "string"
+                                                    },
+                                                    "versions": {
+                                                        "description": "If present, match VNF instances that belong to VNF products with certain versions and a certain product name, from one particular provider.\n",
+                                                        "type": "array",
+                                                        "items": {
+                                                            "type": "object",
+                                                            "required": [
+                                                                "vnfSoftwareVersion"
+                                                            ],
+                                                            "properties": {
+                                                                "vnfSoftwareVersion": {
+                                                                    "description": "A version.\n",
+                                                                    "type": "string"
+                                                                },
+                                                                "vnfdVersions": {
+                                                                    "description": "If present, match VNF instances that belong to VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n",
+                                                                    "type": "array",
+                                                                    "items": {
+                                                                        "description": "A version.\n",
+                                                                        "type": "string"
+                                                                    }
+                                                                }
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            },
+                            "vnfInstanceIds": {
+                                "description": "If present, match VNF instances with an instance identifier listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
+                                "type": "array",
+                                "items": {
+                                    "description": "An identifier with the intention of being globally unique.\n",
+                                    "type": "string"
+                                }
+                            },
+                            "vnfInstanceNames": {
+                                "description": "If present, match VNF instances with a VNF Instance Name listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
+                                "type": "array",
+                                "items": {
+                                    "type": "string"
+                                }
+                            }
+                        }
+                    },
+                    "notificationTypes": {
+                        "description": "Match particular notification types. Permitted values: * ThresholdCrossedNotification * PerformanceInformationAvailableNotification The permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.\n",
+                        "type": "string",
+                        "enum": [
+                            "ThresholdCrossedNotification",
+                            "PerformanceInformationAvailableNotification"
+                        ]
+                    }
+                }
+            },
+            "callbackUri": {
+                "description": "The URI of the endpoint to send the notification to.\n",
+                "type": "string",
+                "format": "url"
+            },
+            "_links": {
+                "description": "Links to resources related to this resource.\n",
+                "type": "object",
+                "required": [
+                    "self"
+                ],
+                "properties": {
+                    "self": {
+                        "description": "This type represents a link to a resource.\n",
+                        "type": "object",
+                        "required": [
+                            "href"
+                        ],
+                        "properties": {
+                            "href": {
+                                "description": "URI of the referenced resource.\n",
+                                "type": "string",
+                                "format": "url"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/schemas/Threshold.schema.json b/SOL002/VNFPerformanceManagement-API/schemas/Threshold.schema.json
index 938d1991966625c219944ac645f0f2940614846d..53ec1c1b475e8b161cb4a8d7103e81e210913c53 100644
--- a/SOL002/VNFPerformanceManagement-API/schemas/Threshold.schema.json
+++ b/SOL002/VNFPerformanceManagement-API/schemas/Threshold.schema.json
@@ -31,7 +31,7 @@
 			}
 		},
 		"criteria": {
-			"description": "This type represents criteria that define a threshold.\n",
+			"description": "This type represents criteria that define a threshold.\nNOTE 1:\tIn the present document, simple thresholds are defined. The definition of additional threshold types is left for \n        future specification.\nNOTE 2:\tThe hysteresis is defined to prevent storms of threshold crossing notifications. When processing a request to create \n        a threshold, implementations should enforce a suitable minimum value for this attribute (e.g. override the value or \n        reject the request). \n",
 			"type": "object",
 			"required": [
 				"performanceMetric",
@@ -43,7 +43,7 @@
 					"type": "string"
 				},
 				"thresholdType": {
-					"description": "Type of threshold. This attribute determines which other attributes are present in the data structure. Permitted values: * SIMPLE: Single-valued static threshold In the present document, simple thresholds are defined. The definition of additional threshold types is left for future specification.\n",
+					"description": "Type of threshold. This attribute determines which other attributes are present in the data structure.\nPermitted values: -\tSIMPLE: Single-valued static threshold. See note 1.\n",
 					"type": "string",
 					"enum": [
 						"SIMPLE"
@@ -63,7 +63,7 @@
 							"format": "float"
 						},
 						"hysteresis": {
-							"description": "The hysteresis of the threshold. Shall be represented as a non-negative floating point number. A notification with crossing direction \"UP\" will be generated if the measured value reaches or exceeds \"thresholdValue\" + \"hysteresis\". A notification with crossing direction \"DOWN\" will be generated if the measured value reaches or undercuts \"thresholdValue\" - \"hysteresis\". The hysteresis is defined to prevent storms of threshold crossing notifications. When processing a request to create a threshold, implementations should enforce a suitable minimum value for this attribute (e.g. override the value or reject the request).\n",
+							"description": "The hysteresis of the threshold.  Shall be represented as a non-negative floating point number.\nA notification with crossing direction \"UP\" will be generated if the measured value reaches or exceeds  \"thresholdValue\" + \"hysteresis\". A notification with crossing direction \"DOWN\" will be generated if the  measured value reaches or undercuts \"thresholdValue\" - \"hysteresis\". See note 2.\n",
 							"type": "number",
 							"minimum": 0,
 							"maximum": 1024,
diff --git a/SOL002/VNFPerformanceManagement-API/schemas/ThresholdModifications.json b/SOL002/VNFPerformanceManagement-API/schemas/ThresholdModifications.json
index 995cee3517b75439118025ed7746ffd7027989e3..14053751fed164339350ed1a26a71b05e7d41c1c 100644
--- a/SOL002/VNFPerformanceManagement-API/schemas/ThresholdModifications.json
+++ b/SOL002/VNFPerformanceManagement-API/schemas/ThresholdModifications.json
@@ -1,62 +1,75 @@
- {
-    "description": "This type represents modifications to a threshold. It shall comply with the provisions defined in table 6.5.2.11-1.\n",
-    "type": "object",
-    "properties": {
-      "callbackUri": {
-        "description": "String formatted according to IETF RFC 3986.\n",
-        "type": "string"
-      },
-      "authentication": {
-        "type": "object",
-        "required": [
-          "authType"
-        ],
-        "properties": {
-          "authType": {
-            "description": "Defines the types of Authentication / Authorization which the API consumer is willing to accept when receiving a notification. Permitted values: * BASIC: In every HTTP request to the notification endpoint, use\n  HTTP Basic authentication with the client credentials. \n* OAUTH2_CLIENT_CREDENTIALS: In every HTTP request to the\n  notification endpoint, use an OAuth 2.0 Bearer token, obtained\n  using the client credentials grant type.\n* TLS_CERT: Every HTTP request to the notification endpoint is sent\n  over a mutually authenticated TLS session, i.e. not only the\n  server is authenticated, but also the client is authenticated\n  during the TLS tunnel setup.\n",
-            "type": "array",
-            "items": {
-              "type": "string",
-              "enum": [
-                "BASIC",
-                "OAUTH2_CLIENT_CREDENTIALS",
-                "TLS_CERT"
-              ]
-            }
-          },
-          "paramsBasic": {
-            "description": "Parameters for authentication/authorization using BASIC. Shall be present if authType is \"BASIC\" and the contained information has not been provisioned out of band. Shall be absent otherwise.\n",
-            "type": "object",
-            "properties": {
-              "userName": {
-                "description": "Username to be used in HTTP Basic authentication. Shall be present if it has not been provisioned out of band.\n",
-                "type": "string"
-              },
-              "password": {
-                "description": "Password to be used in HTTP Basic authentication. Shall be present if it has not been provisioned out of band.\n",
-                "type": "string"
-              }
+{
+  "description": "This type represents modifications to a threshold.\nNOTE:\tAt least one of the attributes defined in this type shall be present in request bodies.\n",
+  "type": "object",
+  "oneOf": [
+    {
+      "required": [
+        "callbackUri"
+      ]
+    },
+    {
+      "required": [
+        "authentication"
+      ]
+    }
+  ],
+  "properties": {
+    "callbackUri": {
+      "description": "String formatted according to IETF RFC 3986.\n",
+      "type": "string"
+    },
+    "authentication": {
+      "description": "* NOTE: The clientId and clientPassword passed in a subscription shall not be the same as the clientId and\n        clientPassword that are used to obtain authorization for API requests. Client credentials may differ between\n        subscriptions. The value of clientPassword should be generated by a random process\n",
+      "type": "object",
+      "required": [
+        "authType"
+      ],
+      "properties": {
+        "authType": {
+          "description": "Defines the types of Authentication / Authorization which the API consumer is willing to accept when receiving a notification. Permitted values: * BASIC: In every HTTP request to the notification endpoint, use\n  HTTP Basic authentication with the client credentials. \n* OAUTH2_CLIENT_CREDENTIALS: In every HTTP request to the\n  notification endpoint, use an OAuth 2.0 Bearer token, obtained\n  using the client credentials grant type.\n* TLS_CERT: Every HTTP request to the notification endpoint is sent\n  over a mutually authenticated TLS session, i.e. not only the\n  server is authenticated, but also the client is authenticated\n  during the TLS tunnel setup.\n",
+          "type": "array",
+          "items": {
+            "type": "string",
+            "enum": [
+              "BASIC",
+              "OAUTH2_CLIENT_CREDENTIALS",
+              "TLS_CERT"
+            ]
+          }
+        },
+        "paramsBasic": {
+          "description": "Parameters for authentication/authorization using BASIC. Shall be present if authType is \"BASIC\" and the contained information has not been provisioned out of band. Shall be absent otherwise.\n",
+          "type": "object",
+          "properties": {
+            "userName": {
+              "description": "Username to be used in HTTP Basic authentication. Shall be present if it has not been provisioned out of band.\n",
+              "type": "string"
+            },
+            "password": {
+              "description": "Password to be used in HTTP Basic authentication. Shall be present if it has not been provisioned out of band.\n",
+              "type": "string"
             }
-          },
-          "paramsOauth2ClientCredentials": {
-            "description": "Parameters for authentication/authorization using OAUTH2_CLIENT_CREDENTIALS. Shall be present if authType is \"OAUTH2_CLIENT_CREDENTIALS\" and the contained information has not been provisioned out of band. Shall be absent otherwise.\n",
-            "type": "object",
-            "properties": {
-              "clientId": {
-                "description": "Client identifier to be used in the access token request of the OAuth 2.0 client credentials grant type.  Shall be present if it has not been provisioned out of band. The clientId and clientPassword passed in a subscription shall not be the same as the clientId and clientPassword that are used to obtain authorization for API requests. Client credentials may differ between subscriptions. The value of clientPassword should be generated by a random process.\n",
-                "type": "string"
-              },
-              "clientPassword": {
-                "description": "Client password to be used in the access token request of the OAuth 2.0 client credentials grant type.  Shall be present if it has not been provisioned out of band. The clientId and clientPassword passed in a subscription shall not be the same as the clientId and clientPassword that are used to obtain authorization for API requests. Client credentials may differ between subscriptions. The value of clientPassword should be generated by a random process.\n",
-                "type": "string"
-              },
-              "tokenEndpoint": {
-                "description": "String formatted according to IETF RFC 3986.\n",
-                "type": "string"
-              }
+          }
+        },
+        "paramsOauth2ClientCredentials": {
+          "description": "Parameters for authentication/authorization using OAUTH2_CLIENT_CREDENTIALS. Shall be present if authType is \"OAUTH2_CLIENT_CREDENTIALS\" and the contained information has not been provisioned out of band. Shall be absent otherwise.\n",
+          "type": "object",
+          "properties": {
+            "clientId": {
+              "description": "Client identifier to be used in the access token request of the OAuth 2.0 client credentials grant type.  Shall be present if it has not been provisioned out of band. See note.\n",
+              "type": "string"
+            },
+            "clientPassword": {
+              "description": "Client password to be used in the access token request of the OAuth 2.0 client credentials grant type.  Shall be present if it has not been provisioned out of band. See note.\n",
+              "type": "string"
+            },
+            "tokenEndpoint": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
             }
           }
         }
       }
     }
-  }
\ No newline at end of file
+  }
+}
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/schemas/Thresholds.schema.json b/SOL002/VNFPerformanceManagement-API/schemas/Thresholds.schema.json
index 74bddb4bc413c11914ac716a58d32ccf1495b41c..1317135dd988c8c70052ecc013718f8ebbaf41e1 100644
--- a/SOL002/VNFPerformanceManagement-API/schemas/Thresholds.schema.json
+++ b/SOL002/VNFPerformanceManagement-API/schemas/Thresholds.schema.json
@@ -1,120 +1,119 @@
 {
-  "type": "array",
-  "items":
-    {
-	"description": "This type represents a threshold.\n",
-	"type": "object",
-	"required": [
-		"id",
-		"objectType",
-		"objectInstanceId",
-		"criteria",
-		"callbackUri",
-		"_links"
-	],
-	"properties": {
-		"id": {
-			"description": "An identifier with the intention of being globally unique.\n",
-			"type": "string"
-		},
-		"objectType": {
-			"description": "Type of the measured object. The applicable measured object type for a measurement is defined in clause 7.2 of ETSI GS NFV-IFA 027.\n",
-			"type": "string"
-		},
-		"objectInstanceId": {
-			"description": "An identifier with the intention of being globally unique.\n",
-			"type": "string"
-		},
-		"subObjectInstanceIds": {
-			"description": "Identifiers of the sub-object instances of the measured object instance associated with the threshold. May be present if a sub-object is defined in clause 6.2 of ETSI GS NFV-IFA 027 for the related measurement type. If this attribute is absent and a sub-object is defined in clause 6.2 of ETSI GS NFV-IFA 027 for the related measured object type, measurements will be taken for all sub-object instances of the measured object instance.\n",
-			"type": "array",
-			"items": {
-				"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+	"type": "array",
+	"items": {
+		"description": "This type represents a threshold.\n",
+		"type": "object",
+		"required": [
+			"id",
+			"objectType",
+			"objectInstanceId",
+			"criteria",
+			"callbackUri",
+			"_links"
+		],
+		"properties": {
+			"id": {
+				"description": "An identifier with the intention of being globally unique.\n",
 				"type": "string"
-			}
-		},
-		"criteria": {
-			"description": "This type represents criteria that define a threshold.\n",
-			"type": "object",
-			"required": [
-				"performanceMetric",
-				"thresholdType"
-			],
-			"properties": {
-				"performanceMetric": {
-					"description": "Defines the performance metric associated with the threshold. Valid values are specified as \"Measurement Name\" values in clause 7.2 of ETSI GS NFV-IFA 027.\n",
+			},
+			"objectType": {
+				"description": "Type of the measured object. The applicable measured object type for a measurement is defined in clause 7.2 of ETSI GS NFV-IFA 027.\n",
+				"type": "string"
+			},
+			"objectInstanceId": {
+				"description": "An identifier with the intention of being globally unique.\n",
+				"type": "string"
+			},
+			"subObjectInstanceIds": {
+				"description": "Identifiers of the sub-object instances of the measured object instance associated with the threshold. May be present if a sub-object is defined in clause 6.2 of ETSI GS NFV-IFA 027 for the related measurement type. If this attribute is absent and a sub-object is defined in clause 6.2 of ETSI GS NFV-IFA 027 for the related measured object type, measurements will be taken for all sub-object instances of the measured object instance.\n",
+				"type": "array",
+				"items": {
+					"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
 					"type": "string"
-				},
-				"thresholdType": {
-					"description": "Type of threshold. This attribute determines which other attributes are present in the data structure. Permitted values: * SIMPLE: Single-valued static threshold In the present document, simple thresholds are defined. The definition of additional threshold types is left for future specification.\n",
-					"type": "string",
-					"enum": [
-						"SIMPLE"
-					]
-				},
-				"simpleThresholdDetails": {
-					"description": "Details of a simple threshold. Shall be present if thresholdType=\"SIMPLE\".\n",
-					"type": "object",
-					"required": [
-						"thresholdValue",
-						"hysteresis"
-					],
-					"properties": {
-						"thresholdValue": {
-							"description": "The threshold value. Shall be represented as a floating point number.\n",
-							"type": "number",
-							"format": "float"
-						},
-						"hysteresis": {
-							"description": "The hysteresis of the threshold. Shall be represented as a non-negative floating point number. A notification with crossing direction \"UP\" will be generated if the measured value reaches or exceeds \"thresholdValue\" + \"hysteresis\". A notification with crossing direction \"DOWN\" will be generated if the measured value reaches or undercuts \"thresholdValue\" - \"hysteresis\". The hysteresis is defined to prevent storms of threshold crossing notifications. When processing a request to create a threshold, implementations should enforce a suitable minimum value for this attribute (e.g. override the value or reject the request).\n",
-							"type": "number",
-							"minimum": 0,
-							"maximum": 1024,
-							"format": "float"
+				}
+			},
+			"criteria": {
+				"description": "This type represents criteria that define a threshold.\nNOTE 1:\tIn the present document, simple thresholds are defined. The definition of additional threshold types is left for \n        future specification.\nNOTE 2:\tThe hysteresis is defined to prevent storms of threshold crossing notifications. When processing a request to create \n        a threshold, implementations should enforce a suitable minimum value for this attribute (e.g. override the value or \n        reject the request). \n",
+				"type": "object",
+				"required": [
+					"performanceMetric",
+					"thresholdType"
+				],
+				"properties": {
+					"performanceMetric": {
+						"description": "Defines the performance metric associated with the threshold. Valid values are specified as \"Measurement Name\" values in clause 7.2 of ETSI GS NFV-IFA 027.\n",
+						"type": "string"
+					},
+					"thresholdType": {
+						"description": "Type of threshold. This attribute determines which other attributes are present in the data structure.\nPermitted values: -\tSIMPLE: Single-valued static threshold. See note 1.\n",
+						"type": "string",
+						"enum": [
+							"SIMPLE"
+						]
+					},
+					"simpleThresholdDetails": {
+						"description": "Details of a simple threshold. Shall be present if thresholdType=\"SIMPLE\".\n",
+						"type": "object",
+						"required": [
+							"thresholdValue",
+							"hysteresis"
+						],
+						"properties": {
+							"thresholdValue": {
+								"description": "The threshold value. Shall be represented as a floating point number.\n",
+								"type": "number",
+								"format": "float"
+							},
+							"hysteresis": {
+								"description": "The hysteresis of the threshold.  Shall be represented as a non-negative floating point number.\nA notification with crossing direction \"UP\" will be generated if the measured value reaches or exceeds  \"thresholdValue\" + \"hysteresis\". A notification with crossing direction \"DOWN\" will be generated if the  measured value reaches or undercuts \"thresholdValue\" - \"hysteresis\". See note 2.\n",
+								"type": "number",
+								"minimum": 0,
+								"maximum": 1024,
+								"format": "float"
+							}
 						}
 					}
 				}
-			}
-		},
-		"callbackUri": {
-			"description": "String formatted according to IETF RFC 3986.\n",
-			"type": "string"
-		},
-		"_links": {
-			"description": "Links for this resource.\n",
-			"type": "object",
-			"required": [
-				"self"
-			],
-			"properties": {
-				"self": {
-					"description": "This type represents a link to a resource using an absolute URI.\n",
-					"type": "object",
-					"required": [
-						"href"
-					],
-					"properties": {
-						"href": {
-							"description": "String formatted according to IETF RFC 3986.\n",
-							"type": "string"
+			},
+			"callbackUri": {
+				"description": "String formatted according to IETF RFC 3986.\n",
+				"type": "string"
+			},
+			"_links": {
+				"description": "Links for this resource.\n",
+				"type": "object",
+				"required": [
+					"self"
+				],
+				"properties": {
+					"self": {
+						"description": "This type represents a link to a resource using an absolute URI.\n",
+						"type": "object",
+						"required": [
+							"href"
+						],
+						"properties": {
+							"href": {
+								"description": "String formatted according to IETF RFC 3986.\n",
+								"type": "string"
+							}
 						}
-					}
-				},
-				"object": {
-					"description": "This type represents a link to a resource using an absolute URI.\n",
-					"type": "object",
-					"required": [
-						"href"
-					],
-					"properties": {
-						"href": {
-							"description": "String formatted according to IETF RFC 3986.\n",
-							"type": "string"
+					},
+					"object": {
+						"description": "This type represents a link to a resource using an absolute URI.\n",
+						"type": "object",
+						"required": [
+							"href"
+						],
+						"properties": {
+							"href": {
+								"description": "String formatted according to IETF RFC 3986.\n",
+								"type": "string"
+							}
 						}
 					}
 				}
 			}
 		}
 	}
-  }
 }
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/schemas/criteria.schema.json b/SOL002/VNFPerformanceManagement-API/schemas/criteria.schema.json
index 319d15f53d4d49980a3c4c451bc82efd983abf36..7dc6d89684a269ccfcf11cff97869a6865d4a6ef 100644
--- a/SOL002/VNFPerformanceManagement-API/schemas/criteria.schema.json
+++ b/SOL002/VNFPerformanceManagement-API/schemas/criteria.schema.json
@@ -1,32 +1,39 @@
 {
-	"description": "Criteria of the collection of performance information.\n",
+	"description": "This type represents collection criteria for PM jobs.\nNOTE 1:\tAt the end of each reportingPeriod, the API producer will inform the API consumer about availability of the \n        performance data collected for each completed collection period during this reportingPeriod. \n        The reportingPeriod should be equal to or a multiple of the collectionPeriod. In the latter case, the performance \n        data for the collection periods within one reporting period are reported together.\nNOTE 2:\tIn particular when choosing short collection and reporting periods, the number of PM jobs that can be supported \n        depends on the capability of the producing entity.\n",
 	"type": "object",
-	"required": ["collectionPeriod", "reportingPeriod"],
+	"required": [
+		"collectionPeriod",
+		"reportingPeriod"
+	],
 	"properties": {
 		"performanceMetric": {
-			"description": "This defines the types of performance metrics for the specified object instances, as specified in ETSI GS NFV-IFA 027). At least one of the two attributes (performance metric or group) shall be present.\n",
+			"description": "This defines the types of performance metrics for the specified object instances. Valid values are specified as \"Measurement Name\" values in clause 7.2 of ETSI GS NFV-IFA 027. At least one of the two attributes (performance metric or group) shall be present.\n",
 			"type": "array",
 			"items": {
 				"type": "string"
 			}
 		},
 		"performanceMetricGroup": {
-			"description": "Group of performance metrics. A metric group is a pre-defined list of metrics, known to the producer that it can decompose to individual metrics. At least one of the two attributes (performance metric or group) shall be present.\n",
+			"description": "Group of performance metrics. A metric group is a pre-defined list of metrics, known to the API producer that it can decompose to individual metrics. Valid values are specified as \"Measurement Group\" values in clause 7.2 of ETSI GS NFV-IFA 027. At least one of the two attributes (performance metric or group) shall be present.\n",
 			"type": "array",
 			"items": {
 				"type": "string"
 			}
 		},
 		"collectionPeriod": {
-			"description": "Specifies the periodicity at which the producer will collect performance information. The unit shall be seconds. At the end of each reportingPeriod, the producer will inform the consumer about availability of the performance data collected for each completed collection period during this reportingPeriod. The reportingPeriod should be equal to or a multiple of the collectionPeriod. In the latter case, the performance data for the collection periods within one reporting period are reported together.\n",
-			"type": "integer"
+			"description": "Specifies the periodicity at which the API producer will collect performance information.  The unit shall be seconds. See notes 1 and 2.\n",
+			"type": "integer",
+			"minimum": 0,
+			"maximum": 1024
 		},
 		"reportingPeriod": {
-			"description": "Specifies the periodicity at which the producer will report to the consumer. about performance information. The unit shall be seconds. At the end of each reportingPeriod, the producer will inform the consumer about availability of the performance data collected for each completed collection period during this reportingPeriod. The reportingPeriod should be equal to or a multiple of the collectionPeriod. In the latter case, the performance data for the collection periods within one reporting period are reported together.\n",
-			"type": "integer"
+			"description": "Specifies the periodicity at which the API producer will report to the API consumer  about performance information. The unit shall be seconds. See notes 1 and 2.\n",
+			"type": "integer",
+			"minimum": 0,
+			"maximum": 1024
 		},
 		"reportingBoundary": {
-			"description": "Date-time stamp.  Representation: String formatted according to IETF RFC 3339.\n",
+			"description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
 			"type": "string",
 			"format": "date-time"
 		}
diff --git a/SOL002/VNFPerformanceManagement-API/schemas/links.schema.json b/SOL002/VNFPerformanceManagement-API/schemas/links.schema.json
index ef262a8c875b5c00bf32d4fd6f279cc4d5965bc9..bfdddc1a3c739352434a12144feac3a03352dd5f 100644
--- a/SOL002/VNFPerformanceManagement-API/schemas/links.schema.json
+++ b/SOL002/VNFPerformanceManagement-API/schemas/links.schema.json
@@ -1,32 +1,36 @@
 {
 	"description": "Links for this resource.\n",
 	"type": "object",
-	"required": ["self"],
+	"required": [
+		"self"
+	],
 	"properties": {
 		"self": {
-			"description": "This type represents a link to a resource.\n",
+			"description": "This type represents a link to a resource using an absolute URI.\n",
 			"type": "object",
-			"required": ["href"],
+			"required": [
+				"href"
+			],
 			"properties": {
 				"href": {
-					"description": "URI of the referenced resource.\n",
-					"type": "string",
-					"format": "url"
+					"description": "String formatted according to IETF RFC 3986.\n",
+					"type": "string"
 				}
 			}
 		},
 		"objects": {
-			"description": "Links to resources representing the VNF instances for which performance information is collected. Shall be present if the VNF instance information is accessible as a resource.\n",
+			"description": "Links to resources representing the measure object instances for which performance information is collected. Shall be present if the measured object instance information is accessible as a resource.\n",
 			"type": "array",
 			"items": {
-				"description": "This type represents a link to a resource.\n",
+				"description": "This type represents a link to a resource using an absolute URI.\n",
 				"type": "object",
-				"required": ["href"],
+				"required": [
+					"href"
+				],
 				"properties": {
 					"href": {
-						"description": "URI of the referenced resource.\n",
-						"type": "string",
-						"format": "url"
+						"description": "String formatted according to IETF RFC 3986.\n",
+						"type": "string"
 					}
 				}
 			}
diff --git a/SOL002/VNFPerformanceManagement-API/schemas/reports.schema.json b/SOL002/VNFPerformanceManagement-API/schemas/reports.schema.json
index 834ded68723d9a72b3be565e72b71d5ef650e0cc..97347a437ae6b3329e99765b019e7f6ce9c3f47f 100644
--- a/SOL002/VNFPerformanceManagement-API/schemas/reports.schema.json
+++ b/SOL002/VNFPerformanceManagement-API/schemas/reports.schema.json
@@ -1,26 +1,31 @@
 {
 	"description": "Information about available reports collected by this PM job.\n",
 	"type": "object",
-	"required": ["href", "readyTime"],
+	"required": [
+		"href",
+		"readyTime"
+	],
 	"properties": {
 		"href": {
-			"description": "The Uri where the report can be obtained.\n",
+			"description": "The URI where the report can be obtained.\n",
 			"type": "string",
 			"format": "url"
 		},
 		"readyTime": {
-			"description": "Date-time stamp.  Representation: String formatted according to IETF RFC 3339.\n",
+			"description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
 			"type": "string",
 			"format": "date-time"
 		},
 		"expiryTime": {
-			"description": "Date-time stamp.  Representation: String formatted according to IETF RFC 3339.\n",
+			"description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
 			"type": "string",
 			"format": "date-time"
 		},
 		"fileSize": {
 			"description": "The size of the report file in bytes, if known.\n",
-			"type": "integer"
+			"type": "integer",
+			"minimum": 0,
+			"maximum": 1024
 		}
 	}
 }
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagementNotification-API/Notifications.robot b/SOL002/VNFPerformanceManagementNotification-API/Notifications.robot
index a285e5ee080808a6fa5ea76310185a7995bf3a15..b2f11b8dbc0c94bda4a61b09670eac2841e1cc29 100644
--- a/SOL002/VNFPerformanceManagementNotification-API/Notifications.robot
+++ b/SOL002/VNFPerformanceManagementNotification-API/Notifications.robot
@@ -17,7 +17,7 @@ VNF Performance Information Availability Notification
     ...    Test title: VNF Performance Information Availability Notification
     ...    Test objective: The objective is to test the dispatch of VNF Performance Information Availability Notification when new VNF performance information is available in the NFVO, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF performance job is created, and a subscription for information availability notifications is available in the VNFM.
-    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -30,7 +30,7 @@ VNF Threshold Crossed Notification
     ...    Test title: VNF Threshold Crossed Notification
     ...    Test objective: The objective is to test the dispatch of VNF Threshold Crossed Notification when a previously set VNF performance metric threshold is crossed, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF performance job is created, and a threshold subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v3.6.1
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v4.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFPerformanceManagementNotification-API/schemas/PerformanceInformationAvailableNotification.schema.json b/SOL002/VNFPerformanceManagementNotification-API/schemas/PerformanceInformationAvailableNotification.schema.json
index 512c26401bdc3de7df1a871ea51c50d0a72f2c51..603a16a099beadb7afb4a74fb24d377f073fb58e 100644
--- a/SOL002/VNFPerformanceManagementNotification-API/schemas/PerformanceInformationAvailableNotification.schema.json
+++ b/SOL002/VNFPerformanceManagementNotification-API/schemas/PerformanceInformationAvailableNotification.schema.json
@@ -40,7 +40,7 @@
       "type": "string"
     },
     "subObjectInstanceIds": {
-      "description": "Identifiers of the sub-object instances of the measured object instance for which the measurements have been taken. Shall be present if the related PM job has been set up to measure only a subset of all sub-object instances of the measured object instance and a sub-object is defined in clause\n 6.2 of ETSI GS NFV-IFA 027 for the related measured object type.\nShall be absent otherwise.\n",
+      "description": "Identifiers of the sub-object instances of the measured object instance for which the measurements have been taken. Shall be present if the related PM job has been set up to measure only a subset of all sub-object instances of the measured object instance and a sub-object is defined in clause 6.2 of ETSI GS NFV-IFA 027 for the related measured object type. Shall be absent otherwise.\n",
       "type": "array",
       "items": {
         "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
diff --git a/SOL002/VNFPerformanceManagementNotification-API/schemas/ProblemDetails.schema.json b/SOL002/VNFPerformanceManagementNotification-API/schemas/ProblemDetails.schema.json
index 2af3ef9b3f8c0e1dc6bfa39a818ba45e63ca223c..a4c007a5c1501eaf4ae57b5973cda6ef1d4bbea5 100644
--- a/SOL002/VNFPerformanceManagementNotification-API/schemas/ProblemDetails.schema.json
+++ b/SOL002/VNFPerformanceManagementNotification-API/schemas/ProblemDetails.schema.json
@@ -1 +1,32 @@
-{  "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",  "type": "object",  "required": [    "status",    "detail"  ],  "properties": {    "type": {      "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",      "type": "string",      "format": "URI"    },    "title": {      "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",      "type": "string"    },    "status": {      "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",      "type": "integer"    },    "detail": {      "description": "A human-readable explanation specific to this occurrence of the problem.\n",      "type": "string"    },    "instance": {      "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",      "type": "string",      "format": "URI"    }  }}
\ No newline at end of file
+{
+    "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
+    "type": "object",
+    "required": [
+        "status",
+        "detail"
+    ],
+    "properties": {
+        "type": {
+            "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
+            "type": "string",
+            "format": "URI"
+        },
+        "title": {
+            "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
+            "type": "string"
+        },
+        "status": {
+            "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
+            "type": "integer"
+        },
+        "detail": {
+            "description": "A human-readable explanation specific to this occurrence of the problem.\n",
+            "type": "string"
+        },
+        "instance": {
+            "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
+            "type": "string",
+            "format": "URI"
+        }
+    }
+}
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagementNotification-API/schemas/ThresholdCrossedNotification.schema.json b/SOL002/VNFPerformanceManagementNotification-API/schemas/ThresholdCrossedNotification.schema.json
index e5cec2303f1bcfcfdb9df5affc9fc0767cd8a2c8..6db468d08d48c1c6c53dec2de98b9d9306d8cc89 100644
--- a/SOL002/VNFPerformanceManagementNotification-API/schemas/ThresholdCrossedNotification.schema.json
+++ b/SOL002/VNFPerformanceManagementNotification-API/schemas/ThresholdCrossedNotification.schema.json
@@ -1,113 +1,104 @@
 {
-    "description": "This type represents a notification that is sent when a threshold has been crossed. The notification shall be triggered by the VNFM when a threshold has been crossed.\n",
-    "type": "object",
-    "required": [
-      "id",
-      "notificationType",
-      "subscriptionId",
-      "timeStamp",
-      "thresholdId",
-      "crossingDirection",
-      "objectInstanceId",
-      "performanceMetric",
-      "performanceValue",
-      "_links"
-    ],
-    "properties": {
-      "id": {
-        "description": "An identifier with the intention of being globally unique.\n",
-        "type": "string"
-      },
-      "notificationType": {
-        "description": "Discriminator for the different notification types. Shall be set to \"ThresholdCrossedNotification\" for this notification type.\n",
-        "type": "string",
-        "enum": [
-          "ThresholdCrossedNotification"
-        ]
-      },
-      "subscriptionId": {
-        "description": "An identifier with the intention of being globally unique.\n",
-        "type": "string"
-      },
-      "timeStamp": {
-        "description": "Date-time stamp.  Representation: String formatted according to IETF RFC 3339.\n",
-        "type": "string",
-        "format": "date-time"
-      },
-      "thresholdId": {
-        "description": "An identifier with the intention of being globally unique.\n",
-        "type": "string"
-      },
-      "crossingDirection": {
-        "type": "string",
-        "enum": [
-          "UP",
-          "DOWN"
-        ]
-      },
-      "objectInstanceId": {
-        "description": "An identifier with the intention of being globally unique.\n",
-        "type": "string"
-      },
-      "performanceMetric": {
-        "description": "Performance metric associated with the threshold.\n",
-        "type": "string"
-      },
-      "performanceValue": {
-        "description": "Value of the metric that resulted in threshold crossing. The type of the \"performanceValue\" attribute (i.e. scalar, structure (Object in JSON), or array (of scalars, arrays or structures / Objects)) is assumed to be defined in the external measurement specification (see ETSI GS NFV-IFA 027).\n",
-        "type": "object"
-      },
-      "_links": {
-        "description": "Links to resources related to this notification.\n",
-        "type": "object",
-        "required": [
-          "subscription",
-          "threshold"
-        ],
-        "properties": {
-          "subscription": {
-            "description": "This type represents a link to a resource.\n",
-            "type": "object",
-            "required": [
-              "href"
-            ],
-            "properties": {
-              "href": {
-                "description": "URI of the referenced resource.\n",
-                "type": "string",
-                "format": "url"
-              }
+  "description": "This type represents a notification that is sent when a threshold has been crossed.\nNOTE:\tThe timing of sending this notification is determined by the capability of the \n      producing entity to evaluate the threshold crossing condition.\n      \nThe notification shall be triggered by the VNFM when a threshold has been crossed.\nNOTE:\tThe sub-object allows to structure the measured object, but is not to be confused \n      with sub-counters which allow to structure the measurement.\n",
+  "type": "object",
+  "required": [
+    "id",
+    "notificationType",
+    "timeStamp",
+    "thresholdId",
+    "crossingDirection",
+    "objectType",
+    "objectInstanceId",
+    "performanceMetric",
+    "performanceValue",
+    "_links"
+  ],
+  "properties": {
+    "id": {
+      "description": "An identifier with the intention of being globally unique.\n",
+      "type": "string"
+    },
+    "notificationType": {
+      "description": "Discriminator for the different notification types. Shall be set to \"ThresholdCrossedNotification\" for this notification type.\n",
+      "type": "string",
+      "enum": [
+        "ThresholdCrossedNotification"
+      ]
+    },
+    "timeStamp": {
+      "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+      "type": "string",
+      "format": "date-time"
+    },
+    "thresholdId": {
+      "description": "An identifier with the intention of being globally unique.\n",
+      "type": "string"
+    },
+    "crossingDirection": {
+      "type": "string",
+      "enum": [
+        "UP",
+        "DOWN"
+      ]
+    },
+    "objectType": {
+      "description": "Type of the measured object. The applicable measured object type for a measurement is defined in clause 7.2 of ETSI GS NFV-IFA 027.\n",
+      "type": "string"
+    },
+    "objectInstanceId": {
+      "description": "An identifier with the intention of being globally unique.\n",
+      "type": "string"
+    },
+    "subObjectInstanceId": {
+      "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+      "type": "string"
+    },
+    "performanceMetric": {
+      "description": "Performance metric associated with the threshold. This attribute shall contain the related \"Measurement Name\" value as defined in clause 7.2 of ETSI GS NFV-IFA 027.\n",
+      "type": "string"
+    },
+    "performanceValue": {
+      "description": "Value of the metric that resulted in threshold crossing. The type of this attribute shall correspond to the related \"Measurement Unit\" as defined in clause 7.2 of ETSI GS NFV-IFA 027.\n",
+      "type": "object"
+    },
+    "context": {
+      "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+      "type": "object"
+    },
+    "_links": {
+      "description": "Links to resources related to this notification.\n",
+      "type": "object",
+      "required": [
+        "threshold"
+      ],
+      "properties": {
+        "objectInstance": {
+          "description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
+          "type": "object",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
             }
-          },
-          "objectInstance": {
-            "description": "This type represents a link to a resource.\n",
-            "type": "object",
-            "required": [
-              "href"
-            ],
-            "properties": {
-              "href": {
-                "description": "URI of the referenced resource.\n",
-                "type": "string",
-                "format": "url"
-              }
-            }
-          },
-          "threshold": {
-            "description": "This type represents a link to a resource.\n",
-            "type": "object",
-            "required": [
-              "href"
-            ],
-            "properties": {
-              "href": {
-                "description": "URI of the referenced resource.\n",
-                "type": "string",
-                "format": "url"
-              }
+          }
+        },
+        "threshold": {
+          "description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
+          "type": "object",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
             }
           }
         }
       }
     }
-  }
\ No newline at end of file
+  }
+}
\ No newline at end of file