diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml
index 12c378fb9255778965acd555172ea1700d75bfd6..0dcb5d3a65760f7253dd95a6baa41260824a23fe 100644
--- a/OpenAPI/TS28104_MdaReport.yaml
+++ b/OpenAPI/TS28104_MdaReport.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: MDA Report
-  version: 17.4.0
+  version: 17.6.0
   description: >-
     OAS 3.0.1 specification of the MDA Report
     © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -20,7 +20,7 @@ components:
       properties:
         mDAType:
           type: string
-        mdaOutputList:
+        mDAOutputList:
           type: array
           items:
             $ref: '#/components/schemas/MDAOutputEntry'
@@ -37,7 +37,7 @@ components:
       properties:
         mDAOutputIEName:
           type: string
-        mdaOutputIEValue: {}
+        mDAOutputIEValue: {}
 
 
     TimeWindow:
diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml
index 2ceebaf6162f646eda67146763c7d56cb2c1cba8..ce3c27250d9150d74dcfced44fecc41f89c6a58f 100644
--- a/OpenAPI/TS28105_AiMlNrm.yaml
+++ b/OpenAPI/TS28105_AiMlNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: AI/ML NRM
-  version: 17.4.0
+  version: 17.6.0
   description: >-
     OAS 3.0.1 specification of the AI/ML NRM
     © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -233,7 +233,7 @@ components:
                       type: array
                       items:
                         type: string
-                    confidenceIndication:
+                    modelConfidenceIndication:
                       type: integer
                     modelPerformanceTraining:
                       type: array
diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml
index f641734f3ff2ecf2c4e40da15d24da66f88f247d..34292ec5b688deb24f5683248882449bfcd741d6 100644
--- a/OpenAPI/TS28312_IntentExpectations.yaml
+++ b/OpenAPI/TS28312_IntentExpectations.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: Scenario specific Intent Expectations
-  version: 17.5.0
+  version: 17.6.0
   description: >-
     OAS 3.0.1 definition of scenario specific Intent Expectations 
     © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -40,7 +40,7 @@ components:
         expectationContexts:
           type: array
           items:
-            $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext"
+            $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context"
         expectationfulfilmentInfo:
             $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" 
       required:
@@ -78,7 +78,7 @@ components:
               - $ref: "#/components/schemas/ServiceEndTimeContext"
               - $ref: "#/components/schemas/UEMobilityLevelContext"
               - $ref: "#/components/schemas/ResourceSharingLevelContext"
-              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext"
+              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context"
         expectationfulfilmentInfo:
             $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo"    
       required:
@@ -107,7 +107,7 @@ components:
               - $ref: "#/components/schemas/PLMNContext"
               - $ref: "#/components/schemas/NRFqBandContext"
               - $ref: "#/components/schemas/RATContext"
-              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ObjectContext"               
+              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context"               
     EdgeServiceSupportExpectationObject: 
       description: >-
         This data type is the "ExpectationObject" data type with specialisations for EdgeServiceSupportExpectation
@@ -127,7 +127,7 @@ components:
               - $ref: "#/components/schemas/EdgeIdentificationIdContext"
               - $ref: "#/components/schemas/EdgeIdentificationLocContext"
               - $ref: "#/components/schemas/CoverageAreaTAContext"   
-              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ObjectContext"   
+              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context"   
    #-------Definition of the ExpectationObject dataType ----------#    
 
 
@@ -418,19 +418,6 @@ components:
    #-------Definition of the concrete ExpectationTarget  dataType----------#  
    
    #-------Definition of the concrete ObjectTarget dataType----------------#
-    ObjectContext:
-      description: >-
-        This data type is the "ObjectContext" data type without specialisations        
-      type: object
-      properties:
-        contextAttribute:
-          type: string
-        contextCondition:
-          $ref: "TS28312_IntentNrm.yaml#/components/schemas/Condition"
-        contextValueRange:
-          type: array
-          items:
-            type: number 
     CoverageAreaPolygonContext:
       description: >-
         This data type is the "ObjectContext" data type with specialisations for CoverageAreaPolygonContext          
@@ -447,9 +434,7 @@ components:
         contextValueRange:
           type: array
           items:
-            $ref: "#/components/schemas/CoverageArea"
-    CoverageArea:
-      type: string
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'
     CoverageTACContext:
       description: >-
         This data type is the "ObjectContext" data type with specialisations for CoverageTACContext     
@@ -466,7 +451,7 @@ components:
         contextValueRange:
           type: array
           items:
-            $ref: "TS28541_NrNrm.yaml#/components/schemas/NrTac"
+            $ref: "TS28623_ComDefs.yaml#/components/schemas/Tac"
     PLMNContext:
       description: >-
         This data type is the "ObjectContext" data type with specialisations for PLMNContext       
@@ -536,9 +521,7 @@ components:
           enum:
             - IS_EQUAL_TO
         contextValueRange:
-          type: array
-          items:
-            type: string
+          type: string
     EdgeIdentificationLocContext:
       description: >-
         This data type is the "ObjectContext" data type with specialisations for EdgeIdentificationLocContext    
@@ -553,9 +536,7 @@ components:
           enum:
             - IS_EQUAL_TO
         contextValueRange:
-          type: array
-          items:
-            type: string
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate'            
     CoverageAreaTAContext:
       description: >-
         This data type is the "ObjectContext" data type with specialisations for CoverageAreaTAContext       
@@ -570,11 +551,7 @@ components:
           enum:
             - IS_ALL_OF
         contextValueRange:
-          type: array
-          items:
-            $ref: "#/components/schemas/CoverageAreaTAList"
-    CoverageAreaTAList:
-          type: integer
+          $ref: "TS28623_ComDefs.yaml#/components/schemas/Tac" 
    #-------Definition of the scenario specific  ObjectTarget dataType----------------#
    
    #-------Definition of the concrete ExpectationContext dataType----------------#
diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml
index 1ad10359a37007e1abd61284cce0630fc63d53c1..9af9bf8addc85723e3af88d6b19c0fa8963bdbec 100644
--- a/OpenAPI/TS28312_IntentNrm.yaml
+++ b/OpenAPI/TS28312_IntentNrm.yaml
@@ -48,7 +48,7 @@ components:
           intentContexts:
             type: array
             items:
-              $ref: "#/components/schemas/IntentContext"
+              $ref: "#/components/schemas/Context"
           intentFulfilmentInfo:
             $ref: "#/components/schemas/FulfilmentInfo"
    #-------Definition of generic IOCs ----------#  
@@ -72,7 +72,7 @@ components:
         expectationContexts:
           type: array
           items:
-            $ref: "#/components/schemas/ExpectationContext"
+            $ref: "#/components/schemas/Context"
         expectationfulfilmentInfo:
             $ref: "#/components/schemas/FulfilmentInfo" 
       required:
@@ -95,7 +95,7 @@ components:
         objectContexts:
           type: array
           items:
-            $ref: "#/components/schemas/ObjectContext"           
+            $ref: "#/components/schemas/Context"           
 
    #-------Definition of the generic ExpectationObject dataType ----------#    
 
@@ -150,10 +150,10 @@ components:
           - ENSURE
    #-------Definition of the generic dataType --------------#    
 
-   #-------Definition of the generic IntentContext dataType --------------#    
-    IntentContext:
+   #-------Definition of the generic Context dataType --------------#    
+    Context:
       description: >-
-        This data type is the "IntentContext" data type without specialisations
+        This data type is the "Context" data type without specialisations
       type: object
       properties:
         contextAttribute:
@@ -164,7 +164,7 @@ components:
           type: array
           items:
             type: number 
-   #-------Definition of the generic IntentContext dataType --------------#   
+   #-------Definition of the generic Context dataType --------------#   
    
    #-------Definition of the generic ExpectationTarget dataType----------#     
     ExpectationTarget:
@@ -181,52 +181,9 @@ components:
         targetContexts:
           type: array
           items:
-            $ref: "#/components/schemas/TargetContext"
-    TargetContext:
-      description: >-
-        This data type is the "TargetContext" data type without specialisations
-      type: object
-      properties:
-        contextAttribute:
-          type: string
-        contextCondition:
-          $ref: "#/components/schemas/Condition"
-        contextValueRange:
-          type: number        
+            $ref: "#/components/schemas/Context"
    #-------Definition of the generic ExpectationTarget  dataType----------#  
-   
-   #-------Definition of the generic ObjectContext dataType----------------#
-    ObjectContext:
-      description: >-
-        This data type is the "ObjectContext" data type without specialisations        
-      type: object
-      properties:
-        contextAttribute:
-          type: string
-        contextCondition:
-          $ref: "#/components/schemas/Condition"
-        contextValueRange:
-          type: array
-          items:
-            type: number 
-   #-------Definition of the generic ObjectContext dataType----------------#
 
-   #-------Definition of the generic ExpectionContext dataType----------------#
-    ExpectationContext:
-      description: >-
-        This data type is the "ExpectationContext" data type without specialisations       
-      type: object
-      properties:
-        contextAttribute:
-          type: string
-        contextCondition:
-          $ref: "#/components/schemas/Condition"
-        contextValueRange:
-          type: array
-          items:
-            type: number 
-   #-------Definition of the concrete ExpectationContext dataType----------------#
-   
    #------Definition of JSON arrays for name-contained IOCs ---------------#
 
     SubNetwork-Multiple:
diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml
index 2bac3706e8bb5c65593ce1474623824b41040fde..7b734bc79ca39b96d1c8f5444e7f15ed3b7bb7fa 100755
--- a/OpenAPI/TS28532_ProvMnS.yaml
+++ b/OpenAPI/TS28532_ProvMnS.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: Provisioning MnS
-  version: 17.5.0
+  version: 17.6.0
   description: >-
     OAS 3.0.1 definition of the Provisioning MnS
     © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml
index 343062cfc1c0809ba05874aaecad28e751e45bc1..ccb58cf1cfd7188453a92569072bcb45e8ba6eba 100755
--- a/OpenAPI/TS28541_5GcNrm.yaml
+++ b/OpenAPI/TS28541_5GcNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: 3GPP 5GC NRM
-  version: 17.11.0
+  version: 17.13.0
   description: >-
     OAS 3.0.1 specification of the 5GC NRM
     © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -1174,8 +1174,8 @@ components:
                       type: string
                     cNSIIdList:
                       $ref: '#/components/schemas/CNSIIdList'
-                    nFProfileList:
-                      $ref: '#/components/schemas/NFProfileList'
+                    managedNFProfile:
+                      $ref: '#/components/schemas/ManagedNFProfile'
                     snssaiList:
                       $ref: '#/components/schemas/SnssaiList'
                     commModelList:
@@ -1187,6 +1187,8 @@ components:
               $ref: '#/components/schemas/EP_N22-Multiple'
             EP_N31:
               $ref: '#/components/schemas/EP_N31-Multiple'
+            EP_N34:
+              $ref: '#/components/schemas/EP_N34-Multiple'
     SmsfFunction-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -1305,7 +1307,11 @@ components:
                       $ref: '#/components/schemas/CommModelList'
                     networkSliceInfoList:
                       $ref: '#/components/schemas/NetworkSliceInfoList'
-                      
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - type: object
+          properties:
+            EP_N34:
+              $ref: '#/components/schemas/EP_N34-Multiple'                      
     ScpFunction-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -1861,6 +1867,20 @@ components:
                       type: string
                     withIPX:
                       type: boolean
+    EP_N34-Single:
+      allOf:
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              allOf:
+                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr'
+                - type: object
+                  properties:
+                    localAddress:
+                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'
+                    remoteAddress:
+                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'
     EP_N33-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -2071,7 +2091,8 @@ components:
               type: string
               enum:
                 - GBR
-                - NonGBR
+                - NON_GBR
+                - DELAY_CRITICAL_GBR
             priorityLevel:
               type: integer
             packetDelayBudget:
@@ -2416,6 +2437,10 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/EP_N33-Single'
+    EP_N34-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/EP_N34-Single'        
     EP_S5C-Multiple:
       type: array
       items:
@@ -2545,6 +2570,7 @@ components:
        - $ref: '#/components/schemas/EP_N31-Single'
        - $ref: '#/components/schemas/EP_N32-Single'
        - $ref: '#/components/schemas/EP_N33-Single'       
+       - $ref: '#/components/schemas/EP_N34-Single'
        - $ref: '#/components/schemas/EP_N60-Single'
        - $ref: '#/components/schemas/EP_N88-Single'
 
diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index 8c7a4a8a89a491bb64fc60cc62ec9c9bc1bc9470..61b635cca5d3cf8c948bcfb179ea225652e7c4ed 100755
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: NR NRM
-  version: 17.12.0
+  version: 17.13.0
   description: >-
     OAS 3.0.1 specification of the NR NRM
     © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -16,7 +16,9 @@ components:
 #-------- Definition of types-----------------------------------------------------
 
     GnbId:
-      type: string
+      type: integer
+      minimum: 0
+      maximum: 4294967295
     GnbIdLength:
       type: integer
       minimum: 22
@@ -25,16 +27,17 @@ components:
       type: string
       maxLength: 150
     GnbDuId:
-      type: number
+      type: integer
       minimum: 0
       maximum: 68719476735
     GnbCuUpId:
-      type: number
+      type: integer
       minimum: 0
       maximum: 68719476735
 
     Sst:
       type: integer
+      minimum: 0
       maximum: 255
     Snssai:
       type: object
@@ -43,6 +46,7 @@ components:
           $ref: '#/components/schemas/Sst'
         sd:
           type: string
+          pattern: '^[A-Fa-f0-9]{6}$'
 
     PlmnIdList:
       type: array
@@ -65,13 +69,24 @@ components:
       type: string
     NpnIdentity:
       type: object
+      oneOf:
+        - required: [ plmnId, cagidList ]
+        - required: [ plmnId, nidList ]
       properties:
         plmnId:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
         cagidList:
-          $ref: '#/components/schemas/cagId'
+          type: array
+          items:
+            $ref: '#/components/schemas/cagId'
+          minItems: 1
+          maxItems: 12
         nidList:
-          $ref: '#/components/schemas/nid'
+          type: array
+          items:
+            $ref: '#/components/schemas/nid'
+          minItems: 1
+          maxItems: 12
     NpnIdentityList:
       type: array
       items:
@@ -247,7 +262,7 @@ components:
       enum:
         - DL
         - UL
-        - DL and UL
+        - DL_AND_UL
     BwpContext:
       type: string
       enum:
@@ -540,8 +555,8 @@ components:
           enum:
             - RS1
             - RS2
-            - RS1forEnoughMitigation
-            - RS1forNotEnoughMitigation          
+            - RS1_FOR_ENOUGH_MITIGATION
+            - RS1_FOR_NOT_ENOUGH_MITIGATION         
 
     RimRSReportConf:
       type: object
@@ -582,7 +597,7 @@ components:
         - PRB
         - PRB_UL
         - PRB_DL
-        - RRC
+        - RRC_CONNECTED_USERS
         - DRB    
     ParameterRange:
       type: object
@@ -749,6 +764,8 @@ components:
               $ref: '#/components/schemas/EP_F1C-Single'
             EP_F1U:
               $ref: '#/components/schemas/EP_F1U-Multiple'
+            NrOperatorCellDu:
+              $ref: '#/components/schemas/NrOperatorCellDu-Multiple'              
 
     GnbCuUpFunction-Single:
       allOf:
@@ -986,8 +1003,6 @@ components:
               $ref: '#/components/schemas/CPCIConfigurationFunction-Single'
             DRACHOptimizationFunction:
               $ref: '#/components/schemas/DRACHOptimizationFunction-Single'
-            NrOperatorCellDu:
-              $ref: '#/components/schemas/NrOperatorCellDu-Multiple'
 
     NrOperatorCellDu-Single:
       allOf:
@@ -1123,7 +1138,7 @@ components:
                     beamType:
                       type: string
                       enum:
-                        - SSB-BEAM
+                        - SSB_BEAM
                     beamAzimuth:
                       type: integer
                       minimum: -1800
@@ -1371,13 +1386,13 @@ components:
                     isProbingCapable:
                       type: string
                       enum:
-                         - yes
-                         - no
+                         - YES
+                         - NO
                     energySavingState:
                       type: string
                       enum:
-                         - isNotEnergySaving
-                         - isEnergySaving
+                         - IS_NOT_ENERGY_SAVING
+                         - IS_ENERGY_SAVING
 
     DRACHOptimizationFunction-Single:
       allOf:
@@ -1393,7 +1408,6 @@ components:
                       $ref: "#/components/schemas/UeAccProbabilityDist"
                     ueAccDelayProbabilityDist:
                       $ref: "#/components/schemas/UeAccDelayProbabilityDist"
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
 
     DMROFunction-Single:
       allOf:
@@ -1481,13 +1495,13 @@ components:
                     energySavingControl:
                       type: string
                       enum:
-                         - toBeEnergySaving
-                         - toBeNotEnergySaving
+                         - TO_BE_ENERGY_SAVING
+                         - TO_BE_NOT_ENERGY_SAVING
                     energySavingState:
                       type: string
                       enum:
-                         - isNotEnergySaving
-                         - isEnergySaving
+                         - IS_NOT_ENERGY_SAVING
+                         - IS_ENERGY_SAVING
 
     RimRSGlobal-Single:
       allOf:
diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml
index beb653b0bf36b316384b3de1e961e336fcdca97b..8b6f92e8b64ed177c73a914ef0c40260fc7a40ce 100755
--- a/OpenAPI/TS28541_SliceNrm.yaml
+++ b/OpenAPI/TS28541_SliceNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: Slice NRM
-  version: 17.12.0
+  version: 17.13.0
   description: >-
     OAS 3.0.1 specification of the Slice NRM
     @ 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -172,13 +172,6 @@ components:
           $ref: '#/components/schemas/SynAvailability'
         accuracy:
           $ref: '#/components/schemas/Float'
-    SynchronicityRANSubnet:
-      type: object
-      properties:
-        availability:
-          $ref: '#/components/schemas/SynAvailability'
-        accuracy:
-          $ref: '#/components/schemas/Float'
     Positioning:
       type: object
       properties:
@@ -190,15 +183,6 @@ components:
           $ref: '#/components/schemas/PredictionFrequency'
         accuracy:
           $ref: '#/components/schemas/Float'
-    PositioningRANSubnet:
-      type: object
-      properties:
-        availability:
-          $ref: '#/components/schemas/PositioningAvailability'
-        predictionFrequency:
-          $ref: '#/components/schemas/PredictionFrequency'
-        accuracy:
-          $ref: '#/components/schemas/Float'     
     UserMgmtOpen:
       type: object
       properties:
@@ -328,8 +312,6 @@ components:
           type: integer
         delayTolerance:
           $ref: '#/components/schemas/DelayTolerance'
-        synchronicity:
-          $ref: '#/components/schemas/SynchronicityRANSubnet'
         sliceSimultaneousUse:
           $ref: '#/components/schemas/SliceSimultaneousUse'
         reliability:
@@ -386,7 +368,7 @@ components:
         delayTolerance:
           $ref: '#/components/schemas/DelayTolerance'
         positioning:
-          $ref: '#/components/schemas/PositioningRANSubnet'
+          $ref: '#/components/schemas/Positioning'
         sliceSimultaneousUse:
           $ref: '#/components/schemas/SliceSimultaneousUse'
         energyEfficiency:
@@ -396,7 +378,7 @@ components:
         survivalTime:
           type: number
         synchronicity:
-          $ref: '#/components/schemas/SynchronicityRANSubnet'
+          $ref: '#/components/schemas/Synchronicity'
         dLDeterministicComm:
           $ref: '#/components/schemas/DeterministicComm'
         uLDeterministicComm:
diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index 2cfb0f2e951b92d4f6dadafe5ea44cf41d09f279..a7df5f574770fc827d3e1f5cc68f86ea394c4a11 100755
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: Generic NRM
-  version: 17.6.0
+  version: 17.8.0
   description: >-
     OAS 3.0.1 definition of the Generic NRM
     © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -54,6 +54,10 @@ components:
     ThresholdInfo:
       type: object
       properties:
+        performanceMetrics:
+          type: array
+          items:
+            type: string
         thresholdDirection:
           type: string
           enum:
@@ -648,6 +652,7 @@ components:
               - S5-C
               - N16
               - N16a
+              - N38
         SMSFInterfaces:
           type: array
           items:
@@ -1416,34 +1421,40 @@ components:
       description: See details in 3GPP TS 32.422 clause 5.10.11. Only TCE Id value may be sent over the air to the UE being configured for Logged MDT.
       type: integer
 
-    excessPacketDelayThresholds-Type:
+    excessPacketDelayThreshold-Type:
       description: Excess Packet Delay Threshold for NR MDT. See details in 3GPP TS 32.422 clause 4.1.1 and 4.1.2.
-      type: array
+      type: object
       properties:
         fiveQIValue:
           type: integer
         excessPacketDelayThresholdValue:
           type: string
           enum:
-            - 0.25ms
-            - 0.5ms
-            - 1ms
-            - 2ms
-            - 4ms
-            - 5ms
-            - 10ms
-            - 20ms
-            - 30ms
-            - 40ms
-            - 50ms
-            - 60ms
-            - 70ms
-            - 80ms
-            - 90ms
-            - 100ms
-            - 150ms
-            - 300ms
-            - 500ms
+            - 0.25MS
+            - 0.5MS
+            - 1MS
+            - 2MS
+            - 4MS
+            - 5MS
+            - 10MS
+            - 20MS
+            - 30MS
+            - 40MS
+            - 50MS
+            - 60MS
+            - 70MS
+            - 80MS
+            - 90MS
+            - 100MS
+            - 150MS
+            - 300MS
+            - 500MS
+
+    excessPacketDelayThresholds-Type:
+      description: Array of type excessPacketDelayThreshold-Type.
+      type: array
+      items:
+        $ref: '#/components/schemas/excessPacketDelayThreshold-Type'
       minItems: 0
       maxItems: 255
 
@@ -1864,10 +1875,6 @@ components:
                   $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState'
                 operationalState:
                   $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState'
-                performanceMetrics:
-                  type: array
-                  items:
-                    type: string
                 thresholdInfoList:
                   type: array
                   items: