diff --git a/UEAppInterfaceApi.json b/UEAppInterfaceApi.json
index e897b4d07d83d4d97ab8209be7cd4a49a787b828..f004d43c423782d87671ed62fe654507d4630b90 100644
--- a/UEAppInterfaceApi.json
+++ b/UEAppInterfaceApi.json
@@ -58,12 +58,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "type": "object",
-                  "properties": {
-                    "applicationList": {
-                      "$ref": "#/components/schemas/ApplicationList"
-                    }
-                  }
+                  "$ref": "#/components/schemas/ApplicationList"
                 }
               }
             }
@@ -97,12 +92,7 @@
           "content": {
             "application/json": {
               "schema": {
-                "type": "object",
-                "properties": {
-                  "appContext": {
-                    "$ref": "#/components/schemas/AppContext"
-                  }
-                }
+                "$ref": "#/components/schemas/AppContext"
               }
             }
           }
@@ -114,12 +104,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "type": "object",
-                  "properties": {
-                    "appContext": {
-                      "$ref": "#/components/schemas/AppContext"
-                    }
-                  }
+                  "$ref": "#/components/schemas/AppContext"
                 }
               }
             }
@@ -150,34 +135,11 @@
                   "content": {
                     "application/json": {
                       "schema": {
-                        "type": "object",
-                        "properties": {
-                          "notification": {
-                            "oneOf": [
-                              {
-                                "$ref": "#/components/schemas/AddressChangeNotification"
-                              },
-                              {
-                                "$ref": "#/components/schemas/ApplicationContextDeleteNotification"
-                              },
-                              {
-                                "$ref": "#/components/schemas/ApplicationContextUpdateNotification"
-                              },
-                              {
-                                "$ref": "#/components/schemas/ApplicationLocationAvailabilityNotification"
-                              }
-                            ],
-                            "discriminator": {
-                              "propertyName": "notificationType"
-                            }
-                          }
-                        },
-                        "example": {
-                          "notification": {
-                            "notificationType": "ApplicationContextDeleteNotification",
-                            "contextId": "contextId123"
-                          }
-                        }
+                        "$ref": "#/components/schemas/InlineNotification"
+                      },
+                      "example": {
+                        "notificationType": "ApplicationContextDeleteNotification",
+                        "contextId": "contextId123"
                       }
                     }
                   }
@@ -207,12 +169,7 @@
           "content": {
             "application/json": {
               "schema": {
-                "type": "object",
-                "properties": {
-                  "appContext": {
-                    "$ref": "#/components/schemas/AppContext"
-                  }
-                }
+                "$ref": "#/components/schemas/AppContext"
               }
             }
           }
@@ -285,12 +242,7 @@
           "content": {
             "application/json": {
               "schema": {
-                "type": "object",
-                "properties": {
-                  "applicationLocationAvailability": {
-                    "$ref": "#/components/schemas/ApplicationLocationAvailability"
-                  }
-                }
+                "$ref": "#/components/schemas/ApplicationLocationAvailability"
               }
             }
           }
@@ -302,12 +254,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "type": "object",
-                  "properties": {
-                    "applicationLocationAvailability": {
-                      "$ref": "#/components/schemas/ApplicationLocationAvailability"
-                    }
-                  }
+                  "$ref": "#/components/schemas/ApplicationLocationAvailability"
                 }
               }
             }
@@ -336,14 +283,9 @@
       "400": {
         "description": "Bad Request : used to indicate that incorrect parameters were passed to the request.",
         "content": {
-          "application/json": {
+          "application/problem+json": {
             "schema": {
-              "type": "object",
-              "properties": {
-                "problemDetails": {
-                  "$ref": "#/components/schemas/ProblemDetails"
-                }
-              }
+              "$ref": "#/components/schemas/ProblemDetails"
             }
           }
         }
@@ -351,14 +293,9 @@
       "401": {
         "description": "Unauthorized :  used when the client did not submit credentials.",
         "content": {
-          "application/json": {
+          "application/problem+json": {
             "schema": {
-              "type": "object",
-              "properties": {
-                "problemDetails": {
-                  "$ref": "#/components/schemas/ProblemDetails"
-                }
-              }
+              "$ref": "#/components/schemas/ProblemDetails"
             }
           }
         }
@@ -366,17 +303,9 @@
       "403": {
         "description": "Forbidden :  operation is not allowed given the current status of the resource.",
         "content": {
-          "application/json": {
+          "application/problem+json": {
             "schema": {
-              "type": "object",
-              "required": [
-                "problemDetails"
-              ],
-              "properties": {
-                "problemDetails": {
-                  "$ref": "#/components/schemas/ProblemDetails"
-                }
-              }
+              "$ref": "#/components/schemas/ProblemDetails"
             }
           }
         }
@@ -384,14 +313,9 @@
       "404": {
         "description": "Not Found :  used when a client provided a URI that cannot be mapped to a valid resource URI.",
         "content": {
-          "application/json": {
+          "application/problem+json": {
             "schema": {
-              "type": "object",
-              "properties": {
-                "problemDetails": {
-                  "$ref": "#/components/schemas/ProblemDetails"
-                }
-              }
+              "$ref": "#/components/schemas/ProblemDetails"
             }
           }
         }
@@ -999,6 +923,25 @@
         ],
         "x-etsi-ref": "6.4.5"
       },
+      "InlineNotification": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/AddressChangeNotification"
+          },
+          {
+            "$ref": "#/components/schemas/ApplicationContextDeleteNotification"
+          },
+          {
+            "$ref": "#/components/schemas/ApplicationContextUpdateNotification"
+          },
+          {
+            "$ref": "#/components/schemas/ApplicationLocationAvailabilityNotification"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "notificationType"
+        }
+      },
       "LocationConstraints": {
         "properties": {
           "area": {
diff --git a/UEAppInterfaceApi.yaml b/UEAppInterfaceApi.yaml
index dd88735b82f30cdf84756e316b06f67120d98d13..f685176a2dc2bb72fcf78cc62ee3670016003985 100644
--- a/UEAppInterfaceApi.yaml
+++ b/UEAppInterfaceApi.yaml
@@ -39,10 +39,7 @@ paths:
           content:
             application/json:
               schema:
-                type: object
-                properties:
-                  applicationList:
-                    $ref: "#/components/schemas/ApplicationList"
+                $ref: "#/components/schemas/ApplicationList"
         400:
           $ref: "#/components/responses/400"
         401:
@@ -64,10 +61,7 @@ paths:
         content:
           application/json:
             schema:
-              type: object
-              properties:
-                appContext:
-                  $ref: '#/components/schemas/AppContext'
+              $ref: '#/components/schemas/AppContext'
       parameters: []
       responses:
         201:
@@ -75,10 +69,7 @@ paths:
           content:
             application/json:
               schema:
-                type: object
-                properties:
-                  appContext:
-                    $ref: "#/components/schemas/AppContext"
+                $ref: "#/components/schemas/AppContext"
         400:
           $ref: '#/components/responses/400'
         401:
@@ -100,20 +91,10 @@ paths:
                 content:
                   application/json:
                     schema:
-                      type: object
-                      properties:
-                        notification:
-                          oneOf:
-                            - $ref: '#/components/schemas/AddressChangeNotification'
-                            - $ref: '#/components/schemas/ApplicationContextDeleteNotification'
-                            - $ref: '#/components/schemas/ApplicationContextUpdateNotification'
-                            - $ref: '#/components/schemas/ApplicationLocationAvailabilityNotification'
-                          discriminator:
-                            propertyName: notificationType
-                      example:
-                        notification:
-                          notificationType: ApplicationContextDeleteNotification
-                          contextId: 'contextId123'
+                      $ref: '#/components/schemas/InlineNotification'
+                    example:
+                      notificationType: ApplicationContextDeleteNotification
+                      contextId: 'contextId123'
               responses:
                 204:
                   $ref: '#/components/responses/204'
@@ -130,10 +111,7 @@ paths:
         content:
           application/json:
             schema:
-              type: object
-              properties:
-                appContext:
-                  $ref: '#/components/schemas/AppContext'
+              $ref: '#/components/schemas/AppContext'
       parameters:
       - $ref: '#/components/parameters/Path.contextId'
       responses:
@@ -179,10 +157,7 @@ paths:
         content:
           application/json:
             schema:
-              type: object
-              properties:
-                applicationLocationAvailability:
-                  $ref: '#/components/schemas/ApplicationLocationAvailability'
+              $ref: '#/components/schemas/ApplicationLocationAvailability'
       parameters: []
       responses:
         200:
@@ -190,10 +165,7 @@ paths:
           content:
             application/json:
               schema:
-                type: object
-                properties:
-                  applicationLocationAvailability:
-                    $ref: "#/components/schemas/ApplicationLocationAvailability"
+                $ref: "#/components/schemas/ApplicationLocationAvailability"
         400:
           $ref: '#/components/responses/400'
         401:
@@ -209,41 +181,27 @@ components:
     400:
       description: 'Bad Request : used to indicate that incorrect parameters were passed to the request.'
       content:
-        application/json:
+        application/problem+json:
           schema:
-            type: object
-            properties:
-              problemDetails:
-                $ref: '#/components/schemas/ProblemDetails'
+            $ref: '#/components/schemas/ProblemDetails'
     401:
       description: 'Unauthorized :  used when the client did not submit credentials.'
       content:
-        application/json:
+        application/problem+json:
           schema:
-            type: object
-            properties:
-              problemDetails:
-                $ref: '#/components/schemas/ProblemDetails'
+            $ref: '#/components/schemas/ProblemDetails'
     403:
       description: 'Forbidden :  operation is not allowed given the current status of the resource.'
       content:
-        application/json:
+        application/problem+json:
           schema:
-            type: object
-            required:
-              - problemDetails
-            properties:
-              problemDetails:
-                $ref: '#/components/schemas/ProblemDetails'
+            $ref: '#/components/schemas/ProblemDetails'
     404:
       description: 'Not Found :  used when a client provided a URI that cannot be mapped to a valid resource URI.'
       content:
-        application/json:
+        application/problem+json:
           schema:
-            type: object
-            properties:
-              problemDetails:
-                $ref: '#/components/schemas/ProblemDetails'
+            $ref: '#/components/schemas/ProblemDetails'
   parameters:
     Query.appName:
       name: appName
@@ -749,6 +707,14 @@ components:
       - notificationType
       - availableLocations
       x-etsi-ref: 6.4.5
+    InlineNotification:
+      oneOf:
+        - $ref: '#/components/schemas/AddressChangeNotification'
+        - $ref: '#/components/schemas/ApplicationContextDeleteNotification'
+        - $ref: '#/components/schemas/ApplicationContextUpdateNotification'
+        - $ref: '#/components/schemas/ApplicationLocationAvailabilityNotification'
+      discriminator:
+        propertyName: notificationType
     LocationConstraints:
       properties:
         area: