diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml
index 8025144d8fb0c7568abf8afd5236d93752517ad2..537d212d6737987bd18457f9071994b88a5179d4 100644
--- a/OpenAPI/5gcNrm.yaml
+++ b/OpenAPI/5gcNrm.yaml
@@ -541,7 +541,7 @@ components:
                       $ref: '#/components/schemas/WeightFactor'
                     snssaiList:
                       $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'
-                    amfSet:
+                    amfSetRef:
                       $ref: 'comDefs.yaml#/components/schemas/Dn'
                     managedNFProfile:
                       $ref: '#/components/schemas/ManagedNFProfile'
@@ -592,6 +592,10 @@ components:
                       $ref: '#/components/schemas/AmfSetId'
                     snssaiList:
                       $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'
+                    aMFRegionRef:
+                      $ref: 'comDefs.yaml#/components/schemas/Dn'
+                    aMFSetMemberList:
+                      $ref: 'comDefs.yaml#/components/schemas/DnList'
     AmfRegion-Single:
       allOf:
         - $ref: 'genericNrm.yaml#/components/schemas/Top'
@@ -610,6 +614,8 @@ components:
                       $ref: '#/components/schemas/AmfRegionId'
                     snssaiList:
                       $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'
+                    aMFSetListRef:
+                      $ref: 'comDefs.yaml#/components/schemas/DnList'
     SmfFunction-Single:
       allOf:
         - $ref: 'genericNrm.yaml#/components/schemas/Top'
diff --git a/OpenAPI/faultMnS.yaml b/OpenAPI/faultMnS.yaml
index 7ccf280316105211430bac566fafcfbf320c3e32..203b424b99e1a4d846f18fb32245353e4ca5451d 100644
--- a/OpenAPI/faultMnS.yaml
+++ b/OpenAPI/faultMnS.yaml
@@ -1,10 +1,10 @@
 openapi: 3.0.1
 info:
   title: Fault Supervision MnS
-  version: 16.6.0
+  version: 16.10.0
   description: >-
     OAS 3.0.1 definition of the Fault Supervision MnS
-    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
   description: 3GPP TS 28.532; Generic management services
@@ -660,7 +660,7 @@ components:
         - notifyCorrelatedNotificationChanged
         - notifyComments
         - notifyClearedAlarm
-        - notifyAlarmListRebuiltAlarm
+        - notifyAlarmListRebuilt
         - notifyPotentialFaultyAlarmList
     AlarmListAlignmentRequirement:
       type: string
diff --git a/OpenAPI/fileDataReportingMnS.yaml b/OpenAPI/fileDataReportingMnS.yaml
index 66bf53764acef60c0a5aa796d3a4e60b70dd4b4b..e9f6c71b8194c643c3c4aebddd81414d9d2f9dab 100644
--- a/OpenAPI/fileDataReportingMnS.yaml
+++ b/OpenAPI/fileDataReportingMnS.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: File Data Reporting MnS
-  version: 16.8.0
+  version: 16.10.0
   description: >-
     OAS 3.0.1 definition of the File Data Reporting MnS
     © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -13,7 +13,7 @@ servers:
   - url: '{MnSRoot}/fileDataReportingMnS/{MnSVersion}'
     variables:
       MnSRoot:
-        description: See clause 4.4.2 of TS 32.158
+        description: See clause 4.4.3 of TS 32.158
         default: http://example.com/3GPPManagement
       MnSVersion:
         description: Version number of the OpenAPI definition
diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml
index 5bfacad52169f02f7d69e4afbfc8f00ff5634c73..400314b4582415ab24e2823ba0efb5d48e0d6f2d 100644
--- a/OpenAPI/genericNrm.yaml
+++ b/OpenAPI/genericNrm.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: Generic NRM
-  version: 16.9.0
+  version: 16.10.0
   description: >-
     OAS 3.0.1 definition of the Generic NRM
     © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -409,6 +409,9 @@ components:
               - S6d
               - S6a
               - Sh
+              - N70
+              - N71
+              - NU1
         EIRInterfaces:
           type: array
           items:
@@ -551,6 +554,7 @@ components:
               - N10
               - N13
               - N21
+              - NU1
         UPFInterfaces:
           type: array
           items:
@@ -615,6 +619,8 @@ components:
           - UPF
           - AUSF
           - SMSF
+          - HSS
+          - UDM
 
     tjPLMNTarget-Type:
       type: object
diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml
index ef221ec580ac492dff66554a87b35bad54674fe9..a850d5f9177341e699c6fc53fd8596e7acf7711e 100644
--- a/OpenAPI/nrNrm.yaml
+++ b/OpenAPI/nrNrm.yaml
@@ -65,7 +65,7 @@ components:
     PlmnInfo:
       type: object
       properties:
-        plmnId":
+        plmnId:
           $ref: '#/components/schemas/PlmnId'
         snssai:
           $ref: '#/components/schemas/Snssai'
diff --git a/OpenAPI/streamingDataMnS.yaml b/OpenAPI/streamingDataMnS.yaml
index 4c88723535dcfddd9835f859a3cce6975c427fe1..abbf1271f3365b41e0780eae0f86c88dfce3545f 100644
--- a/OpenAPI/streamingDataMnS.yaml
+++ b/OpenAPI/streamingDataMnS.yaml
@@ -1,17 +1,17 @@
 openapi: 3.0.1
 info:
   title: TS 28.532 Streaming data reporting service
-  version: 16.6.0
+  version: 16.10.0
   description: OAS 3.0.1 specification for the Streaming data reporting service (Streaming MnS)
 servers:
-  - url: '{MnSRoot}/StreamingDataReportingMnS/{version}'
+  - url: '{MnSRoot}/StreamingDataReportingMnS/{MnSVersion}'
     variables:
       MnSRoot:
-        description: See subclause 4.4 of TS 32.158.
+        description: See clause 4.4.3 of TS 32.158.
         default: https://example.com/3GPPManagement
-      version:
-        description: Indicates the current version of the specification
-        default: 16.5.0
+      MnSVersion:
+        description: See clause 4.4.3 of TS 32.158.
+        default: ''
 paths:
   '/connections':
     post: