diff --git a/TS26532_CommonData.yaml b/TS26532_CommonData.yaml
index ed3c43d705343f6a1426e94c05d764e7470df282..3b592e1a45c37e048cdcd77e2fdc762909fbd86e 100644
--- a/TS26532_CommonData.yaml
+++ b/TS26532_CommonData.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.0
 info:
   title: Data Collection and Reporting Common Data Types
-  version: 2.0.0
+  version: 2.1.0
   description: |
     Data Collection and Reporting Common Data Types
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -10,7 +10,7 @@ tags:
   - name: Data Collection and Reporting Common Data Types
     description: 'Data Collection and Reporting: Common Data Types'
 externalDocs:
-  description: 'TS 26.532 V18.2.0; Data Collection and Reporting; Protocols and Formats'
+  description: 'TS 26.532 V18.3.0; Data Collection and Reporting; Protocols and Formats'
   url: 'https://www.3gpp.org/ftp/Specs/archive/26_series/26.532/'
 paths: {}
 components:
@@ -27,15 +27,30 @@ components:
       description: "Instructions on how UE data is to be sampled by the data collection client."
       type: object
       properties:
+        contextIds:
+          readOnly: true
+          type: array
+          minItems: 1
+          items:
+            type: string
+            minLength: 1
         samplingPeriod:
           $ref: 'TS29571_CommonData.yaml#/components/schemas/Float'
         locationFilter:
           $ref: 'TS29122_CommonData.yaml#/components/schemas/LocationArea5G'
+      required:
+        - contextIds
 
     DataReportingCondition:
       description: "A condition that triggers data reporting by a data collection client to the Data Collection AF."
       type: object
       properties:
+        contextIds:
+          type: array
+          minItems: 1
+          items:
+            type: string
+            minLength: 1
         type:
           $ref: '#/components/schemas/DataReportingConditionType'
         period:
@@ -57,12 +72,19 @@ components:
         eventTrigger:
           $ref: '#/components/schemas/DataReportingEventTrigger'
       required:
+        - contextIds
         - type
 
     DataReportingRule:
       description: "Instructions on how collected UE data is to be reported by the data collection client to the Data Collection AF."
       type: object
       properties:
+        contextIds:
+          type: array
+          minItems: 1
+          items:
+            type: string
+            minLength: 1
         reportingProbability:
           $ref: 'TS26510_CommonData.yaml#/components/schemas/Percentage'
         reportingFormat:
@@ -70,6 +92,8 @@ components:
           $ref: 'TS29571_CommonData.yaml#/components/schemas/Uri'
         dataPackagingStrategy:
           type: string
+      required:
+        - contextIds
 
     #####################################
     # Clause 5.4.3: Enumerated data types
diff --git a/TS26532_Ndcaf_DataReporting.yaml b/TS26532_Ndcaf_DataReporting.yaml
index 952c14717c2d13103232baf981d4fce3e1e9f541..0acd3b1261aafc8bf75017a210100e306a1ecab4 100644
--- a/TS26532_Ndcaf_DataReporting.yaml
+++ b/TS26532_Ndcaf_DataReporting.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.0
 info:
   title: Ndcaf_DataReporting
-  version: 2.0.0
+  version: 2.1.0
   description: |
     Data Collection AF: Data Collection and Reporting Configuration API and Data Reporting API
     © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -12,7 +12,7 @@ tags:
     description: 'Data Collection and Reporting: Client Configuration and Data Reporting (R2/R3/R4) APIs'
 
 externalDocs:
-  description: 'TS 26.532 V18.2.0; Data Collection and Reporting; Protocols and Formats'
+  description: 'TS 26.532 V18.3.0; Data Collection and Reporting; Protocols and Formats'
   url: 'https://www.3gpp.org/ftp/Specs/archive/26_series/26.532/'
 
 servers:
@@ -336,8 +336,14 @@ components:
       properties:
         timestamp:
           $ref: 'TS29571_CommonData.yaml#/components/schemas/DateTime'
+        contextIds:
+          type: array
+          minItems: 1
+          items:
+            type: string
       required:
         - timestamp
+        - contextIds
 
     ServiceExperienceRecord:
       description: "A data reporting record for UE service experience."