diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml
index 379962e30f7f76a2aec7cf9404c3f2b4a005917e..7d10b074a441e91888bb640343ca269198d8a682 100644
--- a/OpenAPI/TS28312_IntentExpectations.yaml
+++ b/OpenAPI/TS28312_IntentExpectations.yaml
@@ -82,6 +82,7 @@ components:
               - $ref: '#/components/schemas/DLThptPerUETarget'
               - $ref: '#/components/schemas/ULThptPerUETarget'
               - $ref: '#/components/schemas/NumberofUEsTarget'
+              - $ref: '#/components/schemas/ServiceAvailabilityTarget'              
               - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget'
         expectationContexts:
           type: array
@@ -90,6 +91,7 @@ components:
             type: object
             oneOf:
               - $ref: '#/components/schemas/SchedulingTimeContext'
+              - $ref: '#/components/schemas/AssuranceDurationContext'
               - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'
       required:
         - expectationId
@@ -265,10 +267,12 @@ components:
               - $ref: '#/components/schemas/CoverageAreaPolygonContext'
               - $ref: '#/components/schemas/DlFrequencyContext'
               - $ref: '#/components/schemas/UlFrequencyContext'
-              - $ref: '#/components/schemas/CellContext'  
+              - $ref: '#/components/schemas/CellContext'
+              - $ref: '#/components/schemas/GeoCoordinateContext'
+              - $ref: '#/components/schemas/CivicAreaContext'
               - $ref: '#/components/schemas/ServiceTypeContext'
               - $ref: '#/components/schemas/UEGroupContext'
-              - $ref: '#/components/schemas/GeoCoordinateContext'
+
               - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'
     EdgeServiceSupportExpectationObject: 
       description: >-
@@ -776,6 +780,22 @@ components:
             - IS_LESS_THAN
         targetValueRange:
           type: integer
+    ServiceAvailabilityTarget:
+      description: >-
+        describes the service availability target for the Radio Service that the intent expectation is applied. 
+        The detailed definition for service availability sees communication service availability defined in clause 3.1 of TS 22.261
+      type: object
+      properties:
+        targetName:
+          type: string
+          enum:
+            - ServiceAvailability
+        targetCondition:
+          type: string
+          enum:
+            - IS_GREATER_THAN
+        targetValueRange:
+          type: number          
     DLThptPerUETarget:
       description: >-
         This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget. It describes the DL throughput target by the per UE for the 
@@ -1109,6 +1129,24 @@ components:
              - IS_EQUAL_TO
         contextValueRange:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate'
+    CivicAreaContext:
+      description: >-
+        It describes the coverage areas for the RAN SubNetwork or Radio Service that the intent expectation is applied in the form of     civic area. 
+        The civic area supports civic address (e.g. streets, districts, seats, etc.) or location label (e.g. hotel name, school name)
+      type: object
+      properties:
+        contextAttribute:
+          type: string
+          enum:
+            - CivicArea
+        contextCondition:
+          type: string
+          enum:
+             - IS_ALL_OF
+        contextValueRange:
+          type: array
+          items:
+            $ref: 'TS28312_IntentNrm.yaml#/components/schemas/CivicArea'
     DlFrequencyContext:
       description: >-
         This data type is the "Context" data type with specialisations for Object context "DLFrequencyContext". It describes the downlink frequency information (RF reference
@@ -1495,6 +1533,21 @@ components:
             - IS_ALL_OF
         contextValueRange:
           $ref: "TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime"
+    AssuranceDurationContext:
+      description: >-
+        It describes the time duration at which the radio service instance should be scheduled to be delivered and available.
+      type: object
+      properties:
+        contextAttribute:
+          type: string
+          enum:
+            - AssuranceDuration
+        contextCondition:
+          type: string
+          enum:
+            - S_EQUAL_TO
+        contextValueRange:
+          type: integer
     StartTimeContext:
       description: >-
         This data type is the "ExpectationContext" data type with specialisations for StartTimeContext       
diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml
index 8a87834c1c5a360a16b484922dd6b96cecaada09..28c9547028d5f1e92c501cc539a01ec76e53793f 100644
--- a/OpenAPI/TS28312_IntentNrm.yaml
+++ b/OpenAPI/TS28312_IntentNrm.yaml
@@ -353,6 +353,7 @@ components:
         - $ref: '#/components/schemas/UEGroup'
         - $ref: '#/components/schemas/Frequency'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime'
+        - $ref: '#/components/schemas/CivicArea'
     UEGroup:
       description: >-
         It describes the UE Group, 
@@ -368,6 +369,90 @@ components:
           maximum: 255
         sNssai: 
           $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai'
+    CivicArea:
+      description: >-
+        It describes civic area, which is represented by civic address (e.g. streets, districts, seats, etc.) or 
+        location label (e.g. hotel name, school name).
+      type: object
+      properties:
+        civicAddress:
+          $ref: '#/components/schemas/CivicAddress'
+        locationLabel:
+          description: >-
+            It describes a location label (e.g. hotel name, school name).
+          type: string
+    CivicAddress:
+      description: Indicates a Civic address.
+      type: object
+      properties:
+        country:
+          type: string
+        A1:
+          type: string
+        A2:
+          type: string
+        A3:
+          type: string
+        A4:
+          type: string
+        A5:
+          type: string
+        A6:
+          type: string
+        PRD:
+          type: string
+        POD:
+          type: string
+        STS:
+          type: string
+        HNO:
+          type: string
+        HNS:
+          type: string
+        LMK:
+          type: string
+        LOC:
+          type: string
+        NAM:
+          type: string
+        PC:
+          type: string
+        BLD:
+          type: string
+        UNIT:
+          type: string
+        FLR:
+          type: string
+        ROOM:
+          type: string
+        PLC:
+          type: string
+        PCN:
+          type: string
+        POBOX:
+          type: string
+        ADDCODE:
+          type: string
+        SEAT:
+          type: string
+        RD:
+          type: string
+        RDSEC:
+          type: string
+        RDBR:
+          type: string
+        RDSUBBR:
+          type: string
+        PRM:
+          type: string
+        POM:
+          type: string
+        usageRules:
+          type: string
+        method:
+          type: string
+        providedBy:
+          type: string       
    #-------Definition of the generic dataType --------------#
    
    #-------Definition of the generic ExpectationTarget dataType----------#