diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml
index 3742ff0646bcfe457da49da984597df531d14efa..a07f5c6ca9a146dbe20ec70efe012b7075361767 100755
--- a/OpenAPI/TS28623_ComDefs.yaml
+++ b/OpenAPI/TS28623_ComDefs.yaml
@@ -128,39 +128,21 @@ components:
       type: string
       pattern: '^[A-Fa-f0-9]{9}$'   
     TimeWindow:
-      description: This datatype is used for writable attribute
-      oneOf:  
-        - type: object
-          properties:
-            startTime:
-              $ref: '#/components/schemas/DateTime'
-            endTime:
-              $ref: '#/components/schemas/DateTime'
-        - type: object
-          properties:
-            startTime:
-              $ref: '#/components/schemas/DateTime'
-        - type: object
-          properties:
-            endTime:
-              $ref: '#/components/schemas/DateTime'    
+      description: This datatype is used for writable attribute 
+      type: object
+      properties:
+        startTime:
+          $ref: '#/components/schemas/DateTime'
+        endTime:
+          $ref: '#/components/schemas/DateTime'
     TimeWindowRo:
-      description: This datatype is used for readOnly attribute   
-      oneOf:
-        - type: object
-          properties:
-            startTime:
-              $ref: '#/components/schemas/DateTimeRo'
-            endTime:
-              $ref: '#/components/schemas/DateTimeRo'        
-        - type: object
-          properties:
-            startTime:
-              $ref: '#/components/schemas/DateTimeRo'
-        - type: object
-          properties:
-            endTime:
-              $ref: '#/components/schemas/DateTimeRo'   
+      description: This datatype is used for readOnly attribute
+      type: object
+      properties:
+        startTime:
+          $ref: '#/components/schemas/DateTimeRo'
+        endTime:
+          $ref: '#/components/schemas/DateTimeRo'
     GeoCoordinate:
       type: object
       properties: