diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml
index d7336467d876a4cab75005fc3465e04472de7a24..cbe65a00669d5abcdb89aa234b8e228af6bfff26 100644
--- a/OpenAPI/TS28312_IntentExpectations.yaml
+++ b/OpenAPI/TS28312_IntentExpectations.yaml
@@ -43,7 +43,9 @@ components:
           items:
             $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext"
         expectationfulfilmentInfo:
-            $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo"                  
+            $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" 
+      required:
+        - expectationId
     ServiceSupportExpectation:
       description: >-
         This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for service deployment    
@@ -81,7 +83,9 @@ components:
               - $ref: "#/components/schemas/ResourceSharingLevelContext"
               - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext"
         expectationfulfilmentInfo:
-            $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo"              
+            $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo"    
+      required:
+        - expectationId                      
    #-------Definition of the IntentExpectation dataType ----------#    
 
    #-------Definition of the scenario specific ExpectationObject dataType ----------#    
@@ -442,7 +446,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - IS_WITHIN_RANGE
+            - IS_ALL_OF
         contextValueRange:
           type: array
           items:
@@ -461,7 +465,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - IS_WITHIN_RANGE
+             - IS_ALL_OF
         contextValueRange:
           type: array
           items:
@@ -478,7 +482,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - IS_WITHIN_RANGE
+            - IS_ALL_OF
         contextValueRange:
           type: array
           items:
@@ -495,7 +499,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - IS_WITHIN_RANGE
+            - IS_ALL_OF
         contextValueRange:
           type: array
           items:
@@ -512,7 +516,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - IS_WITHIN_RANGE
+            - IS_ALL_OF
         contextValueRange:
           type: array
           items:
@@ -567,7 +571,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - IS_WITHIN_RANGE
+            - IS_ALL_OF
         contextValueRange:
           type: array
           items:
diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml
index ad7e7ad1981983875486443f048a8068aa06642b..072ef6798a16cb14b93be31bbad805b80f2e4e18 100644
--- a/OpenAPI/TS28312_IntentNrm.yaml
+++ b/OpenAPI/TS28312_IntentNrm.yaml
@@ -76,7 +76,9 @@ components:
           items:
             $ref: "#/components/schemas/ExpectationContext"
         expectationfulfilmentInfo:
-            $ref: "#/components/schemas/FulfilmentInfo"                
+            $ref: "#/components/schemas/FulfilmentInfo" 
+      required:
+        - expectationId
    #-------Definition of the generic IntentExpectation dataType ----------#    
 
    #-------Definition of the generic ExpectationObject dataType ----------#    
@@ -113,13 +115,16 @@ components:
         - IS_NOT_ONE_OF
         - IS_EQUAL_TO_OR_LESS_THAN
         - IS_EQUAL_TO_OR_GREATER_THAN
+        - IS_ALL_OF        
     FulfilStatus:
       type: string
+      readOnly: true      
       enum:
           - FULFILLED
           - NOT_FULFILLED
     NotFulfilledState:
       type: string
+      readOnly: true      
       enum:
           - ACKNOWLEDGED
           - COMPLIANT
@@ -140,6 +145,7 @@ components:
           description: ->
             An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo
           type: string
+          readOnly: true          
     ExpectationVerb:
       type: string
       enum: