diff --git a/SOL005/NSPerformanceManagement-API/IndividualPmJob.robot b/SOL005/NSPerformanceManagement-API/IndividualPmJob.robot
index 3db568934ae8dc5307925497d9ad8f3440168966..f638d83a2c10009a35a61f6bad238b2dad7083b8 100644
--- a/SOL005/NSPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL005/NSPerformanceManagement-API/IndividualPmJob.robot
@@ -16,7 +16,7 @@ GET individual NS Performance Job
     ...    Test title: Get individual NS Performance Job
     ...    Test objective: The objective is to test the retrieval of an individual NS Performance monitoring job and perform a JSON schema and content validation of the collected job data structure
     ...    Pre-conditions: A NS instance is instantiated. One or more NS Performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -30,7 +30,7 @@ GET individual NS Performance Job with invalid resource identifier
     ...    Test title: Get individual NS Performance Job with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual NS 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 NS instance is instantiated. One or more NS Performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -43,7 +43,7 @@ DELETE Individual NS Performance Job with invalid resource identifier
     ...    Test title: Delete individual NS Performance Job with invalid resource identifier
     ...    Test objective: The objective is to test that the deletion of an individual NS Performance monitoring job fails when using an invalid resource identifier
     ...    Pre-conditions: A NS instance is instantiated. One or more NS Performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -55,7 +55,7 @@ POST Individual NS Performance Job - Method not implemented
     ...    Test title: POST Individual NS Performance Job - method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new NS Performance Monitoring Job
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -67,7 +67,7 @@ PUT Individual NS Performance Job - Method not implemented
     ...    Test title: PUT Individual NS Performance Job - method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing NS Performance Monitoring Job
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -79,7 +79,7 @@ PATCH Individual NS Performance Job
     ...    Test title: PATCH Individual NS Performance Job 
     ...    Test objective: The objective is to test that PATCH method modify an existing new NS Performance Monitoring Job
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: Resource modified
@@ -92,7 +92,7 @@ DELETE Individual NS Performance Job
     ...    Test title: Delete Individual NS Performance Job
     ...    Test objective: The objective is to test the deletion of an individual NS Performance monitoring job
     ...    Pre-conditions: A NS instance is instantiated. One or more NS Performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS Performance Job is no more available in the NFVO    
@@ -105,7 +105,7 @@ PATCH Individual NS Performance Job - Precondition failed
     ...    Test title: PATCH Individual NS Performance Job - Precondition failed
     ...    Test objective: The objective is to attempt to Modify an individual NS Performance job fails, where the precondition was not met
     ...    Pre-conditions: The related job already exist
-    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The resource is not modified
@@ -118,7 +118,7 @@ PATCH Individual NS Performance Job - Unprocessable Entity
     ...    Test title: PATCH Individual NS Performance Job - Unprocessable Entity
     ...    Test objective: The objective is to test that PATCH method cannot modify an exsisting individual PM job resource when a request contains syntactically correct data but the data cannot be processed.
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSPerformanceManagement-API/IndividualReport.robot b/SOL005/NSPerformanceManagement-API/IndividualReport.robot
index 44e8ef652bff2c8596173143f26fe0bd4222b839..9da05363b2cc275eb2e9a9350192309f7ede0d95 100644
--- a/SOL005/NSPerformanceManagement-API/IndividualReport.robot
+++ b/SOL005/NSPerformanceManagement-API/IndividualReport.robot
@@ -11,7 +11,7 @@ Get Individual Performance Report
     ...    Test title: Get Individual Performance Report
     ...    Test objective: The objective is to test the retrieval of an individual NS performance report associated to a monitoring job and perform a JSON schema validation of the collected report data structure
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance reports are set for a monitoring job in the NFVO.
-    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -24,7 +24,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 NS performance report associated to a monitoring job fails when using an invalid resource endpoint 
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance reports are set for a monitoring job in the NFVO.
-    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -37,7 +37,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 NS performance report within a monitoring job
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -49,7 +49,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 NS performance report within a monitoring job
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -61,7 +61,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 NS performance report within a monitoring job
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -73,7 +73,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 NS performance report within a monitoring job
     ...    Pre-conditions: none
-    ...    Reference: Clause 7.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSPerformanceManagement-API/IndividualThreshold.robot b/SOL005/NSPerformanceManagement-API/IndividualThreshold.robot
index 2a61c5b1432461876b4134143ea70c240590d9dc..8a7d666ce3bc164e0f76ba4189df19689dc69aea 100644
--- a/SOL005/NSPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL005/NSPerformanceManagement-API/IndividualThreshold.robot
@@ -18,7 +18,7 @@ GET Individual Threshold
     ...    Test title: GET Individual Threshold
     ...    Test objective: The objective is to test the retrieval of an individual NS performance threshold and perform a JSON schema and content validation of the collected threshold data structure
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -32,7 +32,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 NS performance threshold fails when using an invalid resource identifier
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -45,7 +45,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 NS performance threshold
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -57,7 +57,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 NS performance Threshold
     ...    Pre-conditions: A NS instance is instantiated
-    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -69,7 +69,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 NS performance threshold
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.6.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.6.3.3 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -81,7 +81,7 @@ PATCH Individual Threshold
     ...    Test title: PATCH Individual Threshold 
     ...    Test objective: The objective is to test that PATCH method modify an existing NS performance threshold
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS performance Threshold is modified by the operation
@@ -95,7 +95,7 @@ DELETE Individual Threshold
     ...    Test title: DELETE Individual Threshold
     ...    Test objective: The objective is to test the deletion of an individual NS performance threshold
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS performance Threshold is not available anymore in the NFVO    
@@ -108,7 +108,7 @@ PATCH Individual Threshold - Precondition failed
     ...    Test title: PATCH Individual Threshold - Precondition failed 
     ...    Test objective: The objective is to attempt to Modify an individual NS Performance threshold fails, where the precondition was not met
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS performance Threshold is not modified by the operation
@@ -122,7 +122,7 @@ PATCH Individual Threshold - Unprocessable Entity
     ...    Test title: PATCH Individual NS Performance Job - Unprocessable Entity
     ...    Test objective: The objective is to test that PATCH method cannot modify an exsisting individual PM job resource when a request contains syntactically correct data but the data cannot be processed.
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS performance Threshold is not modified by the operation
diff --git a/SOL005/NSPerformanceManagement-API/NotificationEndpoint.robot b/SOL005/NSPerformanceManagement-API/NotificationEndpoint.robot
index 94bea62519077b6fb0f1401815a599443a4630a3..ff0698f922e51c28e474adf9d6b902256913a41a 100644
--- a/SOL005/NSPerformanceManagement-API/NotificationEndpoint.robot
+++ b/SOL005/NSPerformanceManagement-API/NotificationEndpoint.robot
@@ -13,7 +13,7 @@ NS Performance Information Availability Notification
     ...    Test title: NS Performance Information Availability Notification
     ...    Test objective: The objective is to test that NS Performance Information Availability Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A NS performance job is created, and information availability notifications is available in the NFVO.
-    ...    Reference: Clause 7.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -25,7 +25,7 @@ NS Threshold Crossed Notification
     ...    Test title: NS Threshold Crossed Notification
     ...    Test objective: The objective is to test that NS Threshold Crossed Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A NS performance job is created, and threshold crossed notifications is available in the NFVO.
-    ...    Reference: Clause 7.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL005/NSPerformanceManagement-API/Notifications.robot b/SOL005/NSPerformanceManagement-API/Notifications.robot
index af3a71f63cdcdfe12bcae7a132773209729f5140..bc86b4197eda550d83983b929118e836615ff960 100644
--- a/SOL005/NSPerformanceManagement-API/Notifications.robot
+++ b/SOL005/NSPerformanceManagement-API/Notifications.robot
@@ -16,7 +16,7 @@ NS Performance Information Availability Notification
     ...    Test title: NS Performance Information Availability Notification
     ...    Test objective: The objective is to test the dispatch of NS Performance Information Availability Notification when new NS 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 NS performance job is created, and a subscription for information availability notifications is available in the NFVO.
-    ...    Reference: Clause 7.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -29,7 +29,7 @@ NS Threshold Crossed Notification
     ...    Test title: NS Threshold Crossed Notification
     ...    Test objective: The objective is to test the dispatch of NS Threshold Crossed Notification when a previously set NS 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 NS performance job is created, and a threshold subscription is available in the NFVO.
-    ...    Reference: Clause 7.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL005/NSPerformanceManagement-API/PMJobs.robot b/SOL005/NSPerformanceManagement-API/PMJobs.robot
index bbb6ef7ebbd87c4cfd9b42ad377f7267b6f27e8c..ccf8fd2830e1d71ca1067f3a69fdde76b7ce9fe3 100644
--- a/SOL005/NSPerformanceManagement-API/PMJobs.robot
+++ b/SOL005/NSPerformanceManagement-API/PMJobs.robot
@@ -17,7 +17,7 @@ GET all NS Performance Monitoring Jobs
     ...    Test title: GET all NS Performance Monitoring Jobs
     ...    Test objective: The objective is to test the retrieval of all the available NS performance monitoring jobs and perform a JSON schema and content validation of the collected jobs data structure
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -31,7 +31,7 @@ GET NS Performance Monitoring Jobs with attribute-based filter
     ...    Test title: GET all NS Performance Monitoring Jobs with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of NS 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 NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -45,7 +45,7 @@ GET all NS Performance Monitoring Jobs with "all_fields" attribute selector
     ...    Test title: GET all NS Performance Monitoring Jobs with "all_fields" attribute selector
     ...    Test objective: The objective is to test the retrieval of all NS 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 NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 4.3.3.2.1, 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 4.3.3.2.1, 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -59,7 +59,7 @@ GET all NS Performance Monitoring Jobs with "exclude_default" attribute selector
     ...    Test title: GET all NS Performance Monitoring Jobs with "exclude_default" attribute selector
     ...    Test objective: The objective is to test the retrieval of all NS 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 NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 4.3.3.2.1, 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 4.3.3.2.1, 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -73,7 +73,7 @@ GET all NS Performance Monitoring Jobs with "fields" attribute selector
     ...    Test title: GET all NS Performance Monitoring Jobs with "fields" attribute selector
     ...    Test objective: The objective is to test the retrieval of all NS 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 "include" selector
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 4.3.3.2.1, 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 4.3.3.2.1, 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the use of "include" attribute selector
     ...    Post-Conditions: none
@@ -87,7 +87,7 @@ GET all NS Performance Monitoring Jobs with "exclude" attribute selector
     ...    Test title: GET all NS Performance Monitoring Jobs with exclude_fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all NS performance monitoring jobs "exclude" attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued "exclude" selector
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 4.3.3.2.1, 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 4.3.3.2.1, 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the use of "exclude" attribute selector
     ...    Post-Conditions: none
@@ -101,7 +101,7 @@ GET NS Performance Monitoring Jobs with invalid attribute-based filter
     ...    Test title: GET NS Performance Monitoring Jobs with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of NS 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 NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -114,7 +114,7 @@ GET NS Performance Monitoring Jobs with invalid resource endpoint
     ...    Test title: GET NS Performance Monitoring Jobs with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of NS performance monitoring jobs fails when using invalid resource endpoint
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -127,7 +127,7 @@ Create new NS Performance Monitoring Job
     ...    Test title:  Create a new NS Performance Monitoring Job
     ...    Test objective: The objective is to test the creation of a new NS performance monitoring job and perform the JSON schema validation of the returned job data structure
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS Performance Job is successfully created on the NFVO
@@ -141,7 +141,7 @@ PUT all NS Performance Monitoring Jobs - Method not implemented
     ...    Test title: PUT all NS Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify NS Performance Monitoring Jobs
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -153,7 +153,7 @@ PATCH all NS Performance Monitoring Jobs - Method not implemented
     ...    Test title: PATCH all NS Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update NS Performance Monitoring Jobs
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -165,7 +165,7 @@ DELETE all NS Performance Monitoring Jobs - Method not implemented
     ...    Test title: DELETE all NS Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete NS Performance Monitoring Jobs
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -177,7 +177,7 @@ GET all NS Performance Monitoring Jobs as Paged Response
     ...    Test title: GET all NS Performance Monitoring Jobs as Paged Response
     ...    Test objective: The objective is to test the retrieval of all the available NS performance monitoring jobs as paged response.
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -190,7 +190,7 @@ GET NS Performance Monitoring Jobs - Bad Request Response too Big
     ...    Test title: GET NS Performance Monitoring Jobs - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of NS performance monitoring jobs fails because reponse is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -203,7 +203,7 @@ GET all NS Performance Monitoring Jobs with "fields" and "exclude_default" attri
     ...    Test title: GET all NS Performance Monitoring Jobs with "fields" and "exclude_default" attribute selector
     ...    Test objective: The objective is to test the retrieval of all NS performance monitoring jobs "fields" and "exclude_default" attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued selector
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: Clause 4.3.3.2.1, 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 4.3.3.2.1, 7.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the use of "include" attribute selector
     ...    Post-Conditions: none
@@ -217,7 +217,7 @@ POST new NS Performance Monitoring Job - Unprocessable Entity
     ...    Test title: POST new NS Performance Monitoring Job - Unprocessable Entity
     ...    Test objective:  The objective is to test the creation of a new NS performance monitoring job fails when a request contains syntactically correct data but the data cannot be processed.
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance jobs are set in the NFVO.
-    ...    Reference: clause 7.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: clause 7.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSPerformanceManagement-API/Thresholds.robot b/SOL005/NSPerformanceManagement-API/Thresholds.robot
index 60f8f13ac8a42db8659eefb188cf20832deac745..80347a935848952cae1323205e7b52c27fea4736 100644
--- a/SOL005/NSPerformanceManagement-API/Thresholds.robot
+++ b/SOL005/NSPerformanceManagement-API/Thresholds.robot
@@ -18,7 +18,7 @@ GET All Performance Thresholds
     ...    Test title: GET All Performance Thresholds
     ...    Test objective: The objective is to test the retrieval of all the available NS performance thresholds and perform a JSON schema validation of the collected thresholds data structure
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -31,7 +31,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 NS 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 NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -45,7 +45,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 NS performance thresholds fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -58,7 +58,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 NS performance thresholds fails when using invalid resource endpoint, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -71,7 +71,7 @@ Create new Performance Threshold
     ...    Test title:  Create new Performance Threshold
     ...    Test objective: The objective is to test the creation of a new NS performance threshold and perform the JSON schema validation of the returned threshold data structure
     ...    Pre-conditions: A NS instance is instantiated.
-    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS performance Threshold is successfully created on the NFVO
@@ -86,7 +86,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 NS performance Thresholds
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -98,7 +98,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 NS performance Thresholds
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -110,7 +110,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 NS performance Thresholds
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -122,7 +122,7 @@ GET All Performance Thresholds as Paged Response
     ...    Test title: GET All Performance Thresholds as Paged Response
     ...    Test objective: The objective is to test the retrieval of all the available NS performance thresholds as paged response.
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -135,7 +135,7 @@ GET Performance Thresholds - Bad Request Response too Big
     ...    Test title: GET Performance Thresholds - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of NS performance thresholds fails because reponse is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A NS instance is instantiated. One or more NS performance thresholds are set in the NFVO.
-    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: Clause 7.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -148,7 +148,7 @@ POST new Performance Threshold - Unprocessable Entity
     ...    Test title: POST new Performance Threshold - Unprocessable Entity
     ...    Test objective:  The objective is to test the creation of a new NS performance threshold fails when a request contains syntactically correct data but the data cannot be processed.
     ...    Pre-conditions: A NS instance is instantiated.
-    ...    Reference: clause 7.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
+    ...    Reference: clause 7.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v3.6.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none