diff --git a/OpenAPI/.project b/OpenAPI/.project
deleted file mode 100644
index bf4347b4e1655d3dd265996af78ad6755cc3838e..0000000000000000000000000000000000000000
--- a/OpenAPI/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>OpenAPI</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml
index 9afbd454f852d751f8db5a45a5675c0a8a4e8a2e..eb40832285954072e002507652e690464f299b14 100644
--- a/OpenAPI/5gcNrm.yaml
+++ b/OpenAPI/5gcNrm.yaml
@@ -223,7 +223,7 @@ components:
         commModelType:
           $ref: '#/components/schemas/CommModelType'
         targetNFServiceList:
-          $ref: 'genericNrm.yaml#/components/schemas/DnList'
+          $ref: 'comDefs.yaml#/components/schemas/DnList'
         commModelConfiguration:
           type: string
     CommModelList:
@@ -542,7 +542,7 @@ components:
                     snssaiList:
                       $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'
                     amfSet:
-                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+                      $ref: 'comDefs.yaml#/components/schemas/Dn'
                     managedNFProfile:
                       $ref: '#/components/schemas/ManagedNFProfile'
                     commModelList:
@@ -633,9 +633,9 @@ components:
                     commModelList:
                       $ref: '#/components/schemas/CommModelList'
                     configurable5QISetRef:
-                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+                      $ref: 'comDefs.yaml#/components/schemas/Dn'
                     dynamic5QISetRef:
-                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+                      $ref: 'comDefs.yaml#/components/schemas/Dn'
 
         - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
@@ -736,9 +736,9 @@ components:
                     commModelList:
                       $ref: '#/components/schemas/CommModelList'
                     configurable5QISetRef:
-                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+                      $ref: 'comDefs.yaml#/components/schemas/Dn'
                     dynamic5QISetRef:
-                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+                      $ref: 'comDefs.yaml#/components/schemas/Dn'
 
         - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
@@ -1142,7 +1142,7 @@ components:
                     remoteAddress:
                       $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
                     epTransportRefs:
-                      $ref: 'genericNrm.yaml#/components/schemas/DnList'
+                      $ref: 'comDefs.yaml#/components/schemas/DnList'
     EP_N4-Single:
       allOf:
         - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
diff --git a/OpenAPI/README.md b/OpenAPI/README.md
index e608aecebb523b5d147add1d5a4bb59f192d7be0..5e2f09862890b1b53397c55a709c5faa7659cc72 100644
--- a/OpenAPI/README.md
+++ b/OpenAPI/README.md
@@ -45,14 +45,6 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f
 ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/PerfMnS.yaml))
 ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/PerfMnS.yaml))
 
-* Performance Measurement Job Control MnS (28.550)
-([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/PerMeasJobCtlMnS.yaml))
-([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/PerMeasJobCtlMnS.yaml))
-
-* Performance Threshold Monitoring MnS (TS 28.532)
-([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/PerThresMonMnS.yaml))
-([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/PerThresMonMnS.yaml))
-
 * Heartbeat Notifications(TS 28.532)
 ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/heartbeatNtf.yaml))
 ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/heartbeatNtf.yaml))
diff --git a/OpenAPI/coslaNrm.yaml b/OpenAPI/coslaNrm.yaml
index 1892b8fb3ee95d82109a62a4c8689a1c706fab0b..f25d579760547bd24dbc0cd2195c46e64ed420ed 100644
--- a/OpenAPI/coslaNrm.yaml
+++ b/OpenAPI/coslaNrm.yaml
@@ -1,4 +1,4 @@
-openapi: 3.0.3
+openapi: 3.0.2
 
 info:
   title: coslaNrm
@@ -9,7 +9,7 @@ info:
     All rights reserved.
 
 externalDocs:
-  description: 3GPP TS 28.536 V16.4.0; 5G NRM, Slice NRM
+  description: 3GPP TS 28.536 V16.4.0; Cosla NRM
   url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.536/
 
 paths: {}
@@ -21,111 +21,132 @@ components:
 #------------ Type definitions ---------------------------------------------------
 
     ControlLoopLifeCyclePhase:
-      anyOf: 
-        - type: string
-          enum:
-            - PREPARATION
-            - COMMISSIONING
-            - OPERATION
-            - DECOMMISSIONING
-        - type: string
-
-    TimeUnit:
-      anyOf:
-        - type: string
-          enum:
-            - SECOND
-            - MINUTE
-            - HOUR
-            - DAY
-        - type: string
-
-    OperationalState:
-      anyOf:
-        - type: string
-          enum: 
-            - ENABLED
-            - DISABLED
-        - type: string
-
-    AdministrativeState:
-      anyOf:
-        - type: string
-          enum: 
-            - LOCKED
-            - SHUTTING_DOWN
-            - UNLOCKED
-        - type: string
+      type: string
+      enum:
+        - PREPARATION
+        - COMMISSIONING
+        - OPERATION
+        - DECOMMISSIONING
 
     ObservationTime:
       type: integer
 
-    ObservationTimePeriod:
-      type: object
-      
-    AssuranceControlLoopGoal:
-      type: object
-      
-    AssuranceGoalStatus:
-      type: object
-      
     AssuranceGoalStatusObserved:
-      type: object
-    
+      type: string
+      enum:
+        - FULFILLED
+        - NOT_FULFILLED
+
     AssuranceGoalStatusPredicted:
+      type: string
+      enum:
+        - FULFILLED
+        - NOT_FULFILLED
+
+    AssuranceTarget:
       type: object
+      properties:
+        assuranceTargetName:
+          type: string
+        assuranceTargetValue:
+          type: string
+         
+    AssuranceTargetList:
+      type: array
+      items:
+         $ref: '#/components/schemas/AssuranceTarget'
+
 
 #-------- Definition of concrete IOCs --------------------------------------------
 
-    AssuranceControlLoop-Single:
+    SubNetwork-Single:
+      allOf:
+        - $ref: 'genericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              allOf:
+                - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO'
+        - type: object
+          properties:
+            AssuranceClosedControlLoop:
+              $ref: '#/components/schemas/AssuranceClosedControlLoop-Multiple'
+ 
+    ManagedElement-Single:
+      allOf:
+        - $ref: 'genericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              allOf:
+                - $ref: 'genericNrm.yaml#/components/schemas/ManagedElement-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/ManagedElement-ncO'
+        - type: object
+          properties:
+            AssuranceClosedControlLoop:
+              $ref: '#/components/schemas/AssuranceClosedControlLoop-Multiple'
+
+    AssuranceClosedControlLoop-Single:
       allOf:
-        - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-Attr'
+        - $ref: 'genericNrm.yaml#/components/schemas/Top'
         - type: object
           properties:
-            operationalState:
-              $ref: '#/components/schemas/OperationalState'
-            administrativeState:
-              $ref: '#/components/schemas/AdministrativeState'
-            controlLoopLifeCyclePhase:
-              $ref: '#/components/schemas/ControlLoopLifeCyclePhase'
-            observationTimePeriod:
+            attributes:
+              type: object
+              properties:
+                    operationalState:
+                      $ref: 'comDefs.yaml#/components/schemas/OperationalState'
+                    administrativeState:
+                      $ref: 'comDefs.yaml#/components/schemas/AdministrativeState'
+                    controlLoopLifeCyclePhase:
+                      $ref: '#/components/schemas/ControlLoopLifeCyclePhase'
+            AssuranceGoal:
+              $ref: '#/components/schemas/AssuranceGoal-Multiple'
+
+    AssuranceGoal-Single:
+      allOf:
+        - $ref: 'genericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
               allOf:
-                - $ref: '#/components/schemas/ObservationTimePeriod'
                 - type: object
                   properties:
                     observationTime:
                       $ref: '#/components/schemas/ObservationTime'
-                    timeUnit:
-                      $ref: '#/components/schemas/TimeUnit'    
-            AssuranceGoalStatus:
-              allOf:
-                - $ref: '#/components/schemas/AssuranceGoalStatus'
-                - type: object
-                  properties:
+                    assuranceTargetList:
+                      $ref: '#/components/schemas/AssuranceTargetList'
                     assuranceGoalStatusObserved:
                       $ref: '#/components/schemas/AssuranceGoalStatusObserved'
                     assuranceGoalStatusPredicted:
                       $ref: '#/components/schemas/AssuranceGoalStatusPredicted'
-            managedEntity-Multiple:
-              $ref: '#/components/schemas/ManagedEntity-Multiple'
-            assuranceControlLoopGoal:
-              $ref: '#/components/schemas/AssuranceControlLoopGoal'
-
-    ManagedEntity-Single:
-      oneOf:
-        - $ref: 'sliceNrm.yaml#/components/schemas/NetworkSlice'
-        - $ref: 'sliceNrm.yaml#/components/schemas/NetworkSliceSubnet'
-        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
-        - $ref: 'genericNrm.yaml#/components/schemas/ManagedElement-Attr'
-          
+                    serviceProfileId:
+                      type: string
+                    sliceProfileId:
+                      type: string
+                    networkSliceRef:
+                      $ref: 'comDefs.yaml#/components/schemas/Dn'
+                    networkSliceSubnetRef:
+                      $ref: 'comDefs.yaml#/components/schemas/Dn' 
+                      
 #-------- Definition of JSON arrays for name-contained IOCs ----------------------
                                 
-    AssuranceControlLoop-Multiple:
+    AssuranceClosedControlLoop-Multiple:
       type: array
       items:
-        $ref: '#/components/schemas/AssuranceControlLoop-Single'                 
-
-    ManagedEntity-Multiple:
+        $ref: '#/components/schemas/AssuranceClosedControlLoop-Single'                 
+               
+    AssuranceGoal-Multiple:
       type: array
       items:
-        $ref: '#/components/schemas/ManagedEntity-Single'      
+        $ref: '#/components/schemas/AssuranceGoal-Single'   
+
+#------------ Definitions in TS 28.536 for TS 28.623 ----------------------------- 
+
+    resources-coslaNrm:
+      oneOf:
+       - $ref: '#/components/schemas/AssuranceClosedControlLoop-Single'
+       - $ref: '#/components/schemas/AssuranceGoal-Single'    
+       - $ref: '#/components/schemas/SubNetwork-Single'
+       - $ref: '#/components/schemas/ManagedElement-Single'
diff --git a/OpenAPI/faultMnS.yaml b/OpenAPI/faultMnS.yaml
index a6a2da4c211ab489e4f74c19874fcc13938aedcf..7ccf280316105211430bac566fafcfbf320c3e32 100644
--- a/OpenAPI/faultMnS.yaml
+++ b/OpenAPI/faultMnS.yaml
@@ -566,8 +566,8 @@ components:
           items:
             $ref: 'comDefs.yaml#/components/schemas/NotificationId'
       required:
-        - source
-        - notificationId
+        - sourceObjectInstance
+        - notificationIds
     CorrelatedNotifications:
       type: array
       items:
diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml
index bcdc00cdc25aaf7b1a7373e9f59a0cf565c0a195..aedf3c4fb858678d3cc381bf779f3f2b868f96a0 100644
--- a/OpenAPI/genericNrm.yaml
+++ b/OpenAPI/genericNrm.yaml
@@ -180,7 +180,7 @@ components:
             enum:
              - FILE_BASED_LOC_SET_BY_PRODUCER
              - FILE_BASED_LOC_SET_BY_CONSUMER
-             - STREAM_BASED	
+             - STREAM_BASED 
         monitorGranularityPeriods:
           type: array
           items:
@@ -634,7 +634,7 @@ components:
         - FILE-BASED
         - STREAMING
 
-	tjTraceTarget-Type:
+    tjTraceTarget-Type:
       type: object
       description: Trace target conveying both the type and value of the target ID. For additional details see 3GPP TS 32.422
       properties:
@@ -1212,7 +1212,7 @@ components:
           $ref: '#/components/schemas/tjMDTCollectionPeriodRrmLte-Type'
         tjMDTCollectionPeriodRrmUmts:
           $ref: '#/components/schemas/tjMDTCollectionPeriodRrmUmts-Type'
-		tjMDTCollectionPeriodRrmNR:
+        tjMDTCollectionPeriodRrmNR:
           $ref: '#/components/schemas/tjMDTCollectionPeriodRrmNR-Type'
         tjMDTEventListForTriggeredMeasurement:
           $ref: '#/components/schemas/tjMDTEventListForTriggeredMeasurement-Type'
diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml
index 62b81c4db47fe6290829b0a5e098bb99e23bcdf8..3de2c63a6c7db79edfac3aac6f73fa191d953fb4 100644
--- a/OpenAPI/nrNrm.yaml
+++ b/OpenAPI/nrNrm.yaml
@@ -55,7 +55,7 @@ components:
       type: object
       properties:
         mcc:
-          $ref: 'genericNrm.yaml#/components/schemas/Mcc'
+          $ref: 'comDefs.yaml#/components/schemas/Mcc'
         mnc:
           $ref: '#/components/schemas/Mnc'
     PlmnIdList:
@@ -711,9 +711,9 @@ components:
                     plmnInfoList:
                       $ref: '#/components/schemas/PlmnInfoList'
                     configurable5QISetRef:
-                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+                      $ref: 'comDefs.yaml#/components/schemas/Dn'
                     dynamic5QISetRef:
-                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+                      $ref: 'comDefs.yaml#/components/schemas/Dn'
         - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
@@ -764,9 +764,9 @@ components:
                     tceMappingInfoList:
                       $ref: '#/components/schemas/TceMappingInfoList'
                     configurable5QISetRef:
-                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+                      $ref: 'comDefs.yaml#/components/schemas/Dn'
                     dynamic5QISetRef:
-                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+                      $ref: 'comDefs.yaml#/components/schemas/Dn'
         - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
@@ -806,7 +806,7 @@ components:
                     plmnInfoList:
                       $ref: '#/components/schemas/PlmnInfoList'
                     nRFrequencyRef:
-                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+                      $ref: 'comDefs.yaml#/components/schemas/Dn'
         - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
@@ -840,9 +840,9 @@ components:
                 - type: object
                   properties:
                     administrativeState:
-                      $ref: 'genericNrm.yaml#/components/schemas/AdministrativeState'
+                      $ref: 'comDefs.yaml#/components/schemas/AdministrativeState'
                     operationalState:
-                      $ref: 'genericNrm.yaml#/components/schemas/OperationalState'
+                      $ref: 'comDefs.yaml#/components/schemas/OperationalState'
                     cellLocalId:
                       type: integer
                     cellState:
@@ -882,17 +882,17 @@ components:
                     nrSectorCarrierRef:
                       type: array
                       items:
-                        $ref: 'genericNrm.yaml#/components/schemas/Dn'
+                        $ref: 'comDefs.yaml#/components/schemas/Dn'
                     bwpRef:
                       type: array
                       items:
-                        $ref: 'genericNrm.yaml#/components/schemas/Dn'
+                        $ref: 'comDefs.yaml#/components/schemas/Dn'
                     nRFrequencyRef:
-                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+                      $ref: 'comDefs.yaml#/components/schemas/Dn'
                     victimSetRef:
-                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+                      $ref: 'comDefs.yaml#/components/schemas/Dn'
                     aggressorSetRef:
-                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+                      $ref: 'comDefs.yaml#/components/schemas/Dn'
         - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
@@ -961,7 +961,7 @@ components:
                     bSChannelBwUL:
                       type: integer
                     sectorEquipmentFunctionRef:
-                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+                      $ref: 'comDefs.yaml#/components/schemas/Dn'
         - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
@@ -1070,9 +1070,9 @@ components:
                     cellIndividualOffset:
                       $ref: '#/components/schemas/CellIndividualOffset'
                     adjacentNRCellRef:
-                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+                      $ref: 'comDefs.yaml#/components/schemas/Dn'
                     nRFrequencyRef:
-                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+                      $ref: 'comDefs.yaml#/components/schemas/Dn'
                     isRemoveAllowed:
                       type: boolean
                     isHOAllowed:
@@ -1092,7 +1092,7 @@ components:
                 - type: object
                   properties:
                     adjacentEUtranCellRef:
-                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+                      $ref: 'comDefs.yaml#/components/schemas/Dn'
         - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
     NRFreqRelation-Single:
       allOf:
@@ -1156,7 +1156,7 @@ components:
                     tReselectionNRSfMedium:
                       $ref: '#/components/schemas/TReselectionNRSf'
                     nRFrequencyRef:
-                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+                      $ref: 'comDefs.yaml#/components/schemas/Dn'
     EUtranFreqRelation-Single:
       allOf:
         - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
@@ -1219,7 +1219,7 @@ components:
                     tReselectionNRSfMedium:
                       $ref: '#/components/schemas/TReselectionNRSf'
                     eUTranFrequencyRef:
-                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+                      $ref: 'comDefs.yaml#/components/schemas/Dn'
     DANRManagementFunction-Single:
       allOf:
         - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
@@ -1392,7 +1392,7 @@ components:
                 rimRSMonitoringOccasionStartingOffset:
                   type: integer
                 nRCellDURefs:
-                  $ref: 'genericNrm.yaml#/components/schemas/DnList'
+                  $ref: 'comDefs.yaml#/components/schemas/DnList'
 
     ExternalGnbDuFunction-Single:
       allOf:
@@ -1483,7 +1483,7 @@ components:
                     plmnIdList:
                       $ref: '#/components/schemas/PlmnIdList'
                     nRFrequencyRef:
-                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+                      $ref: 'comDefs.yaml#/components/schemas/Dn'
         - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
     ExternalENBFunction-Single:
       allOf:
@@ -1513,7 +1513,7 @@ components:
                 - type: object
                   properties:
                     EUtranFrequencyRef:
-                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+                      $ref: 'comDefs.yaml#/components/schemas/Dn'
         - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
 
     EP_XnC-Single:
@@ -1629,7 +1629,7 @@ components:
                     remoteAddress:
                       $ref: '#/components/schemas/RemoteAddress'
                     epTransportRefs:
-                      $ref: 'genericNrm.yaml#/components/schemas/DnList'
+                      $ref: 'comDefs.yaml#/components/schemas/DnList'
 
     EP_X2U-Single:
       allOf:
@@ -1865,3 +1865,4 @@ components:
         - $ref: '#/components/schemas/EP_NgU-Single'
         - $ref: '#/components/schemas/EP_X2U-Single'
         - $ref: '#/components/schemas/EP_S1U-Single'
+ 
diff --git a/OpenAPI/provMnS.yaml b/OpenAPI/provMnS.yaml
index 20691fc37fe31ae2a043da672b4257b0553374d0..1dd467e16a8bf2d06bd2b635644252e20504d5fc 100644
--- a/OpenAPI/provMnS.yaml
+++ b/OpenAPI/provMnS.yaml
@@ -167,7 +167,7 @@ paths:
                   content:
                     application/json:
                       schema:
-                        $ref: 'comDefs.yaml#/components/schemas/Error-Response'
+                        $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
     get:
       summary: Reads one or multiple resources
       description: >-
@@ -296,7 +296,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: 'comDefsy.yaml#/components/schemas/ErrorResponse'
+                $ref: 'comDefs.yaml#/components/schemas/ErrorResponse'
     delete:
       summary: Deletes one or multiple resources
       description: >-
@@ -363,7 +363,7 @@ components:
             $ref: 'comDefs.yaml#/components/schemas/NotificationId'
       required:
         - source
-        - notificatioIds
+        - notificationIds
     CmNotificationTypes:
       type: string
       enum:
@@ -486,7 +486,7 @@ components:
             attributeListValueChanges:
               $ref: 'comDefs.yaml#/components/schemas/AttributeValueChangeSet'
           required:
-            - attributeValueChange
+            - attributeListValueChanges
     NotifyMoiChanges:
       allOf:
         - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader'
diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml
index 04b260c070d34d3b5637ca8f9cbb4da4cc659682..1fa8d70ff3068eef6e42bd9c66f83f941791fded 100644
--- a/OpenAPI/sliceNrm.yaml
+++ b/OpenAPI/sliceNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: Slice NRM
-  version: 16.5.0
+  version: 16.8.0
   description: >-
     OAS 3.0.1 specification of the Slice NRM
     @ 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -30,6 +30,11 @@ components:
       enum:
         - SHARED
         - NON-SHARED
+    NetworkSliceSharingIndicator:
+      type: string
+      enum:
+        - SHARED
+        - NON-SHARED
     PerfReqEmbb:
       type: object
       properties:
@@ -62,14 +67,7 @@ components:
           type: string
         transferIntervalTarget:
           type: string
-        s      type: array
-      items:
-        type: string
-        enum:
-          - PERFORMANCE
-          - FUNCTION
-          - OPERATION
-urvivalTime:
+        survivalTime:
           type: string
     PerfReqUrllcList:
       type: array
@@ -85,6 +83,14 @@ urvivalTime:
         - CHARACTER
         - SCALABILITY
     Tagging:
+      type: array
+      items:
+        type: string
+        enum:
+          - PERFORMANCE
+          - FUNCTION
+          - OPERATION
+
 
     Exposure:
       type: string
@@ -211,10 +217,8 @@ urvivalTime:
       properties:
           serviceProfileId: 
             type: string
-          snssaiList:
-            $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'
-          plmnIdList:
-            $ref: 'nrNrm.yaml#/components/schemas/PlmnIdList'
+          plmnInfoList:
+            $ref: 'nrNrm.yaml#/components/schemas/PlmnInfoList'
           maxNumberofUEs:
             type: number
           latency:
@@ -223,8 +227,8 @@ urvivalTime:
             $ref: '#/components/schemas/MobilityLevel'
           sst:
             $ref: 'nrNrm.yaml#/components/schemas/Sst'
-          resourceSharingLevel:
-            $ref: '#/components/schemas/SharingLevel'
+          networkSliceSharingIndicator:
+            $ref: '#/components/schemas/NetworkSliceSharingIndicator'
           availability:
             type: number
           delayTolerance:
@@ -269,10 +273,8 @@ urvivalTime:
           sliceProfileId:
             type: string
 
-          snssaiList:
-            $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'
-          plmnIdList:
-            $ref: 'nrNrm.yaml#/components/schemas/PlmnIdList'
+          plmnInfoList:
+            $ref: 'nrNrm.yaml#/components/schemas/PlmnInfoList'
           perfReq:
             $ref: '#/components/schemas/PerfReq'
           maxNumberofUEs:
@@ -319,6 +321,8 @@ urvivalTime:
               $ref: '#/components/schemas/NetworkSlice-Multiple'
             NetworkSliceSubnet:
               $ref: '#/components/schemas/NetworkSliceSubnet-Multiple'
+            EP_Transport:
+              $ref: '#/components/schemas/EP_Transport-Multiple'
 
     NetworkSlice-Single:
       allOf:
@@ -331,11 +335,11 @@ urvivalTime:
                 - type: object
                   properties:
                     networkSliceSubnetRef:
-                      $ref: 'genericNrm.yaml#/components/schemas/Dn'
+                      $ref: 'comDefs.yaml#/components/schemas/Dn'
                     operationalState:
-                      $ref: 'genericNrm.yaml#/components/schemas/OperationalState'
+                      $ref: 'comDefs.yaml#/components/schemas/OperationalState'
                     administrativeState:
-                      $ref: 'genericNrm.yaml#/components/schemas/AdministrativeState'
+                      $ref: 'comDefs.yaml#/components/schemas/AdministrativeState'
                     serviceProfileList:
                       $ref: '#/components/schemas/ServiceProfileList'
 
@@ -350,20 +354,20 @@ urvivalTime:
                 - type: object
                   properties:
                     managedFunctionRefList:
-                      $ref: 'genericNrm.yaml#/components/schemas/DnList'
+                      $ref: 'comDefs.yaml#/components/schemas/DnList'
                     networkSliceSubnetRefList:
-                      $ref: 'genericNrm.yaml#/components/schemas/DnList'
+                      $ref: 'comDefs.yaml#/components/schemas/DnList'
                     operationalState:
-                      $ref: 'genericNrm.yaml#/components/schemas/OperationalState'
+                      $ref: 'comDefs.yaml#/components/schemas/OperationalState'
                     administrativeState:
-                      $ref: 'genericNrm.yaml#/components/schemas/AdministrativeState'
+                      $ref: 'comDefs.yaml#/components/schemas/AdministrativeState'
                     nsInfo:
                       $ref: '#/components/schemas/NsInfo'
                     sliceProfileList:
                       $ref: '#/components/schemas/SliceProfileList'
-            EPTransport:
-             $ref: '#/components/schemas/EP_Transport-Multiple'
-                      
+                    epTransportRefList:
+                      $ref: 'comDefs.yaml#/components/schemas/DnList'
+
     EP_Transport-Single:
       allOf:
         - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
@@ -381,7 +385,7 @@ urvivalTime:
                 qosProfile:
                   type: string 
                 epApplicationRefs:
-                  $ref: 'genericNrm.yaml#/components/schemas/DnList'
+                  $ref: 'comDefs.yaml#/components/schemas/DnList'
                       
 #-------- Definition of JSON arrays for name-contained IOCs ----------------------
     SubNetwork-Multiple: