diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml
index a4afbb61980a9559233a8694183f95ddd92ff75f..01a77f34a674a41a48f47a40cf7fd898f92e2200 100644
--- a/OpenAPI/TS28105_AiMlNrm.yaml
+++ b/OpenAPI/TS28105_AiMlNrm.yaml
@@ -30,11 +30,19 @@ components:
         aIMLEntityVersion:
           type: string
         expectedRunTimeContext:
-          type: string
+          $ref: '#/components/schemas/AIMLContext'
         trainingContext:
-          type: string
+          $ref: '#/components/schemas/AIMLContext'
         runTimeContext:
-          type: string
+          $ref: '#/components/schemas/AIMLContext'
+
+    AIMLContext:
+      type: object
+      properties:
+        inferenceEntityRef:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
+        dataProviderRef:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
 
     RequestStatus:
       type: string