diff --git a/Mp1.json b/Mp1.json
index ea3b417c5e24fbc927d98445074231a1f3396815..f16f40b9f037a4e973460ef71104b5dbe1418490 100644
Binary files a/Mp1.json and b/Mp1.json differ
diff --git a/Mp1.yaml b/Mp1.yaml
index 0c40543e1fe93b3659d7cf5165888a4b8eb8ca04..89d76ee9e6e1de75368bfa39bfc2e3b88a8b2c4e 100644
--- a/Mp1.yaml
+++ b/Mp1.yaml
@@ -7,7 +7,7 @@ info:
     name: ETSI Forge copyright notice
     url: 'https://forge.etsi.org/etsi-forge-copyright-notice.txt'
 externalDocs:
-  description: ETSI GS MEC011 Application Enablement API, V1.1.1
+  description: 'ETSI GS MEC011 Application Enablement API, V1.1.1'
   url: 'http://www.etsi.org/deliver/etsi_gs/MEC/001_099/011/01.01.01_60/gs_mec011v010101p.pdf'
 host: '127.0.0.1:8081'
 basePath: /exampleAPI/mp1/v1/
@@ -120,13 +120,13 @@ parameters:
       type: string
 paths:
   '/applications/{appInstanceId}/dns_rules':
+    parameters:
+      - $ref: '#/parameters/Path.AppInstanceId'
     get:
       description: This method retrieves information about all the DNS rules associated with a mobile edge application instance.
       operationId: ApplicationsDnsRules.GET
       produces:
         - application/json
-      parameters:
-        - $ref: '#/parameters/Path.AppInstanceId'
       responses:
         '200':
           description: It is used to indicate nonspecific success. The response body contains a representation of the resource.
@@ -138,14 +138,14 @@ paths:
                 DnsRule:
                   $ref: '#/definitions/DnsRule'
   '/applications/{appInstanceId}/dns_rules/{dnsRuleId}':
+    parameters:
+      - $ref: '#/parameters/Path.AppInstanceId'
+      - $ref: '#/parameters/Path.DnsRuleId'
     get:
       description: This method retrieves information about a DNS rule associated with a mobile edge application instance.
       operationId: ApplicationsDnsRule.GET
       produces:
         - application/json
-      parameters:
-        - $ref: '#/parameters/Path.AppInstanceId'
-        - $ref: '#/parameters/Path.DnsRuleId'
       responses:
         '200':
           description: It is used to indicate nonspecific success. The response body contains a representation of the resource.
@@ -161,8 +161,6 @@ paths:
         - application/json
       parameters:
         - $ref: '#/parameters/Body.DnsRule'
-        - $ref: '#/parameters/Path.AppInstanceId'
-        - $ref: '#/parameters/Path.DnsRuleId'
       responses:
         '200':
           description: It is used to indicate nonspecific success. The response body contains a representation of the resource.
@@ -172,13 +170,13 @@ paths:
               DnsRule:
                 $ref: '#/definitions/DnsRule'
   '/applications/{appInstanceId}/subscriptions':
+    parameters:
+      - $ref: '#/parameters/Path.AppInstanceId'
     get:
       description: 'The GET method may be used to request information about all subscriptions for this requestor. Upon success, the response contains entity body with all the subscriptions for the requestor.'
       operationId: ApplicationsSubscriptions.GET
       produces:
         - application/json
-      parameters:
-        - $ref: '#/parameters/Path.AppInstanceId'
       responses:
         '200':
           description: 'Upon success, a response body containing the list of links to the requested subscriptions is returned.'
@@ -193,7 +191,6 @@ paths:
       produces:
         - application/json
       parameters:
-        - $ref: '#/parameters/Path.AppInstanceId'
         - $ref: '#/parameters/Body.AppTerminationNotificationSubscription'
       responses:
         '200':
@@ -204,15 +201,15 @@ paths:
               AppTerminationNotificationSubscription:
                 $ref: '#/definitions/AppTerminationNotificationSubscription.Response'
   '/applications/{appInstanceId}/subscriptions/{subscriptionType}/{subscriptionId}':
+    parameters:
+      - $ref: '#/parameters/Path.AppInstanceId'
+      - $ref: '#/parameters/Path.SubscriptionType'
+      - $ref: '#/parameters/Path.SubscriptionId'
     get:
       description: 'The GET method requests information about a subscription for this requestor. Upon success, the response contains entity body with the subscription for the requestor.'
       operationId: ApplicationsSubscription.GET
       produces:
         - application/json
-      parameters:
-        - $ref: '#/parameters/Path.AppInstanceId'
-        - $ref: '#/parameters/Path.SubscriptionType'
-        - $ref: '#/parameters/Path.SubscriptionId'
       responses:
         '200':
           description: 'Upon success, a response body containing the requested subscription is returned.'
@@ -230,13 +227,13 @@ paths:
         '204':
           description: No Content
   '/applications/{appInstanceId}/traffic_rules':
+    parameters:
+      - $ref: '#/parameters/Path.AppInstanceId'
     get:
       description: This method retrieves information about all the traffic rules associated with a mobile edge application instance.
       operationId: ApplicationsTrafficRules.GET
       produces:
         - application/json
-      parameters:
-        - $ref: '#/parameters/Path.AppInstanceId'
       responses:
         '200':
           description: It is used to indicate nonspecific success. The response body contains a representation of the resource.
@@ -248,14 +245,14 @@ paths:
                 TrafficRule:
                   $ref: '#/definitions/TrafficRule'
   '/applications/{appInstanceId}/traffic_rules/{trafficRuleId}':
+    parameters:
+      - $ref: '#/parameters/Path.AppInstanceId'
+      - $ref: '#/parameters/Path.TrafficRuleId'
     get:
       description: This method retrieves information about all the traffic rules associated with a mobile edge application instance.
       operationId: ApplicationsTrafficRule.GET
       produces:
         - application/json
-      parameters:
-        - $ref: '#/parameters/Path.AppInstanceId'
-        - $ref: '#/parameters/Path.TrafficRuleId'
       responses:
         '200':
           description: It is used to indicate nonspecific success. The response body contains a representation of the resource.
@@ -271,8 +268,6 @@ paths:
         - application/json
       parameters:
         - $ref: '#/parameters/Body.TrafficRule'
-        - $ref: '#/parameters/Path.AppInstanceId'
-        - $ref: '#/parameters/Path.TrafficRuleId'
       responses:
         '200':
           description: 'Upon success, a response body containing data type describing the updated TrafficRule is returned.'
@@ -317,13 +312,13 @@ paths:
               ServiceInfo:
                 $ref: '#/definitions/ServiceInfo'
   '/services/{serviceId}':
+    parameters:
+      - $ref: '#/parameters/Path.ServiceId'
     get:
       description: This method retrieves information about a meService resource. This method is typically used in "service availability query" procedure
       operationId: ServicesServiceId.GET
       produces:
         - application/json
-      parameters:
-        - $ref: '#/parameters/Path.ServiceId'
       responses:
         '200':
           description: It is used to indicate nonspecific success. The response body contains a representation of the resource.
@@ -369,7 +364,6 @@ paths:
       produces:
         - application/json
       parameters:
-        - $ref: '#/parameters/Path.ServiceId'
         - $ref: '#/parameters/Body.ServiceInfo'
       responses:
         '200':
@@ -739,7 +733,7 @@ definitions:
         type: string
         format: uri
       rel:
-        description: The values are as defined in the ÔÇ£subscriptionTypeÔÇØ attribute for each different Mp1 event subscription data type.
+        description: The values are as defined in the "subscriptionType" attribute for each different Mp1 event subscription data type.
         type: string
   Mp1SubscriptionLinkList:
     description: This type represents a list of links related to currently existing subscriptions for a mobile edge application instance. This information is returned when sending a request to receive current subscriptions.
@@ -852,7 +846,7 @@ definitions:
       - INACTIVE
     example: ACTIVE
   ServiceInfo.TransportId:
-    description: 'Identifier of the platform-provided transport to be used by the service. Valid identifiers may be obtained using the ÔÇ£Transport information queryÔÇØ procedure. May be present in POST requests to signal the use of a platform-provided transport for the service, and shall be absent otherwise.'
+    description: 'Identifier of the platform-provided transport to be used by the service. Valid identifiers may be obtained using the "Transport information query" procedure. May be present in POST requests to signal the use of a platform-provided transport for the service, and shall be absent otherwise.'
     type: string
     example: Rest1
   ServiceInfo.Version:
diff --git a/definitions/Mp1SubscriptionLinkList.Subscription.yaml b/definitions/Mp1SubscriptionLinkList.Subscription.yaml
index 1938e783da9a18b1e32e3a2a78139397304520f1..533fd3e5b700ccd4c0beed37f2b7076a6a72cd30 100644
--- a/definitions/Mp1SubscriptionLinkList.Subscription.yaml
+++ b/definitions/Mp1SubscriptionLinkList.Subscription.yaml
@@ -9,6 +9,6 @@ properties:
     type: string
     format: uri
   rel:
-    description: The values are as defined in the “subscriptionType” attribute for each different Mp1 event subscription data type.
+    description: The values are as defined in the "subscriptionType" attribute for each different Mp1 event subscription data type.
     type: string
 
diff --git a/definitions/ServiceInfo.TransportId.yaml b/definitions/ServiceInfo.TransportId.yaml
index efdc282905c34af775e9c14c59fbf05cff3a5a62..327bcb6505a43917e966c824d093112300b4b62c 100644
--- a/definitions/ServiceInfo.TransportId.yaml
+++ b/definitions/ServiceInfo.TransportId.yaml
@@ -1,3 +1,3 @@
-description: Identifier of the platform-provided transport to be used by the service. Valid identifiers may be obtained using the “Transport information query” procedure. May be present in POST requests to signal the use of a platform-provided transport for the service, and shall be absent otherwise.
+description: Identifier of the platform-provided transport to be used by the service. Valid identifiers may be obtained using the "Transport information query" procedure. May be present in POST requests to signal the use of a platform-provided transport for the service, and shall be absent otherwise.
 type: string
 example: Rest1
\ No newline at end of file
diff --git a/paths/ApplicationsDnsRule.GET.yaml b/paths/ApplicationsDnsRule.GET.yaml
index 4abc112ba60931815f2640cc93cfddae3a50780e..a2d234645087fa3e992078165cd9c949a22ec2fe 100644
--- a/paths/ApplicationsDnsRule.GET.yaml
+++ b/paths/ApplicationsDnsRule.GET.yaml
@@ -2,9 +2,6 @@ description: This method retrieves information about a DNS rule associated with
 operationId: ApplicationsDnsRule.GET
 produces:
 - application/json
-parameters:
-- $ref: '#/parameters/Path.AppInstanceId'
-- $ref: '#/parameters/Path.DnsRuleId'
 
 responses:
   200:
diff --git a/paths/ApplicationsDnsRule.PUT.yaml b/paths/ApplicationsDnsRule.PUT.yaml
index acec9bbf06097442d42970312cbb85aaf82ec6b5..00542f734798fb9baabbe594b4b345e67f382bb5 100644
--- a/paths/ApplicationsDnsRule.PUT.yaml
+++ b/paths/ApplicationsDnsRule.PUT.yaml
@@ -4,8 +4,6 @@ produces:
 - application/json
 parameters:
 - $ref: '#/parameters/Body.DnsRule'
-- $ref: '#/parameters/Path.AppInstanceId'
-- $ref: '#/parameters/Path.DnsRuleId'
 
 responses:
   200:
diff --git a/paths/ApplicationsDnsRule.yaml b/paths/ApplicationsDnsRule.yaml
index ad8072b7ba7ccd314ad1718096a05692ed5da89a..6264c0115a8acfc58cadb285bd9aec8662b82454 100644
--- a/paths/ApplicationsDnsRule.yaml
+++ b/paths/ApplicationsDnsRule.yaml
@@ -1,3 +1,7 @@
+parameters:
+- $ref: '#/parameters/Path.AppInstanceId'
+- $ref: '#/parameters/Path.DnsRuleId'
+
 get:
   $ref: ./ApplicationsDnsRule.GET.yaml
 
diff --git a/paths/ApplicationsDnsRules.GET.yaml b/paths/ApplicationsDnsRules.GET.yaml
index d1c307f6d292d49702be66c5d258435fe4c6f7e9..6948daeefcefa7ffcbd2cc5ae566abe72b6d1e6f 100644
--- a/paths/ApplicationsDnsRules.GET.yaml
+++ b/paths/ApplicationsDnsRules.GET.yaml
@@ -2,8 +2,6 @@ description: This method retrieves information about all the DNS rules associate
 operationId: ApplicationsDnsRules.GET
 produces:
 - application/json
-parameters:
-- $ref: '#/parameters/Path.AppInstanceId'
 
 responses:
   200:
diff --git a/paths/ApplicationsDnsRules.yaml b/paths/ApplicationsDnsRules.yaml
index 1e9aa767901b853e21e14c8a4ae0d12168910562..4994f4cdcb45aca6ac0f8fb9191cc0261f87e094 100644
--- a/paths/ApplicationsDnsRules.yaml
+++ b/paths/ApplicationsDnsRules.yaml
@@ -1,2 +1,5 @@
+parameters:
+- $ref: '#/parameters/Path.AppInstanceId'
+
 get:
   $ref: ./ApplicationsDnsRules.GET.yaml
\ No newline at end of file
diff --git a/paths/ApplicationsSubscription.GET.yaml b/paths/ApplicationsSubscription.GET.yaml
index 78317858c04be873c0e950d1dab1efb1b1ceca09..05305b4111c1b93cfd8756c220b69a810184b9b6 100644
--- a/paths/ApplicationsSubscription.GET.yaml
+++ b/paths/ApplicationsSubscription.GET.yaml
@@ -2,10 +2,6 @@ description: The GET method requests information about a subscription for this r
 operationId: ApplicationsSubscription.GET
 produces:
 - application/json
-parameters:
-- $ref: '#/parameters/Path.AppInstanceId'
-- $ref: '#/parameters/Path.SubscriptionType'
-- $ref: '#/parameters/Path.SubscriptionId'
 
 responses:
   200:
diff --git a/paths/ApplicationsSubscription.yaml b/paths/ApplicationsSubscription.yaml
index c5bd626535e5b78a1a861aa7ce3ed3cd2b22b5a1..c2635fbf6b02f39b62c243bd7b46310b4ca10af8 100644
--- a/paths/ApplicationsSubscription.yaml
+++ b/paths/ApplicationsSubscription.yaml
@@ -1,3 +1,8 @@
+parameters:
+- $ref: '#/parameters/Path.AppInstanceId'
+- $ref: '#/parameters/Path.SubscriptionType'
+- $ref: '#/parameters/Path.SubscriptionId'
+
 get:
   $ref: ./ApplicationsSubscription.GET.yaml
 
diff --git a/paths/ApplicationsSubscriptions.GET.yaml b/paths/ApplicationsSubscriptions.GET.yaml
index 60af88b7fcc3746af48a827ef6c8bb510479d179..4f2e3f0f90c7a0202724047bdb200e90c46f770e 100644
--- a/paths/ApplicationsSubscriptions.GET.yaml
+++ b/paths/ApplicationsSubscriptions.GET.yaml
@@ -2,8 +2,6 @@ description: The GET method may be used to request information about all subscri
 operationId: ApplicationsSubscriptions.GET
 produces:
 - application/json
-parameters:
-- $ref: '#/parameters/Path.AppInstanceId'
 
 responses:
   200:
diff --git a/paths/ApplicationsSubscriptions.POST.yaml b/paths/ApplicationsSubscriptions.POST.yaml
index 5b50776750a0932b40e3f8c6864ab942ff9e567b..5d9e8eed60c9bdd219c4d2a73ce516d86d2cdd7c 100644
--- a/paths/ApplicationsSubscriptions.POST.yaml
+++ b/paths/ApplicationsSubscriptions.POST.yaml
@@ -3,7 +3,6 @@ operationId: ApplicationsSubscriptions.POST
 produces:
 - application/json
 parameters:
-- $ref: '#/parameters/Path.AppInstanceId'
 - $ref: '#/parameters/Body.AppTerminationNotificationSubscription'
 # The alternative request
 #- $ref: '#/parameters/Body.SerAvailabilityNotificationSubscription'
diff --git a/paths/ApplicationsSubscriptions.yaml b/paths/ApplicationsSubscriptions.yaml
index fbf438b344402c667d17d2d5e53026810ed5c779..57505869507cd96e890636993236d64d3203f509 100644
--- a/paths/ApplicationsSubscriptions.yaml
+++ b/paths/ApplicationsSubscriptions.yaml
@@ -1,3 +1,6 @@
+parameters:
+- $ref: '#/parameters/Path.AppInstanceId'
+
 get:
   $ref: ./ApplicationsSubscriptions.GET.yaml
 
diff --git a/paths/ApplicationsTrafficRule.GET.yaml b/paths/ApplicationsTrafficRule.GET.yaml
index ac8dfb02994b215180c57ed2c5f5c9e41f6227d8..f54dfa73b846c97ad5ef10f6fe02b1c3f0af87ff 100644
--- a/paths/ApplicationsTrafficRule.GET.yaml
+++ b/paths/ApplicationsTrafficRule.GET.yaml
@@ -2,9 +2,6 @@ description: This method retrieves information about all the traffic rules assoc
 operationId: ApplicationsTrafficRule.GET
 produces:
 - application/json
-parameters:
-- $ref: '#/parameters/Path.AppInstanceId'
-- $ref: '#/parameters/Path.TrafficRuleId'
 
 responses:
   200:
diff --git a/paths/ApplicationsTrafficRule.PUT.yaml b/paths/ApplicationsTrafficRule.PUT.yaml
index 6fd81776bfc78cc2b2f2b8d62bf76db36452a813..77da52007b1556f445bd54c5199dd94bda2b1a61 100644
--- a/paths/ApplicationsTrafficRule.PUT.yaml
+++ b/paths/ApplicationsTrafficRule.PUT.yaml
@@ -4,8 +4,6 @@ produces:
 - application/json
 parameters:
 - $ref: '#/parameters/Body.TrafficRule'
-- $ref: '#/parameters/Path.AppInstanceId'
-- $ref: '#/parameters/Path.TrafficRuleId'
 
 responses:
   200:
diff --git a/paths/ApplicationsTrafficRule.yaml b/paths/ApplicationsTrafficRule.yaml
index a4930c5d85e531158817e2a047c04371205c0bba..c82177dcfb7fcd8d4ba1896fbb4376a0992c9b7e 100644
--- a/paths/ApplicationsTrafficRule.yaml
+++ b/paths/ApplicationsTrafficRule.yaml
@@ -1,3 +1,7 @@
+parameters:
+- $ref: '#/parameters/Path.AppInstanceId'
+- $ref: '#/parameters/Path.TrafficRuleId'
+
 get:
   $ref: ./ApplicationsTrafficRule.GET.yaml
 
diff --git a/paths/ApplicationsTrafficRules.GET.yaml b/paths/ApplicationsTrafficRules.GET.yaml
index 304f5794a60f26cb8086811b679468eb847b1668..4b8432bf28e4c1b2c62815b55b4598bf70788b06 100644
--- a/paths/ApplicationsTrafficRules.GET.yaml
+++ b/paths/ApplicationsTrafficRules.GET.yaml
@@ -2,8 +2,6 @@ description: This method retrieves information about all the traffic rules assoc
 operationId: ApplicationsTrafficRules.GET
 produces:
 - application/json
-parameters:
-- $ref: '#/parameters/Path.AppInstanceId'
 
 responses:
   200:
diff --git a/paths/ApplicationsTrafficRules.yaml b/paths/ApplicationsTrafficRules.yaml
index 9faf03ee9514d00abb3598c3e2940f7f3abe6cd2..880de16feac41f9fb98380c65155bf7c560d1c9d 100644
--- a/paths/ApplicationsTrafficRules.yaml
+++ b/paths/ApplicationsTrafficRules.yaml
@@ -1,2 +1,5 @@
+parameters:
+- $ref: '#/parameters/Path.AppInstanceId'
+
 get:
   $ref: ./ApplicationsTrafficRules.GET.yaml
\ No newline at end of file
diff --git a/paths/ServicesServiceId.GET.yaml b/paths/ServicesServiceId.GET.yaml
index c06704acaac317652fb96789143203aca88b6a0a..57a60d8a53ed8078e924074814c9a897043b1cf6 100644
--- a/paths/ServicesServiceId.GET.yaml
+++ b/paths/ServicesServiceId.GET.yaml
@@ -2,8 +2,7 @@ description: This method retrieves information about a meService resource. This
 operationId: ServicesServiceId.GET
 produces:
 - application/json
-parameters:
-- $ref: '#/parameters/Path.ServiceId'
+
 responses:
   200:
     description: It is used to indicate nonspecific success. The response body contains a representation of the resource.
diff --git a/paths/ServicesServiceId.PUT.yaml b/paths/ServicesServiceId.PUT.yaml
index 99c2ca4bd65462069e7e124fa1213d034e17d034..0b354acb356f1457e02e918ed7a428f535075068 100644
--- a/paths/ServicesServiceId.PUT.yaml
+++ b/paths/ServicesServiceId.PUT.yaml
@@ -3,7 +3,6 @@ operationId: ServicesServiceId.PUT
 produces:
 - application/json
 parameters:
-- $ref: '#/parameters/Path.ServiceId'
 - $ref: '#/parameters/Body.ServiceInfo'
 
 responses:
diff --git a/paths/ServicesServiceId.yaml b/paths/ServicesServiceId.yaml
index d43e55d568cb0334ed3a0298011d9f5fd3dd2a29..323eb2ac77b517b1b4963080f20d7864043ea3b3 100644
--- a/paths/ServicesServiceId.yaml
+++ b/paths/ServicesServiceId.yaml
@@ -1,3 +1,6 @@
+parameters:
+- $ref: '#/parameters/Path.ServiceId'
+
 get:
   $ref: ./ServicesServiceId.GET.yaml