diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml
index 4290465aa8cc9e9fda12f6f9b433b7448a648134..89aa349ac731d526530fc859204a12617ef07f28 100644
--- a/OpenAPI/TS28104_MdaNrm.yaml
+++ b/OpenAPI/TS28104_MdaNrm.yaml
@@ -19,6 +19,7 @@ components:
       type: array
       items:
         type: string
+        readOnly: true
 
     MDAOutputs:
       type: array
@@ -78,7 +79,7 @@ components:
             timeDurations:
               type: array
               items:
-                $ref: 'TS28104_MdaReport.yaml#/components/schemas/TimeWindow'
+                $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'
         - type: object
           properties:
             granularityPeriod:
@@ -140,9 +141,9 @@ components:
                     supportedMDACapabilities:
                       $ref: '#/components/schemas/MDATypes'
                     mLModelRefList:
-                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo'
                     aIMLInferenceFunctionRefList:
-                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'  
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo'  
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml
index b57be4d1a8e53fd04bfad327601642a4218f4884..8462541694b5d80c8e8aa4577648195b7706a4b3 100644
--- a/OpenAPI/TS28104_MdaReport.yaml
+++ b/OpenAPI/TS28104_MdaReport.yaml
@@ -20,12 +20,13 @@ components:
       properties:
         mDAType:
           type: string
+          readOnly: true
         mDAOutputList:
           type: array
           items:
             $ref: '#/components/schemas/MDAOutputEntry'
         analyticsWindow:
-          $ref: '#/components/schemas/TimeWindow'
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo'
         confidenceDegree:
           type: number
           format: float
@@ -35,18 +36,10 @@ components:
       properties:
         mDAOutputIEName:
           type: string
+          readOnly: true
         mDAOutputIEValue: {}
 
 
-    TimeWindow:
-      type: object
-      properties:
-        mDAOutputStartTime:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
-        mDAOutputEndTime:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
-
-
 #-------- Definition of MDA Report --------------------------------------------
 
     MDAReport:
@@ -63,4 +56,4 @@ components:
                     mDAOutputs:
                       $ref: '#/components/schemas/MDAOutputs'
                     mDARequestRef:
-                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'