diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml
index b74804c5e46cb48357410b41d6c2c9612b4ecbae..d8eaa5003d55e51c1a76f18c01ac6d540558c279 100644
--- a/OpenAPI/TS28104_MdaNrm.yaml
+++ b/OpenAPI/TS28104_MdaNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: MDA NRM
-  version: 17.0.0
+  version: 17.2.0
   description: >-
     OAS 3.0.1 specification of the MDA NRM
     © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -45,9 +45,7 @@ components:
         threshold:
           $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdInfo'
         analyticsPeriod:
-          type: array
-          items:
-            $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
+          $ref: '#/components/schemas/AnalyticsSchedule'
         timeOut:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
 
@@ -61,7 +59,7 @@ components:
     ReportingTarget:
       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
 
-    AnalyticsScope:
+    AnalyticsScopeType:
       oneOf:
         - type: object
           properties:
@@ -96,6 +94,19 @@ components:
         longitude:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Longitude'
 
+    AnalyticsSchedule:
+      oneOf:
+        - type: object
+          properties:
+            timeDurations:
+              type: array
+              items:
+                $ref: 'TS28104_MdaReport.yaml#/components/schemas/TimeWindow'
+        - type: object
+          properties:
+            granularityPeriod:
+              type: integer
+
 
 #-------- Definition of abstract IOCs --------------------------------------------
 
@@ -170,7 +181,7 @@ components:
                     reportingTarget:
                       $ref: '#/components/schemas/ReportingTarget'
                     analyticsScope:
-                      $ref: '#/components/schemas/AnalyticsScope'
+                      $ref: '#/components/schemas/AnalyticsScopeType'
                     startTime:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
                     stopTime:
diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml
index 3f8dcf23709d25f1601bf93a9c3335d48d8ebf04..8e0f871b2d39421f11a364c2798b9abc14ccb268 100644
--- a/OpenAPI/TS28104_MdaReport.yaml
+++ b/OpenAPI/TS28104_MdaReport.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: MDA Report
-  version: 17.0.0
+  version: 17.2.0
   description: >-
     OAS 3.0.1 specification of the MDA Report
     © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -43,9 +43,9 @@ components:
     TimeWindow:
       type: object
       properties:
-        startTime:
+        mDAOutputStartTime:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
-        endTime:
+        mDAOutputEndTime:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'