diff --git a/TS26510_CommonData.yaml b/TS26510_CommonData.yaml
index 15942bee150d72bfa1b112f98ed4b000b26d9287..a5bf1ce7e3a7dd80a233a61c39e405f170fb7b74 100755
--- a/TS26510_CommonData.yaml
+++ b/TS26510_CommonData.yaml
@@ -221,12 +221,12 @@ components:
     EdgeProcessingEligibilityCriteria:
       type: object
       required:
-        - serviceDataFlowDescriptions
+        - applicationFlowDescriptions
         - ueLocations
         - timeWindows
         - appRequest
       properties:
-        serviceDataFlowDescriptions:
+        applicationFlowDescriptions:
           type: array
           items:
             $ref: '#/components/schemas/ApplicationFlowDescription'
diff --git a/TS26510_Maf_SessionHandling_DynamicPolicy.yaml b/TS26510_Maf_SessionHandling_DynamicPolicy.yaml
index 12293264c71168ea878d3a21057275ce09e31256..71b070c34a1d5f84e282c28c6d02882601423dec 100644
--- a/TS26510_Maf_SessionHandling_DynamicPolicy.yaml
+++ b/TS26510_Maf_SessionHandling_DynamicPolicy.yaml
@@ -302,7 +302,7 @@ components:
           type: string
           minLength: 1
         applicationFlowDescription:
-          $ref: 'TS26510_CommonData.yaml#/components/schemas/ServiceDataFlowDescription'
+          $ref: 'TS26510_CommonData.yaml#/components/schemas/ApplicationFlowDescription'
         qosSpecification:
           $ref: 'TS26510_CommonData.yaml#/components/schemas/M5QoSSpecification'
 
diff --git a/TS26510_Maf_SessionHandling_NetworkAssistance.yaml b/TS26510_Maf_SessionHandling_NetworkAssistance.yaml
index 3ba1499fe9abaec485c8ad50d907543c12853b81..eca970c483470ef75dee7038dea68995d039eddd 100644
--- a/TS26510_Maf_SessionHandling_NetworkAssistance.yaml
+++ b/TS26510_Maf_SessionHandling_NetworkAssistance.yaml
@@ -381,7 +381,3 @@ components:
           readOnly: true
           allOf:
             - $ref: 'TS26510_CommonData.yaml#/components/schemas/M5QoSSpecification'
-        notficationURL:
-          readOnly: true
-          allOf:
-            - $ref: 'TS26510_CommonData.yaml#/components/schemas/AbsoluteUrl'
diff --git a/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml b/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml
index 056397398098c3a59a95d3e35b8325257ff89084..f3bc216591ea9e345e24d05ab5d0a28a60433d2d 100644
--- a/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml
+++ b/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml
@@ -126,6 +126,10 @@ components:
           $ref: 'TS26510_CommonData.yaml#/components/schemas/ProvisioningSessionType'
         locationReporting:
           type: boolean
+        notficationURL:
+          readOnly: true
+          allOf:
+            - $ref: 'TS26510_CommonData.yaml#/components/schemas/AbsoluteUrl'
         streamingAccess:
           type: object
           properties:
@@ -327,3 +331,30 @@ components:
             type: string
             minLength: 1
           minItems: 1
+
+    NotificationMessage:
+      description: 'A message sent by the Media AF on an MQTT notification channel.'
+      type: object
+      properties:
+        type:
+          $ref: '#/components/schemas/NotificationMessageType'
+        serviceAccessInformation:
+          $ref: '#/components/schemas/ServiceAccessInformationResource'
+        dynamicPolicy:
+          $ref: 'TS26510_Maf_SessionHandling_DynamicPolicy.yaml#/components/schemas/DynamicPolicy'
+        networkAssistanceSession:
+          $ref: 'TS26510_Maf_SessionHandling_NetworkAssistance.yaml#/components/schemas/NetworkAssistanceSession'
+
+    NotificationMessageType:
+      description: 'Enumeration of notification message types.'
+      anyOf:
+        - type: string
+          enum:
+            - NOTIFICATION_SERVICE_ACCESS_INFORMATION
+            - NOTIFICATION_DYNAMIC_POLICY_INSTANCE
+            - NOTIFICATION_NETWORK_ASSISTANCE_SESSION
+        - type: string
+          description: >
+            This string provides forward-compatibility with future
+            extensions to the enumeration but is not used to encode
+            content defined in the present version of this API.