diff --git a/OpenAPI/TS28623_FileManagementNrm.yaml b/OpenAPI/TS28623_FileManagementNrm.yaml
index 841456c4755d85a38bab64a4d8f6a8b31532cc51..60d44b7f0ad4c9d3c23563fd331565758cbcc096 100644
--- a/OpenAPI/TS28623_FileManagementNrm.yaml
+++ b/OpenAPI/TS28623_FileManagementNrm.yaml
@@ -94,7 +94,7 @@ components:
               type: object
               properties:
                 fileLocation:
-                  $ref: '#/components/schemas/FileLocation'
+                  type: string
                 notificationRecipientAddress:
                   $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
                 cancelJob:
@@ -131,10 +131,8 @@ components:
             attributes:
               type: object
               properties:
-                file:
-                  oneOf:
-                    - $ref: '#/components/schemas/FileLocation'
-                    - $ref: '#/components/schemas/FileContent'                
+                fileLocation:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo'
                 fileCompression:
                   type: string
                   readOnly: true
@@ -156,16 +154,15 @@ components:
                   $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo'
                 fileExpirationTime:
                   $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo'
+                fileContent:
+                  type: string
+                  readOnly: true
                 jobRef:
                   $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'
                 jobId:
                   type: string
                   readOnly: true
-    FileLocation:
-      $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo'
-    FileContent:
-      type: string
-      readOnly: true 
+ 
             
 
 #-------- Definition of YAML arrays for name-contained IOCs ----------------------