diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml
index 46eaca579fae8d41e2f778a9ae12806fe719dc28..942a1cb6f731f9bb582d6363fd4a8b47de5ab22c 100644
--- a/OpenAPI/TS28104_MdaReport.yaml
+++ b/OpenAPI/TS28104_MdaReport.yaml
@@ -14,6 +14,30 @@ components:
   schemas:
 
 #-------- Definition of types-----------------------------------------------------
+    ProjectionDuration:
+      type: object
+      properties:
+        fromTime:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
+        toTime:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
+    PagingOptimizationAnalysisOutput:
+      type: object
+      properties:
+        oOCDuration:
+          $ref: '#/components/schemas/ProjectionDuration'
+        oOCLocation:
+          type: array
+          uniqueItems: true
+          items:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate'
+          minItems: 1
+        oOCMap:
+          type: array
+          uniqueItems: true
+          items:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'
+          minItems: 1
 
     MDAOutputs:
       type: object
@@ -21,10 +45,12 @@ components:
         mDAType:
           $ref: 'TS28104_MdaNrm.yaml#/components/schemas/MDAType'
         mDAOutputList:
-          type: array
-          uniqueItems: true
-          items:
-            $ref: '#/components/schemas/MDAOutputEntry'
+          oneOf:
+            - $ref: '#/components/schemas/PagingOptimizationAnalysisOutput'          
+            - type: array
+              uniqueItems: true
+              items:
+                $ref: '#/components/schemas/MDAOutputEntry'
         analyticsWindow:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo'
         confidenceDegree: