diff --git a/src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerfomananceManagement_def.yaml b/src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerfomananceManagement_def.yaml
index 6f5ef66356f12d9d1750d471900f1efd696666b6..9bca92750fde07ab9b0dea96b43b0fd3e9f32834 100644
--- a/src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerfomananceManagement_def.yaml
+++ b/src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerfomananceManagement_def.yaml
@@ -44,7 +44,8 @@ definitions:
           A metric group is a pre-defined list of metrics,
           known to the producer that it can decompose to
           individual metrics. At least one of the two
-          attributes (performance metric or group) shall be present.
+          attributes (performance metric or group) shall
+          be present.
         type: "array"
         items:   
           $ref: "SOL005_def.yaml#/definitions/String"          
@@ -52,15 +53,28 @@ definitions:
         description: >
           Specifies the periodicity at which the producer
           will collect performance information. The unit
-          shall be seconds. See notes 1 and 2.
-        type: integer
+          shall be seconds.
+          At the end of each reportingPeriod, the producer will inform the consumer about availability of the performance
+          data collected for each completed collection period during this reportingPeriod. The reportingPeriod should be
+          equal to or a multiple of the collectionPeriod. In the latter case, the performance data for the collection periods
+          within one reporting period are reported together.    
+          In particular when choosing short collection and reporting periods, the number of PM jobs that can be
+          supported depends on the capability of the producing entity.
+        type: UnsignedInt
+        default: 0       
       reportingPeriod:
         description: >
           Specifies the periodicity at which the producer
           will report to the consumer.
-          about performance information. The unit shall
-          be seconds. See notes 1 and 2.
-        type: integer
+          about performance information. The unit shall be seconds.
+          At the end of each reportingPeriod, the producer will inform the consumer about availability of the performance
+          data collected for each completed collection period during this reportingPeriod. The reportingPeriod should be
+          equal to or a multiple of the collectionPeriod. In the latter case, the performance data for the collection periods
+          within one reporting period are reported together.    
+          In particular when choosing short collection and reporting periods, the number of PM jobs that can be
+          supported depends on the capability of the producing entity.          
+        type: UnsignedInt
+        default: 0        
       reportingBoundary:
         description: >
           Identifies a time boundary after which the
@@ -76,7 +90,7 @@ definitions:
     required:
       - id
       - objectInstanceIds
-      - criteria
+      - criteria     
     properties:
       id:
         description: >
@@ -131,9 +145,10 @@ definitions:
                 $ref: "SOL005_def.yaml#/definitions/Link"
               objects:
                 description: >
-                  Links to resources representing the VNF instances for which
-                  performance information is collected. Shall be present if
-                  the VNF instance information is accessible as a resource.
+                  Links to resources representing the NS
+                  instances for which performance information is
+                  collected. Shall be present if the NS instance
+                  information is accessible as a resource.
                 type: array
                 items: 
                   $ref: "SOL005_def.yaml#/definitions/Link"
@@ -148,7 +163,7 @@ definitions:
     properties: 
       objectInstanceId:
         description: >
-          Identifier of the VNF instance associated with this threshold.
+          Identifier of the NS instance associated with this threshold.
         $ref: "SOL005_def.yaml#/definitions/Identifier"
       criteria:
         description: >
@@ -171,7 +186,7 @@ definitions:
         $ref: "SOL005_def.yaml#/definitions/Identifier"
       objectInstanceId:
         description: >
-          Identifier of the VNF instance associated with the threshold.
+          Identifier of the NS instance associated with the threshold.
         $ref: "SOL005_def.yaml#/definitions/Identifier"
       criteria:
         description: >
@@ -190,9 +205,10 @@ definitions:
             $ref: "SOL005_def.yaml#/definitions/Link"
           object: 
             description: >
-              Link to a resource representing the VNF instance for which
-              performance information is collected. Shall be present if the
-              VNF instance information is accessible as a resource.
+              Link to a resource representing the NS instance for
+              which performance information is collected. Shall be
+              present if the NS instance information is accessible as
+              a resource.
               
   ThresholdCriteria:
     description: >
@@ -231,8 +247,7 @@ definitions:
           thresholdValue:
             description: >
               The threshold value. Shall be represented as a floating point
-              number.
-            # TODO: This should be floating.             
+              number.               
             type: integer
           hysteresis:
             description: >
@@ -248,7 +263,6 @@ definitions:
               threshold, implementations should enforce a suitable minimum
               value for this attribute (e.g. override the value or reject the
               request).
-            # TODO: This should be floating. 
             type: integer
             
   PmSubscriptionRequest: