diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml
index e10f7bd52c0eefd4250d0506ad2f1458a61ff4e4..9ff661121c623cafaba96c25a76022cdfd87a467 100644
--- a/OpenAPI/TS28312_IntentExpectations.yaml
+++ b/OpenAPI/TS28312_IntentExpectations.yaml
@@ -22,26 +22,25 @@ components:
         expectationId:
           type: string
         expectationVerb:
-           $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb'
-        expectationObjects:
-          type: array
-          items:
-            $ref: '#/components/schemas/RadioNetworkExpectationObject'
+           $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb"
+        expectationObject:
+          $ref: "#/components/schemas/RadioNetworkExpectationObject"
         expectationTargets:
           type: array
           items:
             type: object
             oneOf:
-              - $ref: "#/components/schemas/WeakRSRPRatioTarget"
-              - $ref: "#/components/schemas/LowSINRRatioTarget"
-              - $ref: "#/components/schemas/AveULRANUEThptTarget"
-              - $ref: "#/components/schemas/AveDLRANUEThptTarget"
-              - $ref: "#/components/schemas/LowULRANUEThptRatioTarget"
-              - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget" 
+              - $ref: '#/components/schemas/WeakRSRPRatioTarget'
+              - $ref: '#/components/schemas/LowSINRRatioTarget'
+              - $ref: '#/components/schemas/AveULRANUEThptTarget'
+              - $ref: '#/components/schemas/AveDLRANUEThptTarget'
+              - $ref: '#/components/schemas/LowULRANUEThptRatioTarget'
+              - $ref: '#/components/schemas/LowDLRANUEThptRatioTarget' 
               - $ref: '#/components/schemas/HighULPrbLoadRatioTarget'
               - $ref: '#/components/schemas/HighDLPrbLoadRatioTarget'
               - $ref: '#/components/schemas/AveULPrbLoadTarget'
               - $ref: '#/components/schemas/AveDLPrbLoadTarget'
+              - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget'
         expectationContexts:
           type: array
           items:
@@ -57,10 +56,8 @@ components:
           type: string
         expectationVerb:
            $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb'
-        expectationObjects:
-          type: array
-          items:
-            $ref: '#/components/schemas/ServiceSupportExpectationObject'
+        expectationObject:
+          $ref: '#/components/schemas/ServiceSupportExpectationObject'
         expectationTargets:
           type: array
           items:
@@ -97,7 +94,7 @@ components:
         objectType:
           type: string
           enum:
-            - RAN_SubNetwork #value for Radio Network Expectation--#
+            - RAN_SubNetwork
         objectInstance:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
         objectContexts:
@@ -110,7 +107,8 @@ components:
               - $ref: '#/components/schemas/PLMNContext'
               - $ref: '#/components/schemas/NRFqBandContext'
               - $ref: '#/components/schemas/RATContext'
-              - $ref: '#/components/schemas/ObjectContext'               
+              - $ref: '#/components/schemas/ObjectContext'
+              - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext'                                
     ServiceSupportExpectationObject: 
       description: >-
         This data type is the "ExpectationObject" data type with specialisations for ServiceSupportExpectation
@@ -119,7 +117,7 @@ components:
         objectType:
           type: string
           enum:
-            - Service_Support #value for Service Support Expectation--#
+            - Service_Support 
         objectInstance:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
         objectContexts:
@@ -130,7 +128,7 @@ components:
               - $ref: '#/components/schemas/EdgeIdentificationIdContext'
               - $ref: '#/components/schemas/EdgeIdentificationLocContext'
               - $ref: '#/components/schemas/CoverageAreaTAContext'   
-              - $ref: '#/components/schemas/ObjectContext'  
+              - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext'               
    #-------Definition of the ExpectationObject dataType ----------#    
 
 
diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml
index c918933b5d6f83b2bf839dd7e8819fb733d760a9..328945d12d2c54d88de602e7f2ca0dba7d5cd243 100644
--- a/OpenAPI/TS28312_IntentNrm.yaml
+++ b/OpenAPI/TS28312_IntentNrm.yaml
@@ -99,11 +99,9 @@ components:
         expectationId:
           type: string
         expectationVerb:
-           $ref: '#/components/schemas/ExpectationVerb'
-        expectationObjects:
-          type: array
-          items:
-            $ref: '#/components/schemas/ExpectationObject'
+           $ref: "#/components/schemas/ExpectationVerb"
+        expectationObject:
+          $ref: "#/components/schemas/ExpectationObject"
         expectationTargets:
           type: array
           items:
@@ -127,7 +125,6 @@ components:
           enum:
             - RAN_SubNetwork  #value for Radio Network Expectation--#
             - Service_Support  #value for Service Support Expectation--#
-            - TBD    #-This will be added based on defined scenario specific intent expectation-#
         objectInstance:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
         objectContexts: