diff --git a/SOL002/VNFIndicator-API/IndividualSubscription.robot b/SOL002/VNFIndicator-API/IndividualSubscription.robot
index 2f82d44ef1f2eeb0b5b6159e0ee6ba836daff10c..7f67726c53d3a1af55972d3af5d6568fa18820c3 100644
--- a/SOL002/VNFIndicator-API/IndividualSubscription.robot
+++ b/SOL002/VNFIndicator-API/IndividualSubscription.robot
@@ -11,7 +11,7 @@ GET Individual VNF Indicator Subscription
     ...    Test title: Get individual subscription to VNF performance indicators
     ...    Test objective: The objective is to test the retrieval of individual VNF performance indicator subscription and perform a JSON schema validation of the returned subscription data structure
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
@@ -24,7 +24,7 @@ GET Individual VNF Indicator Subscription with invalid resource identifier
     ...    Test title: Get individual subscription to VNF performance indicators
     ...    Test objective: The objective is to test that the retrieval of individual VNF performance indicator subscription fails when using an invalid resource identifier. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
@@ -37,7 +37,7 @@ DELETE Individual VNF Indicator Subscription
     ...    Test title: Delete individual subscription to VNF performance indicators
     ...    Test objective: The objective is to test the deletion of an individual VNF performance indicator subscription.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: clause 8.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: clause 8.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: The subscription to VNF performance indicators is deleted
@@ -50,7 +50,7 @@ DELETE Individual VNF Indicator Subscription with invalid resource identifier
     ...    Test title: Delete individual subscription to VNF performance indicators
     ...    Test objective: The objective is to test that the deletion of an individual VNF performance indicator subscription fails when using an invalid resource identifier. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: clause 8.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: clause 8.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none   
@@ -63,7 +63,7 @@ PUT Individual VNF Indicator Subscription - Method not implemented
     ...    Test title: PUT individual VNF indicator subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an individual VNF performance indicator subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -75,7 +75,7 @@ PATCH Individual VNF Indicator Subscription - Method not implemented
     ...    Test title: PUT individual VNF indicator subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update an individual VNF performance indicator subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -87,7 +87,7 @@ POST Individual VNF Indicator Subscription - Method not implemented
     ...    Test title: PUT individual VNF indicator subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an individual VNF performance indicator subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -98,7 +98,7 @@ GET Individual VNF Indicator Subscription with permitted authorization scope
     ...    Test title: Get individual subscription to VNF performance indicators with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of individual VNF performance indicator subscription and perform a JSON schema validation of the returned subscription data structure with permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
@@ -110,7 +110,7 @@ GET Individual VNF Indicator Subscription with NOT permitted authorization scope
     ...    Test title: Get individual subscription to VNF performance indicators with NOT permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of individual VNF performance indicator subscription and perform a JSON schema validation of the returned subscription data structure with NOT permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
diff --git a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
index 7bebc51ff5882f538c023b922fef2c3bd666bf6c..dbcf58e65105cc4962dc8ba60fd6155bd691b3bb 100644
--- a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
+++ b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
@@ -10,7 +10,7 @@ Get Individual Indicator for VNF Instance
     ...    Test title: Get individual performance indicator for a VNF instance
     ...    Test objective: The objective is to test the retrieval of a performance indicator for a given VNF instance and perform a JSON schema validation of the returned indicator data structure
     ...    Pre-conditions: A VNF instance is instantiated. At least one measure of performance indicator is available for the given VNF instance.
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ Get Individual Indicator for VNF Instance with invalid indicator identifier
     ...    Test title: Get individual performance indicator for a VNF instance with invalid indicator identifier
     ...    Test objective: The objective is to test that the retrieval of a performance indicator for a given VNF instance fails when using an invalid resource identifier. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. At least one measure of performance indicator is available for the given VNF instance.
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -38,7 +38,7 @@ POST Individual VNF Indicator - Method not implemented
     ...    Test title: POST individual performance indicator for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new performance indicator for a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ PUT Individual VNF Indicator - Method not implemented
     ...    Test title: PUT individual performance indicator for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an existing performance indicator for a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -62,7 +62,7 @@ PATCH Individual VNF Indicator - Method not implemented
     ...    Test title: PATCH individual performance indicator for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update an existing performance indicator for a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -74,7 +74,7 @@ DELETE Individual VNF Indicator - Method not implemented
     ...    Test title: DELETE individual performance indicator indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing performance indicator for a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -86,7 +86,7 @@ Get Individual Performance Indicator
     ...    Test title: Get Individual Performance Indicator 
     ...    Test objective: The objective is to test the retrieval of a performance indicator and perform a JSON schema validation of the returned indicator data structure
     ...    Pre-conditions: At least one measure of performance indicator is available..
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
@@ -100,7 +100,7 @@ Get Individual Performance Indicator with invalid indicator identifier
     ...    Test title: Get Individual Performance Indicator with invalid indicator identifier
     ...    Test objective: The objective is to test that the retrieval of a performance indicator fails when using an invalid resource identifier. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: At least one measure of performance indicator is available.
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -113,7 +113,7 @@ POST Individual Performance Indicator - Method not implemented
     ...    Test title: POST Individual Performance Indicator - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new performance indicator.
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -125,7 +125,7 @@ PUT Individual Performance Indicator - Method not implemented
     ...    Test title: PUT Individual Performance Indicator - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an existing performance indicator.
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -137,7 +137,7 @@ PATCH Individual Performance Indicator - Method not implemented
     ...    Test title: PATCH Individual Performance Indicator - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update an existing performance indicator.
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -149,7 +149,7 @@ DELETE Individual Performance Indicator - Method not implemented
     ...    Test title: DELETE Individual Performance Indicator - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing performance indicator.
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -160,7 +160,7 @@ Get Individual Indicator for VNF Instance with permitted authorization scope
     ...    Test title: Get individual performance indicator for a VNF instance with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of a performance indicator for a given VNF instance and perform a JSON schema validation of the returned indicator data structure with permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. At least one measure of performance indicator is available for the given VNF instance.
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
@@ -174,7 +174,7 @@ Get Individual Indicator for VNF Instance with NOT permitted authorization scope
     ...    Test title: Get individual performance indicator for a VNF instance with NOT permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of a performance indicator for a given VNF instance and perform a JSON schema validation of the returned indicator data structure with NOT permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. At least one measure of performance indicator is available for the given VNF instance.
-    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
diff --git a/SOL002/VNFIndicator-API/NotificationEndpoint.robot b/SOL002/VNFIndicator-API/NotificationEndpoint.robot
index 6eb13de5833beed3996e9056ce049c281f41ff3c..e3e228ce79320f10d3281a87ee495bdb932216c8 100644
--- a/SOL002/VNFIndicator-API/NotificationEndpoint.robot
+++ b/SOL002/VNFIndicator-API/NotificationEndpoint.robot
@@ -12,7 +12,7 @@ VNF Indicator Value Change Notification
     ...    Test title: VNF Indicator Value Change Notification
     ...    Test objective: The objective is to test that the POST request triggers VNF Indicator Value Change Notification .
     ...    Pre-conditions: A VNF is instantiated, and a subscription for indicator value change notifications is available in the VNF.
-    ...    Reference: Clause 8.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -24,7 +24,7 @@ Supported Indicators Change Notification
     ...    Test title: Supported Indicators Change Notification
     ...    Test objective: The objective is to test that the POST request triggers Supported Indicators Change Notification .
     ...    Pre-conditions: A VNF is instantiated, and a subscription for supported indicators change notifications is available in the VNF.
-    ...    Reference: Clause 8.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -36,7 +36,7 @@ Test the Notification Endpoint - Successful
     ...    Test title: Test the Notification Endpoint - Successful
     ...    Test objective: The objective is to test the Notification Endpoint provided by the notification consumer.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 8.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -48,7 +48,7 @@ Test the Notification Endpoint - NOT FOUND
     ...    Test title: Test the Notification Endpoint - UNREACHABLE
     ...    Test objective: The objective is to test the Notification Endpoint provided by the notification consumer.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 8.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: The notification endpoint is unreachable by the API producer.
     ...    Post-Conditions: none 
@@ -61,7 +61,7 @@ PUT Notification endpoint - Method Not Implemented
     ...    Test title: PUT Notification endpoint - Method Not Implemented
     ...    Test objective: The objective is to test the PUT method for Notification Endpoint provided by the consumer is not implemented.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 8.4.7.3.3 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.7.3.3 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -73,7 +73,7 @@ PATCH Notification endpoint - Method Not Implemented
     ...    Test title: PATCH Notification endpoint - Method Not Implemented
     ...    Test objective: The objective is to test the PATCH method for Notification Endpoint provided by the consumer is not implemented.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 8.4.7.3.4 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.7.3.4 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -85,7 +85,7 @@ DELETE Notification endpoint - Method Not Implemented
     ...    Test title: DELETE Notification endpoint - Method Not Implemented
     ...    Test objective: The objective is to test the DELETE method for Notification Endpoint provided by the consumer is not implemented.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 8.4.7.3.5 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.7.3.5 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFIndicator-API/Notifications.robot b/SOL002/VNFIndicator-API/Notifications.robot
index 337f4009dd737a31080d2b46b4a3f30d70a12e9c..584225b9e7faaaba982597738fbf4ef47d48f5fc 100644
--- a/SOL002/VNFIndicator-API/Notifications.robot
+++ b/SOL002/VNFIndicator-API/Notifications.robot
@@ -16,7 +16,7 @@ VNF Indicator Value Change Notification
     ...    Test title: VNF Indicator Value Change Notification
     ...    Test objective: The objective is to test the dispatch of VNF Indicator Value Change Notification when new indicator values are available in the VNF, 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 is instantiated, and a subscription for indicator value change notifications is available in the VNF.
-    ...    Reference: Clause 8.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VNF
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -29,7 +29,7 @@ Supported Indicators Change Notification
     ...    Test title: Supported Indicators Change Notification
     ...    Test objective: The objective is to test the dispatch of Supported Indicators Change Notification when new indicator values are available in the VNF, 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 is instantiated, and a subscription for supported indicators change notifications is available in the VNF.
-    ...    Reference: Clause 8.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VNF
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFIndicator-API/Subscriptions.robot b/SOL002/VNFIndicator-API/Subscriptions.robot
index 5ae4c24a3960eae3a5d3797cd1db8ad09f240bb1..47662285dcc2708d17521d758e919c10d23ea7e2 100644
--- a/SOL002/VNFIndicator-API/Subscriptions.robot
+++ b/SOL002/VNFIndicator-API/Subscriptions.robot
@@ -17,7 +17,7 @@ GET VNF Indicators Subscriptions
     ...    Test title: GET VNF Indicators Subscriptions
     ...    Test objective: The objective is to test the retrieval of all VNF indicators subscriptions and perform a JSON schema validation of the returned subscriptions data structure
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators
     ...    Post-Conditions: none
@@ -30,7 +30,7 @@ GET VNF Indicators Subscriptions with attribute-based filter
     ...    Test title: GET VNF Indicators Subscriptions with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of all VNF indicators subscriptions using attribute-based filter and perform a JSON schema and content validation of the returned subscriptions data structure
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators
     ...    Post-Conditions: none
@@ -44,7 +44,7 @@ GET VNF Indicators Subscriptions with invalid attribute-based filter
     ...    Test title: GET VNF Indicators Subscriptions with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of all VNF indicators subscriptions fails when using invalid attribute-based filter. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators
     ...    Post-Conditions: none
@@ -57,7 +57,7 @@ GET VNF Indicators Subscriptions with invalid resource endpoint
     ...    Test title: GET VNF Indicators Subscriptions with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of all VNF indicators subscriptions fails when using invalid resource endpoint.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators.
     ...    Post-Conditions: none
@@ -70,12 +70,13 @@ Create new VNF indicator subscription
     ...    Test title: Create new VNF indicator subscription
     ...    Test objective: The objective is to test the creation of a new VNF indicator subscription perform a JSON schema and content validation of the returned subscriptions data structure
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators.
     ...    Post-Conditions: The VNF indicator subscription is successfully set and it matches the issued subscription
     Send Post Request for VNF Indicator Subscription
     Check HTTP Response Status Code Is    201
+    Check HTTP Response Header Contains    Location
     Check HTTP Response Body Json Schema Is    VnfIndicatorSubscription
     Check HTTP Response Body Matches the Subscription
     Check Postcondition VNF Indicator Subscription Is Set
@@ -85,7 +86,7 @@ PUT VNF Indicator Subscriptions - Method not implemented
     ...    Test title: PUT VNF Indicator Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF indicator subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators.
     ...    Post-Conditions: none
@@ -97,7 +98,7 @@ PATCH VNF Indicator Subscriptions - Method not implemented
     ...    Test title: PATCH VNF Indicator Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF indicator subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators.
     ...    Post-Conditions: none
@@ -109,7 +110,7 @@ DELETE VNF Indicator Subscriptions - Method not implemented
     ...    Test title: DELETE VNF Indicator Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete VNF indicator subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators.
     ...    Post-Conditions: none
@@ -121,7 +122,7 @@ GET VNF Indicators Subscriptions to get Paged Response
     ...    Test title: GET VNF Indicators Subscriptions to get Paged Response
     ...    Test objective: The objective is to test the retrieval of all VNF indicators subscriptions to get Paged Response.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators
     ...    Post-Conditions: none
@@ -134,7 +135,7 @@ GET VNF Indicators Subscriptions - Bad Request Response too Big
     ...    Test title: GET VNF Indicators Subscriptions - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of all VNF indicators subscriptions fails because response is too big. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators
     ...    Post-Conditions: none
@@ -147,7 +148,7 @@ POST Create a new Subscription - Unprocessable Content
     ...    Test title: POST Create a new Subscription - Unprocessable Content
     ...    Test objective: The objective is to test that content type of the message content is supported and the message content of a request contains syntactically correct data but the data cannot be processed.
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -160,12 +161,13 @@ Create new VNF indicator Subscription - DUPLICATION
     ...    Test title: POST Create a new subscription - DUPLICATION
     ...    Test objective: The POST method creates a new subscription even if an existing subscription to same content exist
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: SUT should support duplication of subscription creation
     ...    Post-Conditions: In response header Location shall not be null
     Post Create subscription - DUPLICATION
     Check HTTP Response Status Code Is    201
+    Check HTTP Response Header Contains    Location
     Check HTTP Response Body Json Schema Is    VnfIndicatorSubscription
     Check Operation Occurrence Id
 
@@ -174,19 +176,20 @@ Create new VNF indicator Subscription - NO-DUPLICATION
     ...    Test title: POST Create a new subscription - NO-DUPLICATION
     ...    Test objective: The POST method creates a new subscription even if an existing subscription to same content exist
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: SUT should not support duplication of subscription creation
     ...    Post-Conditions: In response header Location shall not be null
     Post Create subscription - NO-DUPLICATION
     Check HTTP Response Status Code Is    303
+    Check HTTP Response Header Contains    Location
     Check Operation Occurrence Id
 GET VNF Indicators Subscriptions with permitted authorization scope
     [Documentation]    Test ID: 6.3.2.4.14
     ...    Test title: GET VNF Indicators Subscriptions with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of all VNF indicators subscriptions and perform a JSON schema validation of the returned subscriptions data structure with permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators
     ...    Post-Conditions: none
@@ -198,7 +201,7 @@ GET VNF Indicators Subscriptions with NOT permitted authorization scope
     ...    Test title: GET VNF Indicators Subscriptions with not permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of all VNF indicators subscriptions and perform a JSON schema validation of the returned subscriptions data structure with not permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
-    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of indicators
     ...    Post-Conditions: none
diff --git a/SOL002/VNFIndicator-API/VNFIndicators.robot b/SOL002/VNFIndicator-API/VNFIndicators.robot
index a3e6e5ca4ed615fdd85ea78e0106f94bac459f28..78385d4d201477611bd929b56f1a7d583187a7e9 100644
--- a/SOL002/VNFIndicator-API/VNFIndicators.robot
+++ b/SOL002/VNFIndicator-API/VNFIndicators.robot
@@ -13,7 +13,7 @@ Get all VNF Indicators
     ...    Test title: Get all VNF Indicators
     ...    Test objective: The objective is to test the retrieval of all the available VNF indicators and perform a JSON schema validation of the collected indicators data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -26,7 +26,7 @@ Get VNF Indicators with attribute-based filter
     ...    Test title: Get VNF Indicators with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of VNF indicators using attribute-based filter, perform a JSON schema validation of the collected indicators data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -40,7 +40,7 @@ Get VNF Indicators with invalid attribute-based filter
     ...    Test title: Get VNF Indicators with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of VNF indicators fails when using invalid attribute-based filters, and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -53,7 +53,7 @@ Get all VNF Indicators with malformed authorization token
     ...    Test title: GET all VNF Indicators with malformed authrization token.
     ...    Test objective: The objective is to test that the retrieval of VNF indicators fails when using malformed authorization token
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 4.5.3.3, 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 4.5.3.3, 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators. The VNF requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -66,7 +66,7 @@ Get all VNF Indicators without authorization token
     ...    Test title: GET all VNF Indicators without authorization token
     ...    Test objective: The objective is to test that the retrieval of VNF indicators fails when omitting the authorization token
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 4.5.3.3, 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 4.5.3.3, 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators. The VNF requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -79,7 +79,7 @@ GET all VNF Indicators with expired or revoked authorization token
     ...    Test title: GET all VNF Indicators with expired or revoked authorization token
     ...    Test objective: The objective is to test that the retrieval of VNF indicators fails when using expired or revoked authorization token
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 4.5.3.3, 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 4.5.3.3, 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators. The VNF requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -92,7 +92,7 @@ Get all VNF Indicators with invalid resource endpoint
     ...    Test title: GET all VNF Indicators with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of VNF indicators fails when using invalid resource endpoint
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators. 
     ...    Post-Conditions: none
@@ -105,7 +105,7 @@ POST all VNF Indicators - Method not implemented
     ...    Test title: POST all VNF Indicators - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new VNF indicators
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -117,7 +117,7 @@ PUT all VNF Indicators - Method not implemented
     ...    Test title: PUT all VNF Indicators - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF indicators
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -129,7 +129,7 @@ PATCH all VNF Indicators - Method not implemented
     ...    Test title: PATCH all VNF Indicators - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF indicators
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -141,7 +141,7 @@ DELETE all VNF Indicators - Method not implemented
     ...    Test title: DELETE all VNF Indicators - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete VNF indicators
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -153,7 +153,7 @@ Get VNF Indicators to get Paged Response
     ...    Test title: Get VNF Indicators to get Paged Response
     ...    Test objective: The objective is to test the retrieval of all the available VNF indicators with Paged Response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -166,7 +166,7 @@ Get VNF Indicators - Bad Request Response too Big
     ...    Test title: Get VNF Indicators - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of VNF indicators 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 measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -178,7 +178,7 @@ Get all VNF Indicators with permitted authorization scope
     ...    Test title: Get all VNF Indicators with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of all the available VNF indicators and perform a JSON schema validation of the collected indicators data structure with permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -190,7 +190,7 @@ Get all VNF Indicators with not permitted authorization scope
     ...    Test title: Get all VNF Indicators with not permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of all the available VNF indicators and perform a JSON schema validation of the collected indicators data structure with not permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF performance indicators are available in the VNF.
-    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
diff --git a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
index 4dd13a9d457791ed24e18cc6875e022f76f21a9e..7332a2b52f9c2a1a264f2a3ca602e2f193cfa735 100644
--- a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
+++ b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
@@ -13,7 +13,7 @@ Get Indicators for VNF Instance
     ...    Test title: Get all performance indicators for a VNF instance
     ...    Test objective: The objective is to test the retrieval of all performance indicators for a given VNF instance and perform a JSON schema validation of the returned indicators data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
@@ -27,7 +27,7 @@ GET Indicators for VNF Instance with attribute-based filter
     ...    Test title: Get all performance indicators for a VNF instance with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of all performance indicators for a given VNF instance using attribute-based filter and perform a JSON schema validation of the returned indicators data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
@@ -41,7 +41,7 @@ Get Indicators for VNF Instance with invalid attribute-based filter
     ...    Test title: Get all performance indicators for a VNF instance with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of all performance indicators for a given VNF instance fails using invalid attribute-based filter. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -54,7 +54,7 @@ Get Indicators for VNF Instance with invalid resource identifier
     ...    Test title: Get all performance indicators for a VNF instance with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of all performance indicators for a given VNF instance fails when using invalid resource identifier. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -67,7 +67,7 @@ POST Indicators for VNF instance - Method not implemented
     ...    Test title: POST performance indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new performance indicators for a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -79,7 +79,7 @@ PUT Indicators for VNF instance - Method not implemented
     ...    Test title: PUT performance indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify existing performance indicators for a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -91,7 +91,7 @@ PATCH Indicators for VNF instance - Method not implemented
     ...    Test title: PATCH performance indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update existing performance indicators for a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -103,7 +103,7 @@ DELETE Indicators for VNF instance - Method not implemented
     ...    Test title: DELETE performance indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete performance indicators for a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -115,7 +115,7 @@ Get Indicators for VNF Instance to get Paged Response
     ...    Test title: Get Indicators for VNF Instance to get Paged Response
     ...    Test objective: The objective is to test the retrieval of all performance indicators for a given VNF instance to get paged response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
@@ -128,7 +128,7 @@ Get Indicators for VNF Instance - Bad Request Response too Big
     ...    Test title: Get Indicators for VNF Instance - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of all performance indicators for a given VNF instance fails when response is too big. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators.
     ...    Post-Conditions: none
@@ -140,7 +140,7 @@ Get Indicators for VNF Instance with permitted authorization scope
     ...    Test title: Get all performance indicators for a VNF instance with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of all performance indicators for a given VNF instance and perform a JSON schema validation of the returned indicators data structure with permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
@@ -153,7 +153,7 @@ Get Indicators for VNF Instance with NOT permitted authorization scope
     ...    Test title: Get all performance indicators for a VNF instance with not permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of all performance indicators for a given VNF instance and perform a JSON schema validation of the returned indicators data structure with not permitted authorization scope
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of performance indicators are available for the given VNF instance.
-    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v4.5.1
+    ...    Reference: Clause 8.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v5.1.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: The VNF supports the generation and maintenance of performance indicators
     ...    Post-Conditions: none
diff --git a/SOL002/VNFIndicator-API/environment/variables.txt b/SOL002/VNFIndicator-API/environment/variables.txt
index 7692af75fe4803ef72bd6ecf76625d0e4e90ccd8..1b75d73d9b6e16d10addcecb12eb202c36154eb6 100644
--- a/SOL002/VNFIndicator-API/environment/variables.txt
+++ b/SOL002/VNFIndicator-API/environment/variables.txt
@@ -50,7 +50,7 @@ ${INDICATORS_EM_SCOPE}=    vnfind_by_em:v1:indicators
 ${SUBSCRIPTIONS_EM_SCOPE}=     vnfind_by_em:v1:subscriptions
 ${OAUTH_Encryption_ALGORITHM}=      HS256
 ${NEG_SCOPE}=   vnfind_by_vnf:v2:invalid
-${API_VERSION}=     1.12.0
+${API_VERSION}=     1.13.0
 
 ${erroneousVnfInstanceId}    erroneousVnfInstanceId
 ${POS_FIELDS}     name=vnfIndicator
diff --git a/SOL002/VNFIndicator-API/schemas/ApiVersionInformation.schema.json b/SOL002/VNFIndicator-API/schemas/ApiVersionInformation.schema.json
index a79641197fe678896eb17d04beaac08068ea3285..b3582ea460ae3e8063bbade4e79bc73d22b2d4f5 100644
--- a/SOL002/VNFIndicator-API/schemas/ApiVersionInformation.schema.json
+++ b/SOL002/VNFIndicator-API/schemas/ApiVersionInformation.schema.json
@@ -1,36 +1,36 @@
 {
-    "description": "This type represents API version information.\n",
-    "type": "object",
-    "required": [
-      "uriPrefix",
-      "apiVersions"
-    ],
-    "properties": {
-      "uriPrefix": {
-        "description": "Specifies the URI prefix for the API, in the following form {apiRoot}/{apiName}/{apiMajorVersion}/.\n",
-        "type": "string"
-      },
-      "apiVersions": {
-        "description": "Version(s) supported for the API signaled by the uriPrefix attribute.\n",
-        "type": "array",
-        "items": {
-          "type": "object",
-          "required": [
-            "version"
-          ],
-          "properties": {
-            "version": {
-              "description": "Identifies a supported version. The value of the version attribute shall be a version identifier as specified in clause 9.1 (SOL013).\n",
-              "type": "string"
-            },
-            "isDeprecated": {
-              "description": "If such information is available, this attribute indicates whether use of the version signaled by the version attribute is deprecated (true) or not (false).\nA deprecated version is still supported by the API producer but is recommended not to be used any longer. When a version is no longer supported, it does not appear in the response body.\n",
-              "type": "boolean"
-            },
-            "retirementDate": {
-              "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
-              "type": "string",
-              "format": "date-time"
+  "description": "This type represents API version information.\n",
+  "type": "object",
+  "required": [
+    "uriPrefix",
+    "apiVersions"
+  ],
+  "properties": {
+    "uriPrefix": {
+      "description": "Specifies the URI prefix for the API, in the following form {apiRoot}/{apiName}/{apiMajorVersion}/.\n",
+      "type": "string"
+    },
+    "apiVersions": {
+      "description": "Version(s) supported for the API signaled by the uriPrefix attribute.\n",
+      "type": "array",
+      "items": {
+        "type": "object",
+        "required": [
+          "version"
+        ],
+        "properties": {
+          "version": {
+            "description": "Identifies a supported version. The value of the version attribute shall be a version identifier as specified in clause 9.1 (SOL013).\n",
+            "type": "string"
+          },
+          "isDeprecated": {
+            "description": "If such information is available, this attribute indicates whether use of the version signaled by the version attribute is deprecated (true) or not (false).\nA deprecated version is still supported by the API producer but is recommended not to be used any longer. When a version is no longer supported, it does not appear in the response body.\n",
+            "type": "boolean"
+          },
+          "retirementDate": {
+            "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+            "type": "string",
+            "format": "date-time"
           }
         }
       }
diff --git a/SOL002/VNFIndicator-API/schemas/ProblemDetails.schema.json b/SOL002/VNFIndicator-API/schemas/ProblemDetails.schema.json
index 2af3ef9b3f8c0e1dc6bfa39a818ba45e63ca223c..5dd624375ff2d83564d74432bf1e7049e0467f04 100644
--- a/SOL002/VNFIndicator-API/schemas/ProblemDetails.schema.json
+++ b/SOL002/VNFIndicator-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/VNFIndicator-API/schemas/VnfIndicatorSubscriptions.schema.json b/SOL002/VNFIndicator-API/schemas/VnfIndicatorSubscriptions.schema.json
index 1c074e6d017832503d55acda09459b5878fc8821..425fe04094c5aabe0d037562546b74e1b9293898 100644
--- a/SOL002/VNFIndicator-API/schemas/VnfIndicatorSubscriptions.schema.json
+++ b/SOL002/VNFIndicator-API/schemas/VnfIndicatorSubscriptions.schema.json
@@ -1,111 +1,109 @@
 {
-	"type": "array",
-	"items": {
-        "description": "This type represents a subscription related to notifications about VNF indicator value changes.\n",
+  "type": "array",
+  "items": {
+    "description": "This type represents a subscription related to notifications about VNF indicator value changes.\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 subscription filter for notifications related to VNF indicators.\nAt a particular nesting level in the filter structure, the following applies:  All attributes shall match in order for the filter to match (logical \"and\" between different  filter attributes). If an attribute is an array, the attribute shall match if at least one of  the values in the array matches (logical \"or\" between the values of one filter attribute).\nNOTE:\tThe permitted values of the \"notificationTypes\" attribute are spelled exactly as the names \n      of the notification types to facilitate automated code generation systems.\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 subscription filter for notifications related to VNF indicators.\nAt a particular nesting level in the filter structure, the following applies:  All attributes shall match in order for the filter to match (logical \"and\" between different  filter attributes). If an attribute is an array, the attribute shall match if at least one of  the values in the array matches (logical \"or\" between the values of one filter attribute).\nNOTE:\tThe permitted values of the \"notificationTypes\" attribute are spelled exactly as the names \n      of the notification types to facilitate automated code generation systems.\n",
+          "vnfInstanceSubscriptionFilter": {
+            "description": "This type represents subscription filter criteria to match VNF instances. * NOTE 1:\tThe attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances\n          that are based on certain VNFDs in a filter. They should not be used both in the same filter instance,\n          but one alternative should be chosen.\n  NOTE 2:\tThe attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF\n          instances in a filter. They should not be used both in the same filter instance, but one alternative\n          should be chosen.\n",
             "type": "object",
-            "properties": {
-              "vnfInstanceSubscriptionFilter": {
-                "description": "This type represents subscription filter criteria to match VNF instances. * NOTE 1:\tThe attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances\n          that are based on certain VNFDs in a filter. They should not be used both in the same filter instance,\n          but one alternative should be chosen.\n  NOTE 2:\tThe attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF\n          instances in a filter. They should not be used both in the same filter instance, but one alternative\n          should be chosen.\n",
-                "type": "object",
-                "anyOf": [
+            "anyOf": [
+              {
+                "oneOf": [
                   {
-                    "oneOf": [
-                      {
-                        "required": [
-                          "vnfdId"
-                        ]
-                      },
-                      {
-                        "required": [
-                          "vnfProductsFromProviders"
-                        ]
-                      }
+                    "required": [
+                      "vnfdId"
                     ]
                   },
                   {
-                    "oneOf": [
-                      {
-                        "required": [
-                          "vnfInstanceIds"
-                        ]
-                      },
-                      {
-                        "required": [
-                          "vnfInstanceNames"
-                        ]
-                      }
+                    "required": [
+                      "vnfProductsFromProviders"
                     ]
                   }
-                ],
-                "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. See note 1.\n",
-                    "type": "array",
-                    "items": {
-                      "description": "An identifier with the intention of being globally unique.\n",
-                      "type": "string"
-                    }
+                ]
+              },
+              {
+                "oneOf": [
+                  {
+                    "required": [
+                      "vnfInstanceIds"
+                    ]
                   },
-                  "vnfProductsFromProviders": {
-                    "description": "If present, match VNF instances that belong to VNF products from certain providers. See note 1.\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"
-                                      }
-                                    }
+                  {
+                    "required": [
+                      "vnfInstanceNames"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "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. See note 1.\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. See note 1.\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"
                                   }
                                 }
                               }
@@ -114,69 +112,71 @@
                         }
                       }
                     }
-                  },
-                  "vnfInstanceIds": {
-                    "description": "If present, match VNF instances with an instance identifier listed in this attribute. See note 2.\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. See note 2.\n",
-                    "type": "array",
-                    "items": {
-                      "type": "string"
-                    }
                   }
                 }
               },
-              "notificationTypes": {
-                "description": "Match particular notification types. \nPermitted values: -\tVnfIndicatorValueChangeNotification -\tSupportedIndicatorsChangeNotification See note.\n",
-                "type": "string",
-                "enum": [
-                  "VnfIndicatorValueChangeNotification",
-                  "SupportedIndicatorsChangeNotification"
-                ]
+              "vnfInstanceIds": {
+                "description": "If present, match VNF instances with an instance identifier listed in this attribute. See note 2.\n",
+                "type": "array",
+                "items": {
+                  "description": "An identifier with the intention of being globally unique.\n",
+                  "type": "string"
+                }
               },
-              "indicatorIds": {
-                "description": "Match particular VNF indicator identifiers.\n",
+              "vnfInstanceNames": {
+                "description": "If present, match VNF instances with a VNF Instance Name listed in this attribute. See note 2.\n",
                 "type": "array",
                 "items": {
-                  "description": "An identifier that is unique within a VNF descriptor.\n",
                   "type": "string"
                 }
               }
             }
           },
-          "callbackUri": {
-            "description": "The URI of the endpoint to send the notification to.\n",
+          "notificationTypes": {
+            "description": "Match particular notification types. \nPermitted values: -\tVnfIndicatorValueChangeNotification -\tSupportedIndicatorsChangeNotification See note.\n",
             "type": "string",
-            "format": "url"
+            "enum": [
+              "VnfIndicatorValueChangeNotification",
+              "SupportedIndicatorsChangeNotification"
+            ]
           },
-          "_links": {
-            "description": "Links for this resource.\n",
+          "indicatorIds": {
+            "description": "Match particular VNF indicator identifiers.\n",
+            "type": "array",
+            "items": {
+              "description": "An identifier that is unique within a VNF descriptor.\n",
+              "type": "string"
+            }
+          }
+        }
+      },
+      "callbackUri": {
+        "description": "The URI of the endpoint to send the notification to.\n",
+        "type": "string",
+        "format": "url"
+      },
+      "_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 using an absolute URI.\n",
-                "type": "object",
-                "required": [
-                  "href"
-                ],
-                "properties": {
-                  "href": {
-                    "description": "String formatted according to IETF RFC 3986.\n",
-                    "type": "string"
-                  }
-                }
+              "href": {
+                "description": "String formatted according to IETF RFC 3986.\n",
+                "type": "string"
               }
             }
           }
         }
       }
+    }
+  }
 }
\ No newline at end of file
diff --git a/SOL002/VNFIndicator-API/schemas/VnfIndicatorValueChangeNotification.schema.json b/SOL002/VNFIndicator-API/schemas/VnfIndicatorValueChangeNotification.schema.json
index 7a33be24bbb854eb93b673c0fd6f95a10d6f0109..f8a4f1e16e39c86ed7b139de789b1de2d1c06a4a 100644
--- a/SOL002/VNFIndicator-API/schemas/VnfIndicatorValueChangeNotification.schema.json
+++ b/SOL002/VNFIndicator-API/schemas/VnfIndicatorValueChangeNotification.schema.json
@@ -1,176 +1,176 @@
 {
 	"VnfIndicatorValueChangeNotification": {
-	  "description": "This type represents a VNF indicator value change notification. *   NOTE:\tETSI GS NFV-SOL 001 specifies the structure and\n          format of the VNFD based on TOSCA specifications.\n",
-	  "type": "object",
-	  "required": [
-		"id",
-		"notificationType",
-		"subscriptionId",
-		"timeStamp",
-		"vnfIndicatorId",
-		"value",
-		"vnfInstanceId",
-		"_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 \"VnfIndicatorValueChangeNotification\" for this notification type.\n",
-		  "type": "string"
-		},
-		"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"
-		},
-		"vnfIndicatorId": {
-		  "description": "An identifier that is unique within a VNF descriptor.\n",
-		  "type": "string"
-		},
-		"name": {
-		  "description": "Human readable name of the VNF indicator. Shall be present if defined in the VNFD.\n",
-		  "type": "string"
-		},
-		"value": {
-		  "description": "Provides the value of the VNF indicator. The value format is defined in the VNFD. See note.\n",
-		  "type": "object"
-		},
-		"vnfInstanceId": {
-		  "description": "An identifier with the intention of being globally unique.\n",
-		  "type": "string"
-		},
-		"_links": {
-		  "description": "Links to resources related to this resource.\n",
-		  "type": "object",
-		  "required": [
-			"vnfInstance",
-			"subscription"
-		  ],
-		  "properties": {
-			"vnfInstance": {
-			  "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"
-				}
-			  }
+		"description": "This type represents a VNF indicator value change notification. *   NOTE:\tETSI GS NFV-SOL 001 specifies the structure and\n          format of the VNFD based on TOSCA specifications.\n",
+		"type": "object",
+		"required": [
+			"id",
+			"notificationType",
+			"subscriptionId",
+			"timeStamp",
+			"vnfIndicatorId",
+			"value",
+			"vnfInstanceId",
+			"_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 \"VnfIndicatorValueChangeNotification\" for this notification type.\n",
+				"type": "string"
+			},
+			"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"
+			},
+			"vnfIndicatorId": {
+				"description": "An identifier that is unique within a VNF descriptor.\n",
+				"type": "string"
+			},
+			"name": {
+				"description": "Human readable name of the VNF indicator. Shall be present if defined in the VNFD.\n",
+				"type": "string"
 			},
-			"subscription": {
-			  "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"
+			"value": {
+				"description": "Provides the value of the VNF indicator. The value format is defined in the VNFD. See note.\n",
+				"type": "object"
+			},
+			"vnfInstanceId": {
+				"description": "An identifier with the intention of being globally unique.\n",
+				"type": "string"
+			},
+			"_links": {
+				"description": "Links to resources related to this resource.\n",
+				"type": "object",
+				"required": [
+					"vnfInstance",
+					"subscription"
+				],
+				"properties": {
+					"vnfInstance": {
+						"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"
+							}
+						}
+					},
+					"subscription": {
+						"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"
+							}
+						}
+					}
 				}
-			  }
 			}
-		  }
 		}
-	  }
 	},
 	"SupportedIndicatorsChangeNotification": {
-	  "description": "This type represents a notification to inform the receiver that the set of indicators\nsupported by a VNF instance has changed.\n*   NOTE:\tETSI GS NFV-SOL 001 specifies the structure and\n          format of the VNFD based on TOSCA specifications.\n",
-	  "type": "object",
-	  "required": [
-		"id",
-		"notificationType",
-		"subscriptionId",
-		"timeStamp",
-		"vnfInstanceId"
-	  ],
-	  "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 \"SupportedIndicatorsChangeNotification\"\nfor this notification type.\n",
-		  "type": "string"
-		},
-		"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"
-		},
-		"vnfInstanceId": {
-		  "description": "An identifier with the intention of being globally unique.\n",
-		  "type": "string"
-		},
-		"supportedIndicators": {
-		  "description": "Set of VNF indicators supported by the VNF instance.\n",
-		  "type": "array",
-		  "items": {
-			"type": "object",
-			"required": [
-			  "vnfIndicatorId"
-			],
-			"properties": {
-			  "vnfIndicatorId": {
-				"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+		"description": "This type represents a notification to inform the receiver that the set of indicators\nsupported by a VNF instance has changed.\n*   NOTE:\tETSI GS NFV-SOL 001 specifies the structure and\n          format of the VNFD based on TOSCA specifications.\n",
+		"type": "object",
+		"required": [
+			"id",
+			"notificationType",
+			"subscriptionId",
+			"timeStamp",
+			"vnfInstanceId"
+		],
+		"properties": {
+			"id": {
+				"description": "An identifier with the intention of being globally unique.\n",
 				"type": "string"
-			  },
-			  "name": {
-				"description": "Human readable name of the VNF indicator. Shall be present if defined in the VNFD.\nSee note.\n",
+			},
+			"notificationType": {
+				"description": "Discriminator for the different notification types. Shall be set to \"SupportedIndicatorsChangeNotification\"\nfor this notification type.\n",
 				"type": "string"
-			  }
-			}
-		  }
-		},
-		"_links": {
-		  "description": "Links for this resource.\n",
-		  "type": "object",
-		  "required": [
-			"subscription"
-		  ],
-		  "properties": {
-			"vnfInstance": {
-			  "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"
+			},
+			"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"
+			},
+			"vnfInstanceId": {
+				"description": "An identifier with the intention of being globally unique.\n",
+				"type": "string"
+			},
+			"supportedIndicators": {
+				"description": "Set of VNF indicators supported by the VNF instance.\n",
+				"type": "array",
+				"items": {
+					"type": "object",
+					"required": [
+						"vnfIndicatorId"
+					],
+					"properties": {
+						"vnfIndicatorId": {
+							"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+							"type": "string"
+						},
+						"name": {
+							"description": "Human readable name of the VNF indicator. Shall be present if defined in the VNFD.\nSee note.\n",
+							"type": "string"
+						}
+					}
 				}
-			  }
 			},
-			"subscription": {
-			  "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"
+			"_links": {
+				"description": "Links for this resource.\n",
+				"type": "object",
+				"required": [
+					"subscription"
+				],
+				"properties": {
+					"vnfInstance": {
+						"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"
+							}
+						}
+					},
+					"subscription": {
+						"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
diff --git a/SOL002/VNFIndicator-API/schemas/vnfIndicator.schema.json b/SOL002/VNFIndicator-API/schemas/vnfIndicator.schema.json
index 209ea76706900a67c15f57f6b9c68814cf3c8510..424aa5043ffff3f057ffada52009d1ac02f4869a 100644
--- a/SOL002/VNFIndicator-API/schemas/vnfIndicator.schema.json
+++ b/SOL002/VNFIndicator-API/schemas/vnfIndicator.schema.json
@@ -24,6 +24,14 @@
       "description": "An identifier with the intention of being globally unique.\n",
       "type": "string"
     },
+    "vnfcInstanceIds": {
+      "description": "The vnfcInstanceIds attribute is optionally present. If present, it contains the list of  identifiers of VNFC instances which provide the indicator value(s).\n",
+      "type": "array",
+      "items": {
+        "description": "An identifier that is unique within a VNF descriptor.\n",
+        "type": "string"
+      }
+    },
     "_links": {
       "description": "Links for this resource.\n",
       "type": "object",
diff --git a/SOL002/VNFIndicator-API/schemas/vnfIndicators.schema.json b/SOL002/VNFIndicator-API/schemas/vnfIndicators.schema.json
index 686df172445674ed7cf24190bbb04525e8437909..e0f0ab01a7c52893d22ad2394a5d969ff071150b 100644
--- a/SOL002/VNFIndicator-API/schemas/vnfIndicators.schema.json
+++ b/SOL002/VNFIndicator-API/schemas/vnfIndicators.schema.json
@@ -1,67 +1,75 @@
 {
-    "type": "array",
-    "items": {
-        "description": "This type represents a VNF indicator value.\nNOTE:\tETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications.\n",
+  "type": "array",
+  "items": {
+    "description": "This type represents a VNF indicator value.\nNOTE:\tETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications.\n",
+    "type": "object",
+    "required": [
+      "id",
+      "value",
+      "vnfInstanceId",
+      "_links"
+    ],
+    "properties": {
+      "id": {
+        "description": "An identifier that is unique within a VNF descriptor.\n",
+        "type": "string"
+      },
+      "name": {
+        "description": "Human readable name of the indicator. Shall be present if defined in the VNFD.\n",
+        "type": "string"
+      },
+      "value": {
+        "description": "Provides the value of the indicator. The value format is defined in the VNFD. See note.\n",
+        "type": "object"
+      },
+      "vnfInstanceId": {
+        "description": "An identifier with the intention of being globally unique.\n",
+        "type": "string"
+      },
+      "vnfcInstanceIds": {
+        "description": "The vnfcInstanceIds attribute is optionally present. If present, it contains the list of  identifiers of VNFC instances which provide the indicator value(s).\n",
+        "type": "array",
+        "items": {
+          "description": "An identifier that is unique within a VNF descriptor.\n",
+          "type": "string"
+        }
+      },
+      "_links": {
+        "description": "Links for this resource.\n",
         "type": "object",
         "required": [
-          "id",
-          "value",
-          "vnfInstanceId",
-          "_links"
+          "self",
+          "vnfInstance"
         ],
         "properties": {
-          "id": {
-            "description": "An identifier that is unique within a VNF descriptor.\n",
-            "type": "string"
-          },
-          "name": {
-            "description": "Human readable name of the indicator. Shall be present if defined in the VNFD.\n",
-            "type": "string"
-          },
-          "value": {
-            "description": "Provides the value of the indicator. The value format is defined in the VNFD. See note.\n",
-            "type": "object"
-          },
-          "vnfInstanceId": {
-            "description": "An identifier with the intention of being globally unique.\n",
-            "type": "string"
+          "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"
+              }
+            }
           },
-          "_links": {
-            "description": "Links for this resource.\n",
+          "vnfInstance": {
+            "description": "This type represents a link to a resource using an absolute URI.\n",
             "type": "object",
             "required": [
-              "self",
-              "vnfInstance"
+              "href"
             ],
             "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"
-                  }
-                }
-              },
-              "vnfInstance": {
-                "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"
-                  }
-                }
+              "href": {
+                "description": "String formatted according to IETF RFC 3986.\n",
+                "type": "string"
               }
             }
           }
         }
       }
+    }
+  }
 }
\ No newline at end of file