diff --git a/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml b/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml
index 5491a6c87fa11defc455bc44c8dc2fafc1ca1f0c..0a5f191d495e02feae7772c972051f6af9c873df 100644
--- a/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml
+++ b/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml
@@ -72,6 +72,69 @@ paths:
           in: header
           required: true
           type: string
+      responses:
+        201:
+          description: > 
+            Created
+
+            The PM job was created successfully. The response body shall
+            contain a representation of the created PM job resource.
+            The HTTP response shall include a "Location" HTTP header that
+            points to the created PM job resource.
+          headers:
+            Location:
+              description: The resource URI of the created PM Job
+              type: string
+              format: url
+            WWW-Authenticate:
+              description: >
+                Challenge if the corresponding HTTP request has not provided
+                authorization, or error details if the corresponding HTTP
+                request has provided an invalid authorization token.
+              type: string
+              maximum: 1
+              minimum: 0
+          schema:
+            $ref: "../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/PmJob"
+        400:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"
+        401:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/401"
+        403:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/403"
+        405:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/405"
+        406:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/406"
+        500:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500"
+        503:
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"
+    get:
+      description: >
+        The client can use this method to retrieve information about PM jobs.
+      parameters:
+        - name: Accept
+          description: >
+            Content-Types that are acceptable for the response.
+            Reference: IETF RFC 7231
+          in: header
+          required: true
+          type: string
+        - name: Authorization
+          description: >
+            The authorization token for the request.
+            Reference: IETF RFC 7235
+          in: header
+          required: true
+          type: string
+        - name: Content-Type
+          description: >
+            The MIME type of the body of the request.
+            Reference: IETF RFC 7231
+          in: header
+          required: true
+          type: string
         - name: filter
           description: >
             Attribute-based filtering expression according to clause 4.3.2.
@@ -144,69 +207,6 @@ paths:
           in: query
           required: false
           type: string
-      responses:
-        201:
-          description: > 
-            Created
-
-            The PM job was created successfully. The response body shall
-            contain a representation of the created PM job resource.
-            The HTTP response shall include a "Location" HTTP header that
-            points to the created PM job resource.
-          headers:
-            Location:
-              description: The resource URI of the created PM Job
-              type: string
-              format: url
-            WWW-Authenticate:
-              description: >
-                Challenge if the corresponding HTTP request has not provided
-                authorization, or error details if the corresponding HTTP
-                request has provided an invalid authorization token.
-              type: string
-              maximum: 1
-              minimum: 0
-          schema:
-            $ref: "../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/PmJob"
-        400:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"
-        401:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/401"
-        403:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/403"
-        405:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/405"
-        406:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/406"
-        500:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500"
-        503:
-          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"
-    get:
-      description: >
-        The client can use this method to retrieve information about PM jobs.
-      parameters:
-        - name: Accept
-          description: >
-            Content-Types that are acceptable for the response.
-            Reference: IETF RFC 7231
-          in: header
-          required: true
-          type: string
-        - name: Authorization
-          description: >
-            The authorization token for the request.
-            Reference: IETF RFC 7235
-          in: header
-          required: true
-          type: string
-        - name: Content-Type
-          description: >
-            The MIME type of the body of the request.
-            Reference: IETF RFC 7231
-          in: header
-          required: true
-          type: string
       responses:
         200:
           description: > 
@@ -460,46 +460,6 @@ paths:
           in: header
           required: true
           type: string
-        - name: filter
-          description: >
-            Attribute-based filtering expression according to clause 4.3.2.
-            The VNFM shall support receiving this parameter as part of the URI query string.
-            The EM may supply this parameter. All attribute names that appear in the Thresholds
-            and in data types referenced from it shall be supported by the VNFM in attribute-based filtering expression.
-
-            EXAMPLE
-            objects
-            obj1: {"id":123, "weight":100, "parts":[{"id":1, "color":"red"}, {"id":2, "color":"green"}]}
-            obj2: {"id":456, "weight":500, "parts":[{"id":3, "color":"green"}, {"id":4, "color":"blue"}]}
-
-            Request 1:
-            GET …/container
-
-            Response 1:
-            [
-                {"id":123, "weight":100, "parts":[{"id":1, "color":"red"}, {"id":2, "color":"green"}]},
-                {"id":456, "weight":500, "parts":[{"id":3, "color":"green"}, {"id":4, "color":"blue"}]}
-            ]
-
-            Request 2:
-            GET …/container?filter=(eq.weight,100)
-
-            Response 2:
-            [
-                {"id":123, "weight":100, "parts":[{"id":1, "color":"red"}, {"id":2, "color":"green"}]}
-            ]
-          #Request 2 in EXAMPLE from clause 4.3.2 probably wrong, since "," should be used after opOne (eq), "." is used
-          in: query
-          required: false
-          type: string
-        - name: nextpage_opaque_marker
-          description: >
-            Marker to obtain the next page of a paged response.
-            Shall be supported by the VNFM if the VNFM supports alternative 2
-            (paging) according to clause 4.7.2.1 for this resource.
-          in: query
-          required: false
-          type: string
       responses:
         201:
           description: > 
@@ -556,6 +516,46 @@ paths:
           in: header
           required: true
           type: string
+        - name: filter
+          description: >
+            Attribute-based filtering expression according to clause 4.3.2.
+            The VNFM shall support receiving this parameter as part of the URI query string.
+            The EM may supply this parameter. All attribute names that appear in the Thresholds
+            and in data types referenced from it shall be supported by the VNFM in attribute-based filtering expression.
+
+            EXAMPLE
+            objects
+            obj1: {"id":123, "weight":100, "parts":[{"id":1, "color":"red"}, {"id":2, "color":"green"}]}
+            obj2: {"id":456, "weight":500, "parts":[{"id":3, "color":"green"}, {"id":4, "color":"blue"}]}
+
+            Request 1:
+            GET …/container
+
+            Response 1:
+            [
+                {"id":123, "weight":100, "parts":[{"id":1, "color":"red"}, {"id":2, "color":"green"}]},
+                {"id":456, "weight":500, "parts":[{"id":3, "color":"green"}, {"id":4, "color":"blue"}]}
+            ]
+
+            Request 2:
+            GET …/container?filter=(eq.weight,100)
+
+            Response 2:
+            [
+                {"id":123, "weight":100, "parts":[{"id":1, "color":"red"}, {"id":2, "color":"green"}]}
+            ]
+          #Request 2 in EXAMPLE from clause 4.3.2 probably wrong, since "," should be used after opOne (eq), "." is used
+          in: query
+          required: false
+          type: string
+        - name: nextpage_opaque_marker
+          description: >
+            Marker to obtain the next page of a paged response.
+            Shall be supported by the VNFM if the VNFM supports alternative 2
+            (paging) according to clause 4.7.2.1 for this resource.
+          in: query
+          required: false
+          type: string
       responses:
         200:
           description: >