diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml
index b74804c5e46cb48357410b41d6c2c9612b4ecbae..0250ccdd0da1e321c735747b06870c4c24c94a27 100644
--- a/OpenAPI/TS28104_MdaNrm.yaml
+++ b/OpenAPI/TS28104_MdaNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: MDA NRM
-  version: 17.0.0
+  version: 17.2.0
   description: >-
     OAS 3.0.1 specification of the MDA NRM
     © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -43,11 +43,9 @@ components:
         filterValue:
           type: string
         threshold:
-          $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdInfo'
+          $ref: '#/components/schemas/ThresholdInfo'
         analyticsPeriod:
-          type: array
-          items:
-            $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
+          $ref: '#/components/schemas/AnalyticsSchedule'
         timeOut:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
 
@@ -61,7 +59,7 @@ components:
     ReportingTarget:
       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
 
-    AnalyticsScope:
+    AnalyticsScopeType:
       oneOf:
         - type: object
           properties:
@@ -70,32 +68,43 @@ components:
         - type: object
           properties:
             areaScope:
-              $ref: '#/components/schemas/GeoAreaList'
-
-    GeoAreaList:
-      type: array
-      items:
-        $ref: '#/components/schemas/GeoArea'
+              $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'
 
-    GeoArea:
-      type: object
-      properties:
-        coordinates:
-          type: array
-          items:
-            $ref: '#/components/schemas/Coordinate'
-        altitude:
-          type: number
-          format: float
+    AnalyticsSchedule:
+      oneOf:
+        - type: object
+          properties:
+            timeDurations:
+              type: array
+              items:
+                $ref: 'TS28104_MdaReport.yaml#/components/schemas/TimeWindow'
+        - type: object
+          properties:
+            granularityPeriod:
+              type: integer
 
-    Coordinate:
+    ThresholdInfo:
       type: object
       properties:
-        latitude:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Latitude'
-        longitude:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Longitude'
-
+        monitoredMDAOutputIE:          
+          type: string
+        thresholdDirection:
+          type: string
+          enum:
+            - UP
+            - DOWN
+            - UP_AND_DOWN
+        thresholdValue:
+          oneOf:
+            - type: integer
+            - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float'
+        hysteresis:
+          oneOf:
+            - type: integer
+              minimum: 0
+            - type: number
+              format: float
+              minimum: 0
 
 #-------- Definition of abstract IOCs --------------------------------------------
 
@@ -170,7 +179,7 @@ components:
                     reportingTarget:
                       $ref: '#/components/schemas/ReportingTarget'
                     analyticsScope:
-                      $ref: '#/components/schemas/AnalyticsScope'
+                      $ref: '#/components/schemas/AnalyticsScopeType'
                     startTime:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
                     stopTime:
diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml
index 3f8dcf23709d25f1601bf93a9c3335d48d8ebf04..8e0f871b2d39421f11a364c2798b9abc14ccb268 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.0.0
+  version: 17.2.0
   description: >-
     OAS 3.0.1 specification of the MDA Report
     © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -43,9 +43,9 @@ components:
     TimeWindow:
       type: object
       properties:
-        startTime:
+        mDAOutputStartTime:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
-        endTime:
+        mDAOutputEndTime:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
 
 
diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml
index 01a77f34a674a41a48f47a40cf7fd898f92e2200..1e97550d85aa8a0f8e92035a8e39be39b81157bb 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.0.0
+  version: 17.2.0
   description: >-
     OAS 3.0.1 specification of the AI/ML NRM
     © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -15,28 +15,28 @@ components:
 
 #-------- Definition of types-----------------------------------------------------
 
-    AIMLEntityList:
+    MLEntityList:
       type: array
       items:
-        $ref: '#/components/schemas/AIMLEntity'
+        $ref: '#/components/schemas/MLEntity'
 
-    AIMLEntity:
+    MLEntity:
       type: object
       properties:
-        aIMLEntityId:
+        mLEntityId:
           type: string
         inferenceType:
           type: string
-        aIMLEntityVersion:
+        mLEntityVersion:
           type: string
         expectedRunTimeContext:
-          $ref: '#/components/schemas/AIMLContext'
+          $ref: '#/components/schemas/MLContext'
         trainingContext:
-          $ref: '#/components/schemas/AIMLContext'
+          $ref: '#/components/schemas/MLContext'
         runTimeContext:
-          $ref: '#/components/schemas/AIMLContext'
+          $ref: '#/components/schemas/MLContext'
 
-    AIMLContext:
+    MLContext:
       type: object
       properties:
         inferenceEntityRef:
@@ -74,10 +74,10 @@ components:
 
     TrainingProcessMonitor:
       description: >-
-        This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” with specialisations for usage in the "AIMLTrainingProcess".
+        This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” with specialisations for usage in the "MLTrainingProcess".
       type: object
       properties:
-        aIMLTrainingProcessId:
+        mLTrainingProcessId:
           type: string
         status:
           type: string
@@ -120,8 +120,8 @@ components:
               $ref: '#/components/schemas/SubNetwork-Multiple'
             ManagedElement:
               $ref: '#/components/schemas/ManagedElement-Multiple'
-            AIMLTrainingFunction:
-              $ref: '#/components/schemas/AIMLTrainingFunction-Multiple'
+            MLTrainingFunction:
+              $ref: '#/components/schemas/MLTrainingFunction-Multiple'
 
     ManagedElement-Single:
       allOf:
@@ -133,10 +133,10 @@ components:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-ncO'
         - type: object
           properties:
-            AIMLTrainingFunction:
-              $ref: '#/components/schemas/AIMLTrainingFunction-Multiple'
+            MLTrainingFunction:
+              $ref: '#/components/schemas/MLTrainingFunction-Multiple'
 
-    AIMLTrainingFunction-Single:
+    MLTrainingFunction-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
         - type: object
@@ -146,19 +146,19 @@ components:
                 - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
-                    aIMLEntityList:
-                      $ref: '#/components/schemas/AIMLEntityList'
+                    mLEntityList:
+                      $ref: '#/components/schemas/MLEntityList'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
-            AIMLTrainingRequest:
-              $ref: '#/components/schemas/AIMLTrainingRequest-Multiple'
-            AIMLTrainingProcess:
-              $ref: '#/components/schemas/AIMLTrainingProcess-Multiple'
-            AIMLTrainingReport:
-              $ref: '#/components/schemas/AIMLTrainingReport-Multiple'
+            MLTrainingRequest:
+              $ref: '#/components/schemas/MLTrainingRequest-Multiple'
+            MLTrainingProcess:
+              $ref: '#/components/schemas/MLTrainingProcess-Multiple'
+            MLTrainingReport:
+              $ref: '#/components/schemas/MLTrainingReport-Multiple'
 
-    AIMLTrainingRequest-Single:
+    MLTrainingRequest-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
         - type: object
@@ -167,7 +167,7 @@ components:
               allOf:
                 - type: object
                   properties:
-                    aIMLEntityId:
+                    mLEntityId:
                       type: string
                     candidateTraingDataSource:
                       type: array
@@ -189,7 +189,7 @@ components:
                     suspendRequest:
                       type: boolean
 
-    AIMLTrainingProcess-Single:
+    MLTrainingProcess-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
         - type: object
@@ -198,7 +198,7 @@ components:
               allOf:
                 - type: object
                   properties:
-                    aIMLTrainingProcessId:
+                    mLTrainingProcessId:
                       type: string
                     priority:
                       type: integer
@@ -216,7 +216,7 @@ components:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
 
 
-    AIMLTrainingReport-Single:
+    MLTrainingReport-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
         - type: object
@@ -225,7 +225,7 @@ components:
               allOf:
                 - type: object
                   properties:
-                    aIMLEntityId:
+                    mLEntityId:
                       type: string
                     areConsumerTrainingDataUsed:
                       type: boolean
@@ -253,22 +253,22 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/ManagedElement-Single'
-    AIMLTrainingFunction-Multiple:
+    MLTrainingFunction-Multiple:
       type: array
       items:
-        $ref: '#/components/schemas/AIMLTrainingFunction-Single'
-    AIMLTrainingRequest-Multiple:
+        $ref: '#/components/schemas/MLTrainingFunction-Single'
+    MLTrainingRequest-Multiple:
       type: array
       items:
-        $ref: '#/components/schemas/AIMLTrainingRequest-Single'
-    AIMLTrainingProcess-Multiple:
+        $ref: '#/components/schemas/MLTrainingRequest-Single'
+    MLTrainingProcess-Multiple:
       type: array
       items:
-        $ref: '#/components/schemas/AIMLTrainingProcess-Single'
-    AIMLTrainingReport-Multiple:
+        $ref: '#/components/schemas/MLTrainingProcess-Single'
+    MLTrainingReport-Multiple:
       type: array
       items:
-        $ref: '#/components/schemas/AIMLTrainingReport-Single'
+        $ref: '#/components/schemas/MLTrainingReport-Single'
 
 
 #-------- Definitions in TS 28.104 for TS 28.532 ---------------------------------
@@ -278,7 +278,7 @@ components:
         - $ref: '#/components/schemas/SubNetwork-Single'
         - $ref: '#/components/schemas/ManagedElement-Single'
 
-        - $ref: '#/components/schemas/AIMLTrainingFunction-Single'
-        - $ref: '#/components/schemas/AIMLTrainingRequest-Single'
-        - $ref: '#/components/schemas/AIMLTrainingProcess-Single'
-        - $ref: '#/components/schemas/AIMLTrainingReport-Single'
+        - $ref: '#/components/schemas/MLTrainingFunction-Single'
+        - $ref: '#/components/schemas/MLTrainingRequest-Single'
+        - $ref: '#/components/schemas/MLTrainingProcess-Single'
+        - $ref: '#/components/schemas/MLTrainingReport-Single'
diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml
index cb4d86c57484114e55ab97c158acf8177a137319..0257e341ea2bcfa51fe8918dc263d6d8ef4c7987 100644
--- a/OpenAPI/TS28312_IntentNrm.yaml
+++ b/OpenAPI/TS28312_IntentNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: Intent NRM
-  version: 17.0.0
+  version: 17.1.0
   description: >-
     OAS 3.0.1 definition of the Intent NRM
     © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -12,6 +12,24 @@ externalDocs:
 paths: {}
 components:
   schemas:
+       
+   #-------Definition of concrete IOCs ----------#  
+
+    SubNetwork-Single:
+      allOf:
+      - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+      - type: object
+        properties:
+          attributes:
+            $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr'
+      - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO'
+      - type: object
+        properties:
+          SubNetwork:
+            $ref: '#/components/schemas/SubNetwork-Multiple'
+          Intent:
+            $ref: '#/components/schemas/Intent-Multiple'
+
     Intent-Single:
       allOf:
       - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'    
@@ -33,6 +51,7 @@ components:
               $ref: "#/components/schemas/IntentContext"
           intentFulfilmentInfo:
             $ref: "#/components/schemas/FulfilmentInfo"
+   #-------Definition of concrete IOCs ----------#  
 
    #-------Definition of the IntentExpectation dataType ----------#    
     IntentExpectation:
@@ -138,7 +157,7 @@ components:
         objectType:
           type: string
           enum:
-            - RAN_SubNetwrok  #value for Radio Network Expectation--#
+            - RAN_SubNetwork  #value for Radio Network Expectation--#
             - Service_Support  #value for Service Support Expectation--#
             - TBD    #-This will be added based on defined scenario specfic intent expectation-#
         objectInstance:
@@ -155,7 +174,7 @@ components:
         objectType:
           type: string
           enum:
-            - RAN_SubNetwrok  #value for Radio Network Expectation--#
+            - RAN_SubNetwork  #value for Radio Network Expectation--#
         objectInstance:
           $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn"
         objectContexts:
@@ -195,10 +214,11 @@ components:
     Condition:
       type: string
       enum:
-        - Is_equal_to
-        - Is_less_than
-        - Is_greater_than
-        - Is_within_the_range
+        - IS_EQUAL_TO
+        - IS_LESS_THAN
+        - IS_GREATER_THAN
+        - IS_WITHIN_RANGE
+        - IS_OUTSIDE_RANGE
     FulfilStatus:
       type: string
       enum:
@@ -288,7 +308,7 @@ components:
         targetCondition:
           type: string
           enum:
-            - Is_less_than
+            - IS_LESS_THAN
         targetValueRange:
           type: integer
           minimum: 0
@@ -309,7 +329,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - Is_less_than
+            - IS_LESS_THAN
         contextValueRange:
           type: number
     LowSINRRatioTarget:
@@ -324,7 +344,7 @@ components:
         targetCondition:
           type: string
           enum:
-            - Is_less_than
+            - IS_LESS_THAN
         targetValueRange:
           type: integer
           minimum: 0
@@ -345,7 +365,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - Is_less_than
+            - IS_LESS_THAN
         contextValueRange:
           type: integer
     AveULRANUEThptTarget:
@@ -360,7 +380,7 @@ components:
         targetCondition:
           type: string
           enum:
-            - Is_greater_than
+            - IS_GREATER_THAN
         targetValueRange:
           type: integer
         targetFulfilmentInfo:
@@ -377,7 +397,7 @@ components:
         targetCondition:
           type: string
           enum:
-            - Is_greater_than
+            - IS_GREATER_THAN
         targetValueRange:
           type: integer
         targetFulfilmentInfo:
@@ -394,7 +414,7 @@ components:
         targetCondition:
           type: string
           enum:
-            - Is_less_than
+            - IS_LESS_THAN
         targetValueRange:
           type: integer
           minimum: 0
@@ -430,7 +450,7 @@ components:
         targetCondition:
           type: string
           enum:
-            - Is_less_than
+            - IS_LESS_THAN
         targetValueRange:
           type: integer
           minimum: 0
@@ -451,7 +471,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - Is_less_than
+            - IS_LESS_THAN
         contextValueRange:
           type: number
     DLThptPerUETarget:
@@ -466,7 +486,7 @@ components:
         targetCondition:
           type: string
           enum:
-            - Is_greater_than
+            - IS_GREATER_THAN
         targetValueRange:
           $ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt"
     ULThptPerUETarget:
@@ -481,7 +501,7 @@ components:
         targetCondition:
           type: string
           enum:
-            - Is_greater_than
+            - IS_GREATER_THAN
         targetValueRange:
           $ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt"
     DLLatencyTarget:
@@ -496,7 +516,7 @@ components:
         targetCondition:
           type: string
           enum:
-            - Is_less_than
+            - IS_LESS_THAN
         targetValueRange:
           type: integer
     ULLatencyTarget:
@@ -511,7 +531,7 @@ components:
         targetCondition:
           type: string
           enum:
-            - Is_less_than
+            - IS_LESS_THAN
         targetValueRange:
           type: integer
     MaxNumberofUEsTarget:
@@ -526,7 +546,7 @@ components:
         targetCondition:
           type: string
           enum:
-            - Is_less _than
+            - IS_LESS_THAN
         targetValueRange:
           type: integer
     ActivityFactorTarget:
@@ -541,7 +561,7 @@ components:
         targetCondition:
           type: string
           enum:
-            - Is_equal _than
+            - IS_EQUAL_TO
         targetValueRange:
           type: integer
     UESpeedTarget:
@@ -556,7 +576,7 @@ components:
         targetCondition:
           type: string
           enum:
-            - Is_less _than
+            - IS_LESS_THAN
         targetValueRange:
           type: integer
    #-------Definition of the concrete ExpectationTarget  dataType----------#  
@@ -587,7 +607,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - Is_within_the_range
+            - IS_WITHIN_RANGE
         contextValueRange:
           type: array
           items:
@@ -606,7 +626,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - Is_within_the_range
+            - IS_WITHIN_RANGE
         contextValueRange:
           type: array
           items:
@@ -623,7 +643,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - Is_within_the_range
+            - IS_WITHIN_RANGE
         contextValueRange:
           type: array
           items:
@@ -640,7 +660,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - Is_within_the_range
+            - IS_WITHIN_RANGE
         contextValueRange:
           type: array
           items:
@@ -657,7 +677,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - Is_within_the_range
+            - IS_WITHIN_RANGE
         contextValueRange:
           type: array
           items:
@@ -678,7 +698,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - Is_equal_than
+            - IS_EQUAL_TO
         contextValueRange:
           type: array
           items:
@@ -695,7 +715,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - Is_equal_than
+            - IS_EQUAL_TO
         contextValueRange:
           type: array
           items:
@@ -712,7 +732,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - Is_within_the_range
+            - IS_WITHIN_RANGE
         contextValueRange:
           type: array
           items:
@@ -747,7 +767,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - Is_equal_than
+            - IS_EQUAL_TO
         contextValueRange:
           type: string
     ServiceEndTimeContext:
@@ -762,7 +782,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - Is_equal_than
+            - IS_EQUAL_TO
         contextValueRange:
           type: string
     UEMobilityLevelContext:
@@ -777,7 +797,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - Is_within_the_range
+            - IS_WITHIN_RANGE
         contextValueRange:
           type: array
           items:
@@ -794,7 +814,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - Is_within_the_range
+            - IS_WITHIN_RANGE
         contextValueRange:
           type: array
           items:
@@ -803,6 +823,11 @@ components:
 
    
    #------Definition of JSON arrays for name-contained IOCs ---------------#
+
+    SubNetwork-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/SubNetwork-Single'
                                 
     Intent-Multiple:
       type: array
@@ -813,5 +838,6 @@ components:
    #----- Definitions in TS 28.312 for TS 28.532 --------------------------#
     resources-intentNrm:
       oneOf:
+       - $ref: '#/components/schemas/SubNetwork-Single'
        - $ref: '#/components/schemas/Intent-Single'
    #----- Definitions in TS 28.312 for TS 28.532 --------------------------#
diff --git a/OpenAPI/TS28532_FaultMnS.yaml b/OpenAPI/TS28532_FaultMnS.yaml
index ff66bf0043095d1d57465068342558bba5b52b88..62d44a536f1a003bed4be8186f5229b57a478faf 100755
--- a/OpenAPI/TS28532_FaultMnS.yaml
+++ b/OpenAPI/TS28532_FaultMnS.yaml
@@ -1,10 +1,10 @@
 openapi: 3.0.1
 info:
   title: Fault Supervision MnS
-  version: 17.1.0
+  version: 17.2.0
   description: >-
     OAS 3.0.1 definition of the Fault Supervision MnS
-    © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
   description: 3GPP TS 28.532; Generic management services
@@ -546,9 +546,7 @@ components:
         observedMeasurement:
           type: string
         observedValue:
-          oneOf:
-            - type: integer
-            - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float'
+          type: number
         thresholdLevel:
           $ref: '#/components/schemas/ThresholdLevelInd'
         armTime:
diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml
index c531829770230566402fc94297431f7dbecccf40..959349fdcad51794a629f4c659484aa7c64802fd 100755
--- a/OpenAPI/TS28532_ProvMnS.yaml
+++ b/OpenAPI/TS28532_ProvMnS.yaml
@@ -1,10 +1,10 @@
 openapi: 3.0.1
 info:
   title: Provisioning MnS
-  version: 17.1.0
+  version: 17.2.0
   description: >-
     OAS 3.0.1 definition of the Provisioning MnS
-    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
   description: 3GPP TS 28.532; Generic management services
@@ -237,6 +237,14 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Resource'
+            application/vnd.3gpp.object-tree-hierarchical+json:
+              schema:
+                $ref: '#/components/schemas/Resource'
+            application/vnd.3gpp.object-tree-flat+json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/Resource'
         default:
           description: Error case.
           content:
@@ -269,12 +277,12 @@ paths:
             schema:
               type: array
               items:
-                type: object
+                $ref: '#/components/schemas/PatchItem'
           application/3gpp-json-patch+json:
             schema:
               type: array
               items:
-                type: object
+                $ref: '#/components/schemas/PatchItem'
       responses:
         '200':
           description: >-
@@ -301,52 +309,16 @@ paths:
               schema:
                 $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse'
     delete:
-      summary: Deletes one or multiple resources
+      summary: Deletes one resource
       description: >-
-        With HTTP DELETE resources are deleted. The resources to be deleted are
+        With HTTP DELETE one resource is deleted. The resources to be deleted is
         identified with the target URI.
-      parameters:
-        - name: scope
-          in: query
-          description: >-
-            This parameter extends the set of targeted resources beyond the base
-            resource identified with the path component of the URI. No scoping
-            mechanism is specified in the present document.
-          required: false
-          schema:
-            $ref: '#/components/schemas/Scope'
-          style: form
-          explode: true
-        - name: filter
-          in: query
-          description: >-
-            This parameter reduces the targeted set of resources by applying a
-            filter to the scoped set of resource representations. Only resources
-            representations for which the filter construct evaluates to "true"
-            are returned. No filter language is specified in the present
-            document.
-          required: false
-          schema:
-            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter'
       responses:
         '200':
           description: >-
             Success case ("200 OK").
-            This status code shall be returned, when query parameters are present in
-            the request and one or multiple resources are deleted.
-            The URIs of the deleted resources are returned in the response message body.
-        '204':
-          description: >-
-            Success case ("204 No Content").
-            This status code shall be returned, when no query parameters are present in
-            the request and only one resource is deleted.
-            The message body is empty.
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
+            This status code is returned, when the resource has been successfully deleted.
+            The response body is empty.
         default:
           description: Error case.
           content:
@@ -355,18 +327,6 @@ paths:
                 $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse'
 components:
   schemas:
-    CorrelatedNotification:
-      type: object
-      properties:
-        source:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
-        notificationIds:
-          type: array
-          items:
-            $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationId'
-      required:
-        - source
-        - notificationIds
     CmNotificationTypes:
       type: string
       enum:
@@ -381,27 +341,33 @@ components:
         - MANAGEMENT_OPERATION
         - SON_OPERATION
         - UNKNOWN
+    ScopeType:
+      type: string
+      enum:
+        - BASE_ONLY
+        - BASE_NTH_LEVEL
+        - BASE_SUBTREE
+        - BASE_ALL
     Operation:
       type: string
       enum:
         - add
         - remove
         - replace
-    ScopeType:
+    Insert:
       type: string
       enum:
-        - BASE_ONLY
-        - BASE_NTH_LEVEL
-        - BASE_SUBTREE
-        - BASE_ALL
-    Scope:
-      type: object
-      properties:
-        scopeType:
-          $ref: '#/components/schemas/ScopeType'
-        scopeLevel:
-          type: integer
-
+        - before
+        - after
+    PatchOperation:
+      type: string
+      enum:
+        - add
+        - replace
+        - remove
+        - copy
+        - move
+        - test
 
     Resource:
       oneOf:
@@ -430,7 +396,25 @@ components:
             - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/resources-intentNrm'
             - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/resources-mdaNrm'
             - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/resources-AiMlNrm'                           
-
+    Scope:
+      type: object
+      properties:
+        scopeType:
+          $ref: '#/components/schemas/ScopeType'
+        scopeLevel:
+          type: integer
+    CorrelatedNotification:
+      type: object
+      properties:
+        source:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+        notificationIds:
+          type: array
+          items:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationId'
+      required:
+        - source
+        - notificationIds
     MoiChange:
       type: object
       properties:
@@ -448,13 +432,14 @@ components:
           $ref: '#/components/schemas/Operation'
         path:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
+        insert:
+          $ref: '#/components/schemas/Insert'
         value: {}
         oldValue: {}
       required:
         - notificationId
         - op
         - path
-
     NotifyMoiCreation:
       allOf:
         - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader'
@@ -513,3 +498,13 @@ components:
                 $ref: '#/components/schemas/MoiChange'
           required:
             - moiChanges
+    PatchItem:
+      type: object
+      properties:
+        op:
+          $ref: '#/components/schemas/PatchOperation'
+        from:
+          type: string
+        path:
+          type: string
+        value: {}
diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index 419f054dbc87035322848c808b7155395d11ff14..d5b7e5189767279e204e206b59b4f144e96437cf 100755
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -1,10 +1,10 @@
 openapi: 3.0.1
 info:
   title: NR NRM
-  version: 17.7.0
+  version: 17.8.0
   description: >-
     OAS 3.0.1 specification of the NR NRM
-    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
   description: 3GPP TS 28.541; 5G NRM, NR NRM
@@ -823,16 +823,18 @@ components:
                       $ref: '#/components/schemas/GnbName'
                     plmnId:
                       $ref: '#/components/schemas/PlmnId'
-                    x2BlackList:
+                    x2BlockList:
                       $ref: '#/components/schemas/GGnbIdList'
-                    xnBlackList:
+                    xnBlockList:
                       $ref: '#/components/schemas/GGnbIdList'
-                    x2WhiteList:
+                    x2AllowList:
                       $ref: '#/components/schemas/GGnbIdList'
-                    xnWhiteList:
+                    xnAllowList:
                       $ref: '#/components/schemas/GGnbIdList'
-                    x2XnHOBlackList:
+                    x2HOBlackList:
                       $ref: '#/components/schemas/GEnbIdList'
+                    xnHOBlackList:
+                      $ref: '#/components/schemas/GGnbIdList'
                     mappingSetIDBackhaulAddress:
                       $ref: '#/components/schemas/MappingSetIDBackhaulAddress'
                     tceMappingInfoList:
diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml
index 48c5ceb8fd116158e39988aeaf4da661759b18b5..c66944fe7d9bba66a8e337927a65cfd4dc702bec 100755
--- a/OpenAPI/TS28541_SliceNrm.yaml
+++ b/OpenAPI/TS28541_SliceNrm.yaml
@@ -1,10 +1,10 @@
 openapi: 3.0.1
 info:
   title: Slice NRM
-  version: 17.7.0
+  version: 17.8.0
   description: >-
     OAS 3.0.1 specification of the Slice NRM
-    @ 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    @ 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
   description: 3GPP TS 28.541; 5G NRM, Slice NRM
@@ -115,7 +115,9 @@ components:
         availability:
           $ref: '#/components/schemas/Support'
         periodicityList:
-          type: string
+          type: array
+          items:
+            type: integer
     XLThpt:
       type: object
       properties:
@@ -145,7 +147,9 @@ components:
         servAttrCom:
           $ref: '#/components/schemas/ServAttrCom'
         kPIList:
-          type: string
+          type: array
+          items:
+            type: string
     NBIoT:
       type: object
       properties:
@@ -511,7 +515,7 @@ components:
             $ref: '#/components/schemas/Positioning'
           userMgmtOpen:
             $ref: '#/components/schemas/UserMgmtOpen'
-          v2XModels:
+          v2XCommModels:
             $ref: '#/components/schemas/V2XCommModels'
           coverageArea:
             type: string
diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml
index b962d1032f47e37769bf31b3709346351b71fd59..bec1fadcfa96fdf73d269433f03482558f3f2474 100755
--- a/OpenAPI/TS28623_ComDefs.yaml
+++ b/OpenAPI/TS28623_ComDefs.yaml
@@ -1,10 +1,10 @@
 openapi: 3.0.1
 info:
   title: Common Type Definitions
-  version: 17.1.0
+  version: 17.2.0
   description: >-
     OAS 3.0.1 specification of common type definitions in the Generic NRM
-    © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
   description: 3GPP TS 28.623; Generic NRM; Common type definitions
@@ -82,11 +82,17 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/GeoCoordinate'
-    GeoAreaToCellMapping:
+      minItems: 3
+    GeoArea:
       type: object
       properties:
         convexGeoPolygon:
           $ref: '#/components/schemas/ConvexGeoPolygon'
+    GeoAreaToCellMapping:
+      type: object
+      properties:
+        convexGeoPolygon:
+          $ref: '#/components/schemas/GeoArea'
         associationThreshold:
           type: integer
     AreaOfInterest:
diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index c9834fd84930ae73a25020ff000b3353d070a8be..6629b061a28552b4f76e68ca525f4bbfd3278a31 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.1.0
+  version: 17.2.0
   description: >-
     OAS 3.0.1 definition of the Generic NRM
     © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -1416,6 +1416,34 @@ 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:
+      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
+      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
 
 #-------- end of Definition of types used in Trace control NRM fragment ----------
 
@@ -1692,6 +1720,8 @@ components:
           $ref: '#/components/schemas/sensorInformation-Type'
         traceCollectionEntityId:
           $ref: '#/components/schemas/traceCollectionEntityId-Type'
+        excessPacketDelayThresholds:
+          $ref: '#/components/schemas/excessPacketDelayThresholds-Type'
 
     ManagedFunction-ncO:
       type: object
@@ -1911,7 +1941,7 @@ components:
                 collectionTimeWindow:
                   $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'
                 reportingCtrl:
-                  type: string
+                  $ref: '#/components/schemas/ReportingCtrl'
                 dataScope:
                   type: string
                   enum: