diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml
index 82031387f92e7b5a1a985d4a895bb530b3aed843..3938719ef007c872ae501ee7bc4374ee18933ecf 100644
--- a/OpenAPI/TS28312_IntentExpectations.yaml
+++ b/OpenAPI/TS28312_IntentExpectations.yaml
@@ -969,7 +969,7 @@ components:
         contextValueRange:
           type: array
           items:
-            $ref: "TS28623_GenericNrm.yaml#/components/schemas/NFType"
+            $ref: "TS28541_5GcNrm.yaml#/components/schemas/NFType"
     NfInstanceLocationContext:          
       description: >-
         This data type is the "ObjectContext" data type with specialisations for NfInstanceLocationContext 
diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml
index 44dc93e1c80245cd60b6bdd8aef483b28055fe5b..fceea8893b8d27767347f648181214cc7a9c9261 100755
--- a/OpenAPI/TS28541_5GcNrm.yaml
+++ b/OpenAPI/TS28541_5GcNrm.yaml
@@ -63,7 +63,7 @@ components:
           type: string
           description: uuid of NF instance
         nFType:
-          $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType'
+          $ref: '#/components/schemas/NFType'
         nFStatus:
           $ref: '#/components/schemas/NFStatus'
         plmn:
@@ -105,7 +105,7 @@ components:
         allowedNfTypes:
           type: array
           items:
-            $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType'
+            $ref: '#/components/schemas/NFType'
         allowedNssais:
           type: array
           items:
@@ -215,10 +215,14 @@ components:
     ManagedNFProfile:
       type: object
       properties:
+        hniList:
+          type: array
+          items: 
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn'
         nfInstanceID:
           type: string
         nfType:
-          $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType'
+          $ref: '#/components/schemas/NFType'
         heartbeatTimer:
           type: integer
         authzInfo:
@@ -240,7 +244,7 @@ components:
         allowedNfTypes:
           type: array
           items:
-            $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType'
+            $ref: '#/components/schemas/NFType'
         allowedNfDomains:
           type: array
           items: 
@@ -1043,7 +1047,7 @@ components:
         servingNfTypeList:
           type: array
           items:
-            $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType'
+            $ref: '#/components/schemas/NFType'
           minItems: 1
         mlAnalyticsList:
           type: array
@@ -1516,7 +1520,7 @@ components:
         servingNfTypeList:
           type: array
           items:
-            $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType'
+            $ref: '#/components/schemas/NFType'
           minItems: 1
         servingNfSetIdList:
           type: array
@@ -1538,7 +1542,7 @@ components:
         servingNfTypeList:
           type: array
           items:
-            $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType'
+            $ref: '#/components/schemas/NFType'
         servingNfSetIdList:
           type: array
           items:
@@ -2918,7 +2922,109 @@ components:
       type: object
       properties:
         nfType:
-          $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType'
+          $ref: '#/components/schemas/NFType'
+    SAP:
+      type: object
+      properties:
+        host:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr'
+        port:
+          type: integer
+    NFServiceType:
+      type: string
+      enum:
+        - NAMF_COMMUNICATION
+        - NAMF_EVENTEXPOSURE
+        - NAMF_MT
+        - NAMF_LOCATION
+        - NSMF_PDUSESSION
+        - NSMF_EVENTEXPOSURE
+        - OTHERS
+    Operation:
+      type: object
+      properties:
+        name:
+          type: string
+        allowedNFTypes:
+          $ref: '#/components/schemas/NFType'
+        operationSemantics:
+          $ref: '#/components/schemas/OperationSemantics'
+    NFType:
+      type: string
+      description: ' NF name defined in TS 23.501 or TS 29.510'
+      enum:
+        - NRF
+        - UDM
+        - AMF
+        - SMF
+        - AUSF
+        - NEF
+        - PCF
+        - SMSF
+        - NSSF
+        - UDR
+        - LMF
+        - GMLC
+        - 5G_EIR
+        - SEPP
+        - UPF
+        - N3IWF
+        - AF
+        - UDSF
+        - DN
+        - BSF
+        - CHF
+        - NWDAF
+        - PCSCF
+        - CBCF
+        - HSS
+        - UCMF
+        - SOR_AF
+        - SPAF
+        - MME
+        - SCSAS
+        - SCEF
+        - SCP
+        - NSSAAF
+        - ICSCF
+        - SCSCF
+        - DRA
+        - IMS_AS
+        - AANF
+        - 5G_DDNMF
+        - NSACF
+        - MFAF
+        - EASDF
+        - DCCF
+        - MB_SMF
+        - TSCTSF
+        - ADRF
+        - GBA_BSF
+        - CEF
+        - MB_UPF
+        - NSWOF
+        - PKMF
+        - MNPF
+        - SMS_GMSC
+        - SMS_IWMSC
+        - MBSF
+        - MBSTF
+        - PANF
+        - TNGF
+        - W_AGF
+        - TWIF
+        - TSN_AF
+
+    OperationSemantics:
+      type: string
+      enum:
+        - REQUEST_RESPONSE
+        - SUBSCRIBE_NOTIFY
+    RegistrationState:
+      type: string
+      enum:
+        - REGISTERED
+        - DEREGISTERED
 
 #-------- Definition of types for name-containments ------
     SubNetwork-ncO-5GcNrm:
@@ -3054,7 +3160,9 @@ components:
                       $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList'
                     mdtUserConsentReqList:
                       $ref: 'TS28541_NrNrm.yaml#/components/schemas/MdtUserConsentReqList'
+
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'        
         - type: object
           properties:
             EP_N2:
@@ -3158,7 +3266,9 @@ components:
                     commModelList:
                       $ref: '#/components/schemas/CommModelList'
                     SmfInfo:
-                      $ref: '#/components/schemas/SmfInfo'  
+                      type: array
+                      items:
+                        $ref: '#/components/schemas/SmfInfo'    
                     configurable5QISetRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                     dynamic5QISetRef:
@@ -3168,6 +3278,7 @@ components:
                       items:
                         $ref: '#/components/schemas/dnaiSatelliteMapping'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
         - type: object
           properties:
             EP_N4:
@@ -3222,8 +3333,11 @@ components:
                     supportedBMOList:
                       $ref: '#/components/schemas/SupportedBMOList'
                     upfInfo:
-                      $ref: '#/components/schemas/UpfInfo'        
+                      type: array
+                      items:
+                        $ref: '#/components/schemas/UpfInfo'    
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
         - type: object
           properties:
             EP_N3:
@@ -3251,6 +3365,7 @@ components:
                     commModelList:
                       $ref: '#/components/schemas/CommModelList'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
         - type: object
           properties:
             EP_N3:
@@ -3278,7 +3393,9 @@ components:
                     supportedBMOList:
                       $ref: '#/components/schemas/SupportedBMOList'
                     PcfInfo:
-                      $ref: '#/components/schemas/PcfInfo' 
+                      type: array
+                      items:
+                        $ref: '#/components/schemas/PcfInfo'
                     configurable5QISetRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                     dynamic5QISetRef:
@@ -3286,6 +3403,7 @@ components:
                     predefinedPccRuleSetRefs:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'  
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
         - type: object
           properties:
             EP_N5:
@@ -3324,6 +3442,7 @@ components:
                     ausfInfo:
                       $ref: '#/components/schemas/AusfInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
         - type: object
           properties:
             EP_N12:
@@ -3355,6 +3474,7 @@ components:
                     udmInfo:
                       $ref: '#/components/schemas/UdmInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
         - type: object
           properties:
             EP_N8:
@@ -3388,6 +3508,7 @@ components:
                     udrInfo:
                       $ref: '#/components/schemas/UdrInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
     UdsfFunction-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -3407,6 +3528,7 @@ components:
                     udsfInfo:
                       $ref: '#/components/schemas/UdsfInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
     NrfFunction-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -3428,6 +3550,7 @@ components:
                     nrfInfo:
                       $ref: '#/components/schemas/NrfInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
         - type: object
           properties:
             EP_N27:
@@ -3457,6 +3580,7 @@ components:
                     commModelList:
                       $ref: '#/components/schemas/CommModelList'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
         - type: object
           properties:
             EP_N22:
@@ -3486,6 +3610,7 @@ components:
                     smsfInfo:
                       $ref: '#/components/schemas/SmsfInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
         - type: object
           properties:
             EP_N20:
@@ -3519,6 +3644,7 @@ components:
                     mappedCellIdInfoList:
                       $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList'                      
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
         - type: object
           properties:
             EP_NLS:
@@ -3544,6 +3670,7 @@ components:
                     commModelList:
                       $ref: '#/components/schemas/CommModelList'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
         - type: object
           properties:
             EP_N17:
@@ -3569,6 +3696,7 @@ components:
                     seppInfo:
                       $ref: '#/components/schemas/SeppInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
         - type: object
           properties:
             EP_N32:
@@ -3614,7 +3742,7 @@ components:
             AnLFFunction:
               $ref: '#/components/schemas/AnLFFunction-Single'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
-
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'   
     ScpFunction-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -3632,6 +3760,7 @@ components:
                     scpInfo:
                       $ref: '#/components/schemas/ScpInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
         - type: object
           properties:
             EP_SM13:
@@ -3659,6 +3788,7 @@ components:
                     nefInfo:
                        $ref: '#/components/schemas/NefInfo' 
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
         - type: object
           properties:
             EP_N33:
@@ -3691,6 +3821,7 @@ components:
                     nsacfInfo:
                       $ref: '#/components/schemas/NsacfInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
         - type: object
           properties:
             EP_N60:
@@ -3715,6 +3846,7 @@ components:
                     commModelList:
                       $ref: '#/components/schemas/CommModelList'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
         - type: object
           properties:
             EP_Npc4:
@@ -3747,6 +3879,7 @@ components:
                     easdfInfo:
                       $ref: '#/components/schemas/EasdfInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
         - type: object
           properties:
             EP_N88:
@@ -3802,6 +3935,7 @@ components:
                     amfIdentifier:
                       $ref: '#/components/schemas/AmfIdentifier'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
     ExternalNrfFunction-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -3815,6 +3949,7 @@ components:
                     plmnIdList:
                       $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
     ExternalNssfFunction-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -3828,6 +3963,7 @@ components:
                     plmnIdList:
                       $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
     ExternalSeppFunction-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -3845,7 +3981,7 @@ components:
                     fqdn:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
-
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'   
     EP_N2-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -4610,6 +4746,7 @@ components:
                     trustAfInfo:
                       $ref: '#/components/schemas/TrustAfInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
         - type: object
           properties:
             EP_N5:
@@ -4644,6 +4781,7 @@ components:
                     nssafInfo:
                       $ref: '#/components/schemas/NssaafInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
     EP_N58-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -4695,6 +4833,7 @@ components:
                     dccfInfo:
                       $ref: '#/components/schemas/DccfInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
 
     MfafFunction-Single:
       allOf:
@@ -4717,6 +4856,7 @@ components:
                     mfafInfo:
                       $ref: '#/components/schemas/MfafInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
 
     ChfFunction-Single:
       allOf:
@@ -4739,6 +4879,7 @@ components:
                     chfInfo:
                       $ref: '#/components/schemas/ChfInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
         - type: object
           properties:
             EP_N28:
@@ -4901,6 +5042,7 @@ components:
                     gmlcInfo:
                       $ref: '#/components/schemas/GmlcInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
         - type: object
           properties:
             EP_NL2:
@@ -4934,6 +5076,7 @@ components:
                     tsctsfInfo:
                       $ref: '#/components/schemas/TsctsfInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
         - type: object
           properties:
             EP_N84:
@@ -5055,8 +5198,11 @@ components:
                     commModelList:
                       $ref: '#/components/schemas/CommModelList'
                     bsfInfo:
-                      $ref: '#/components/schemas/BsfInfo'
+                      type: array
+                      items:
+                        $ref: '#/components/schemas/BsfInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
 
     MbSmfFunction-Single:
       allOf:
@@ -5077,6 +5223,7 @@ components:
                     mbSmfInfo:
                       $ref: '#/components/schemas/MbSmfInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
         - type: object
           properties:
             EP_N11mb:
@@ -5150,6 +5297,7 @@ components:
                     mbUpfInfo:
                       $ref: '#/components/schemas/MbUpfInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
         - type: object
           properties:
             EP_N3mb:
@@ -5180,6 +5328,7 @@ components:
                     mnpfInfo:
                       $ref: '#/components/schemas/MnpfInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
         - type: object
           properties:
             EP_SM12:
@@ -5301,9 +5450,46 @@ components:
                       $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'
                     remoteAddress:
                       $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'
+#-------- Definition of abstract IOCs --------------------------------------------
+    ManagedFunction5GC-nc0:
+      type: object
+      properties:
+        ManagedNFService:
+          $ref: '#/components/schemas/ManagedNFService-Multiple'
+#-------- Definition of abstract IOCs --------------------------------------------
 
-#-------- Definition of JSON arrays for name-contained IOCs ----------------------
 
+#-------- Definition of 5GC common IOCs --------------------------------------------
+    ManagedNFService-Single:
+      allOf:
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              type: object
+              properties:
+                userLabel:
+                  type: string
+                nFServiceType:
+                  $ref: '#/components/schemas/NFServiceType'
+                sAP:
+                  $ref: '#/components/schemas/SAP'
+                operations:
+                  type: array
+                  items:
+                    $ref: '#/components/schemas/Operation'
+                administrativeState:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState'
+                operationalState:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState'
+                usageState:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/UsageState'
+                registrationState:
+                  $ref: '#/components/schemas/RegistrationState'
+
+#-------- Definition of 5GC common IOCs --------------------------------------------
+
+#-------- Definition of JSON arrays for name-contained IOCs ----------------------
     AmfFunction-Multiple:
       type: array
       items:
@@ -5741,7 +5927,10 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/MnpfFunction-Single'
-
+    ManagedNFService-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/ManagedNFService-Single'
 #------------ Definitions in TS 28.541 for TS 28.532 -----------------------------
 
     resources-5gcNrm:
@@ -5766,6 +5955,7 @@ components:
        - $ref: '#/components/schemas/NefFunction-Single'
        - $ref: '#/components/schemas/NsacfFunction-Single'
        - $ref: '#/components/schemas/DDNMFFunction-Single'
+       - $ref: '#/components/schemas/ManagedNFService-Single'       
 
        - $ref: '#/components/schemas/ExternalAmfFunction-Single'
        - $ref: '#/components/schemas/ExternalNrfFunction-Single'
diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index 62e23de93760987a78e011b7ca67c887b8be1dac..f9b0c46ff20930b58de8e1917c4cdbf3a421d3d3 100755
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -628,26 +628,32 @@ components:
       properties:
         positionX:
           type: integer
+          default: 0
           minimum: 0
           maximum: 604800
         positionY:
           type: integer
+          default: 0          
           minimum: 0
           maximum: 604800
         positionZ:
           type: integer
+          default: 0          
           minimum: 0
           maximum: 604800
         velocityVX:
           type: integer
+          default: 0          
           minimum: -131072
           maximum: 131071         
         velocityVY:
           type: integer
+          default: 0          
           minimum: -131072
           maximum: 131071           
         velocityVZ:
           type: integer
+          default: 0          
           minimum: -131072
           maximum: 131071
 
@@ -656,26 +662,32 @@ components:
       properties:
           semiMajorAxis:
             type: integer
+            default: 0            
             minimum: 0
             maximum: 8589934591 
           eccentricity:
             type: integer
+            default: 0                 
             minimum: -524288
             maximum: 524287
           periapsis:
             type: integer
+            default: 0     
             minimum: 0
             maximum: 16777215
           longitude:
             type: integer
+            default: 0                 
             minimum: 0
             maximum: 2097151
           inclination:
             type: integer
+            default: 0                 
             minimum: -524288
             maximum: 524287
           meanAnomaly:
             type: integer
+            default: 0                 
             minimum: 0
             maximum: 16777215
 
diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml
index f5985b380d3b5e0fe042a76a134ec72c1e6251dc..773ad5b51cb69505df0e4e7ae306e2a17ba981db 100755
--- a/OpenAPI/TS28623_ComDefs.yaml
+++ b/OpenAPI/TS28623_ComDefs.yaml
@@ -143,6 +143,9 @@ components:
 
     Fqdn:
       type: string
+      pattern: '^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$'
+      minLength: 4
+      maxLength: 253
     Ipv4Addr:
       type: string
       pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$'
@@ -192,6 +195,11 @@ components:
         - LOCKED
         - UNLOCKED
       default: LOCKED  
+    BasicAdministrativeState:
+      type: string
+      enum:
+        - LOCKED
+        - UNLOCKED
     OperationalState:
       type: string
       enum:
diff --git a/OpenAPI/TS28623_FileManagementNrm.yaml b/OpenAPI/TS28623_FileManagementNrm.yaml
index a0b20fe331eb04fc84b438f734814a577bbc437c..bd3881d20a7df82016d7c263216f6e1d2d711e7a 100644
--- a/OpenAPI/TS28623_FileManagementNrm.yaml
+++ b/OpenAPI/TS28623_FileManagementNrm.yaml
@@ -12,6 +12,25 @@ externalDocs:
 paths: {}
 components:
   schemas:
+
+  #-------- Definition of types for name-containments ------
+    SubNetwork-ncO-FileManagementNrm:
+      type: object
+      properties:
+        FileDownloadJob:
+          $ref: '#/components/schemas/FileDownloadJob-Multiple'
+        Files:
+          $ref: '#/components/schemas/Files-Multiple'
+    ManagedElement-ncO-FileManagementNrm:
+      type: object
+      properties:
+        FileDownloadJob:
+          $ref: '#/components/schemas/FileDownloadJob-Multiple'
+        Files:
+          $ref: '#/components/schemas/Files-Multiple'      
+   #-------Definition of generic IOCs ----------#  
+
+
 #-------- Definition of types-----------------------------------------------------
     FileDownloadJobProcessMonitor:
       description: >-
diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index 695a96fa442dded3b0438515c7de8c8ad024ef97..9db6fa936fc48e07635cda7c245944d4be33a98b 100755
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -15,11 +15,7 @@ components:
 
 #-------- Definition of types-----------------------------------------------------
 
-    RegistrationState:
-      type: string
-      enum:
-        - REGISTERED
-        - DEREGISTERED
+
     VnfParameter:
       type: object
       properties:
@@ -51,103 +47,7 @@ components:
           type: string
         powerInterface:
           type: string
-    Operation:
-      type: object
-      properties:
-        name:
-          type: string
-        allowedNFTypes:
-          $ref: '#/components/schemas/NFType'
-        operationSemantics:
-          $ref: '#/components/schemas/OperationSemantics'
-    NFType:
-      type: string
-      description: ' NF name defined in TS 23.501 or TS 29.510'
-      enum:
-        - NRF
-        - UDM
-        - AMF
-        - SMF
-        - AUSF
-        - NEF
-        - PCF
-        - SMSF
-        - NSSF
-        - UDR
-        - LMF
-        - GMLC
-        - 5G_EIR
-        - SEPP
-        - UPF
-        - N3IWF
-        - AF
-        - UDSF
-        - DN
-        - BSF
-        - CHF
-        - NWDAF
-        - PCSCF
-        - CBCF
-        - HSS
-        - UCMF
-        - SOR_AF
-        - SPAF
-        - MME
-        - SCSAS
-        - SCEF
-        - SCP
-        - NSSAAF
-        - ICSCF
-        - SCSCF
-        - DRA
-        - IMS_AS
-        - AANF
-        - 5G_DDNMF
-        - NSACF
-        - MFAF
-        - EASDF
-        - DCCF
-        - MB_SMF
-        - TSCTSF
-        - ADRF
-        - GBA_BSF
-        - CEF
-        - MB_UPF
-        - NSWOF
-        - PKMF
-        - MNPF
-        - SMS_GMSC
-        - SMS_IWMSC
-        - MBSF
-        - MBSTF
-        - PANF
-        - TNGF
-        - W_AGF
-        - TWIF
-        - TSN_AF
 
-    OperationSemantics:
-      type: string
-      enum:
-        - REQUEST_RESPONSE
-        - SUBSCRIBE_NOTIFY
-    SAP:
-      type: object
-      properties:
-        host:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr'
-        port:
-          type: integer
-    NFServiceType:
-      type: string
-      enum:
-        - Namf_Communication
-        - Namf_EventExposure
-        - Namf_MT
-        - Namf_Location
-        - Nsmf_PDUSession
-        - Nsmf_EventExposure
-        - Others
     TransportProtocol:
       anyOf:
         - type: string
@@ -453,60 +353,30 @@ components:
           $ref: '#/components/schemas/MnsAgent-Multiple'
         MeContext:
           $ref: '#/components/schemas/MeContext-Multiple'
-        PerfMetricJob:
-          $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple'
-        ThresholdMonitor:
-          $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple'
-        TraceJob:
-          $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple'
-        ManagementDataCollection:
-          $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/ManagementDataCollection-Multiple'
-        NtfSubscriptionControl:
-          $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple'
         AlarmList:
           $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single'
-        FileDownloadJob:
-          $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/FileDownloadJob-Multiple'
-        Files:
-          $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple'
-        MnsRegistry:
-          $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/MnsRegistry-Single'
         Scheduler:
           $ref: '#/components/schemas/Scheduler-Multiple'
         ConditionMonitor:
           $ref: '#/components/schemas/ConditionMonitor-Multiple'
         SupportedNotifications:
           $ref: '#/components/schemas/SupportedNotifications-Single'
-        QMCJobs:
-          $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/QMCJob-Multiple'
+
 
     ManagedElement-ncO:
       type: object
       properties:
         MnsAgent:
           $ref: '#/components/schemas/MnsAgent-Multiple'
-        PerfMetricJob:
-          $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple'
-        ThresholdMonitor:
-          $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple'
-        TraceJob:
-          $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple'
-        NtfSubscriptionControl:
-          $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple'
         AlarmList:
           $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single'
-        FileDownloadJob:
-          $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/FileDownloadJob-Multiple'
-        Files:
-          $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple'
         Scheduler:
           $ref: '#/components/schemas/Scheduler-Multiple'
         ConditionMonitor:
           $ref: '#/components/schemas/ConditionMonitor-Multiple'
         SupportedNotifications:  
           $ref: '#/components/schemas/SupportedNotifications-Single'
-        QMCJobs:
-          $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/QMCJob-Multiple'
+
 
 #-------- Definition of abstract IOCs --------------------------------------------
 
@@ -552,8 +422,6 @@ components:
           $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple'
         ThresholdMonitor:
           $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple'
-        ManagedNFService:
-          $ref: '#/components/schemas/ManagedNFService-Multiple'
         TraceJob:
           $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple'
 
@@ -575,32 +443,7 @@ components:
               nullable: true
         VsDataContainer:
           $ref: '#/components/schemas/VsDataContainer-Multiple'
-    ManagedNFService-Single:
-      allOf:
-        - $ref: '#/components/schemas/Top'
-        - type: object
-          properties:
-            attributes:
-              type: object
-              properties:
-                userLabel:
-                  type: string
-                nFServiceType:
-                  $ref: '#/components/schemas/NFServiceType'
-                sAP:
-                  $ref: '#/components/schemas/SAP'
-                operations:
-                  type: array
-                  items:
-                    $ref: '#/components/schemas/Operation'
-                administrativeState:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState'
-                operationalState:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState'
-                usageState:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/UsageState'
-                registrationState:
-                  $ref: '#/components/schemas/RegistrationState'
+
     ManagementNode-Single:
       allOf:
         - $ref: '#/components/schemas/Top'
@@ -698,6 +541,16 @@ components:
         - $ref: '#/components/schemas/Top' 
         - $ref: '#/components/schemas/SubNetwork-Attr'
         - $ref: '#/components/schemas/SubNetwork-ncO'
+        - $ref: '#/components/schemas/SubNetwork-Multiple'
+        - $ref: '#/components/schemas/ManagedElement-Multiple'
+        - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/SubNetwork-ncO-FileManagementNrm'
+        - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/SubNetwork-ncO-PmControlNrm'
+        - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/SubNetwork-ncO-SubscriptionControlNrm'
+        - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/SubNetwork-ncO-ThresholdMonitorNrm'
+        - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/SubNetwork-ncO-TraceControlNrm'                
+        - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/SubNetwork-ncO-QoEMeasurementCollectionNrm'                    
+        - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/SubNetwork-ncO-ManagementDataCollectionNrm'
+        - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/SubNetwork-ncO-MnSRegistryNrm'           
         - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/SubNetwork-ncO-MdaNrm'
         - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/SubNetwork-ncO-AiMlNrm'
         - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/SubNetwork-ncO-IntentNrm'
@@ -708,12 +561,19 @@ components:
         - $ref: 'TS28541_NrNrm.yaml#/components/schemas/SubNetwork-ncO-NrNrm'
         - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/SubNetwork-ncO-5GcNrm'
         - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/SubNetwork-ncO-DsoNrm'
+    
 
     ManagedElement-Single:
       allOf:
         - $ref: '#/components/schemas/Top'
         - $ref: '#/components/schemas/ManagedElement-Attr'
         - $ref: '#/components/schemas/ManagedElement-ncO'
+        - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/ManagedElement-ncO-FileManagementNrm'
+        - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/ManagedElement-PmControlNrm'
+        - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/ManagedElement-ncO-SubscriptionControlNrm'
+        - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ManagedElement-ncO-ThresholdMonitorNrm'
+        - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/SubNetwork-ncO-TraceControlNrm'                            
+        - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/ManagedElement-ncO-QoEMeasurementCollectionNrm'                             
         - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/ManagedElement-ncO-MdaNrm'
         - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/ManagedElement-ncO-AiMlNrm'
         - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/ManagedElement-ncO-CoslaNrm'
@@ -737,10 +597,6 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/VsDataContainer-Single'
-    ManagedNFService-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/ManagedNFService-Single'
     ManagementNode-Multiple:
       type: array
       items:
@@ -780,7 +636,6 @@ components:
        - $ref: '#/components/schemas/ManagementNode-Single'
        - $ref: '#/components/schemas/MnsAgent-Single'
        - $ref: '#/components/schemas/MeContext-Single'
-       - $ref: '#/components/schemas/ManagedNFService-Single'
        - $ref: '#/components/schemas/Scheduler-Single'
        - $ref: '#/components/schemas/ConditionMonitor-Single'
        - $ref: '#/components/schemas/SupportedNotifications-Single' 
diff --git a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml
index 185272364845362b9300407f310bcb572f64d26c..63710ca797736808ff00f6e87decc781786d643d 100644
--- a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml
+++ b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml
@@ -12,6 +12,15 @@ externalDocs:
 paths: {}
 components:
   schemas:
+  #-------- Definition of types for name-containments ------
+    SubNetwork-ncO-ManagementDataCollectionNrm:
+      type: object
+      properties:
+        ManagementDataCollection:
+          $ref: '#/components/schemas/ManagementDataCollection-Multiple'
+    
+   #-------Definition of generic IOCs ----------# 
+
 #-------- Definition of types-----------------------------------------------------
 
     ManagementData:
diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml
index a5a022a43f8b576e39191a012fce3acccae370d9..bb5d1a1a802bc15da7c1ea2e091e3e074a770bfb 100644
--- a/OpenAPI/TS28623_MnSRegistryNrm.yaml
+++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml
@@ -12,6 +12,15 @@ externalDocs:
 paths: {}
 components:
   schemas:
+  #-------- Definition of types for name-containments ------
+    SubNetwork-ncO-MnSRegistryNrm:
+      type: object
+      properties:
+        MnsRegistry:
+          $ref: '#/components/schemas/MnsRegistry-Single'
+    
+   #-------Definition of generic IOCs ----------# 
+
 #-------- Definition of types-----------------------------------------------------
 
 #-------- Definition of concrete IOCs --------------------------------------------          
@@ -33,10 +42,10 @@ components:
              mnsType:
                type: string
                enum:
-                 - ProvMnS
-                 - FaultSupervisionMnS
-                 - StreamingDataReportingMnS
-                 - FileDataReportingMnS
+                 - PROV_MNS
+                 - FAULT_SUPERVISION_MNS
+                 - STREAMING_DATA_REPORTING_MNS
+                 - FILE_DATA_REPORTING_MNS
              mnsVersion:
                type: string
              mnsAddress:
diff --git a/OpenAPI/TS28623_PmControlNrm.yaml b/OpenAPI/TS28623_PmControlNrm.yaml
index 23581d77711c1ee2a42c43c17f6ff70ea80a265c..6db2ed41e7d124d3e8b9b21614b9a27ec93a89ea 100644
--- a/OpenAPI/TS28623_PmControlNrm.yaml
+++ b/OpenAPI/TS28623_PmControlNrm.yaml
@@ -12,6 +12,19 @@ externalDocs:
 paths: {}
 components:
   schemas:
+  #-------- Definition of types for name-containments ------
+    SubNetwork-ncO-PmControlNrm:
+      type: object
+      properties:
+        PerfMetricJob:
+          $ref: '#/components/schemas/PerfMetricJob-Multiple'
+    ManagedElement-PmControlNrm:
+      type: object
+      properties:
+        PerfMetricJob:
+          $ref: '#/components/schemas/PerfMetricJob-Multiple'   
+   #-------Definition of generic IOCs ----------#  
+  
 #-------- Definition of types-----------------------------------------------------
 
 
diff --git a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml
index 0ec934f5540d55813b22b2d71b2987662cf55e39..82c7939c308d0d5995a288b6d76bf5808bcac1ed 100644
--- a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml
+++ b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml
@@ -12,6 +12,20 @@ externalDocs:
 paths: {}
 components:
   schemas:
+  #-------- Definition of types for name-containments ------
+    SubNetwork-ncO-QoEMeasurementCollectionNrm:
+      type: object
+      properties:
+        QMCJobs:
+          $ref: '#/components/schemas/QMCJob-Multiple'
+    ManagedElement-ncO-QoEMeasurementCollectionNrm:
+      type: object
+      properties:
+        QMCJobs:
+          $ref: '#/components/schemas/QMCJob-Multiple'      
+   #-------Definition of generic IOCs ----------#    
+
+  
 #-------- Definition of types-----------------------------------------------------
 
 #-------- Definition of concrete IOCs --------------------------------------------
diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml
index 5d493262645fbb6458f8ab4ea7730cecd0226216..4c283391b5c84dff78a46e5039ea86029d121b3d 100644
--- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml
+++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml
@@ -12,6 +12,19 @@ externalDocs:
 paths: {}
 components:
   schemas:
+  #-------- Definition of types for name-containments ------
+    SubNetwork-ncO-SubscriptionControlNrm:
+      type: object
+      properties:
+        NtfSubscriptionControl:
+          $ref: '#/components/schemas/NtfSubscriptionControl-Multiple'
+    ManagedElement-ncO-SubscriptionControlNrm:
+      type: object
+      properties:
+        NtfSubscriptionControl:
+          $ref: '#/components/schemas/NtfSubscriptionControl-Multiple'  
+   #-------Definition of generic IOCs ----------#   
+
 #-------- Definition of types-----------------------------------------------------
     Scope:
       type: object
diff --git a/OpenAPI/TS28623_ThresholdMonitorNrm.yaml b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml
index d4fd1aac13b8626765a66fec90517223ecfea802..711ce416cfd7c68283305ff1a0edb7fa4751efd8 100644
--- a/OpenAPI/TS28623_ThresholdMonitorNrm.yaml
+++ b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml
@@ -12,6 +12,19 @@ externalDocs:
 paths: {}
 components:
   schemas:
+  #-------- Definition of types for name-containments ------
+    SubNetwork-ncO-ThresholdMonitorNrm:
+      type: object
+      properties:
+        ThresholdMonitor:
+          $ref: '#/components/schemas/ThresholdMonitor-Multiple'
+    ManagedElement-ncO-ThresholdMonitorNrm:
+      type: object
+      properties:
+        ThresholdMonitor:
+          $ref: '#/components/schemas/ThresholdMonitor-Multiple' 
+   #-------Definition of generic IOCs ----------#   
+
 #-------- Definition of types-----------------------------------------------------
     ThresholdInfo:
       type: object
diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml
index 0d09284e0e6357c9c2f8d90966a5e65af059ba66..4810354221bc399be3678b04fc00c3cf61cd24a7 100644
--- a/OpenAPI/TS28623_TraceControlNrm.yaml
+++ b/OpenAPI/TS28623_TraceControlNrm.yaml
@@ -12,6 +12,19 @@ externalDocs:
 paths: {}
 components:
   schemas:
+  #-------- Definition of types for name-containments ------
+    SubNetwork-ncO-TraceControlNrm:
+      type: object
+      properties:
+        TraceJob:
+          $ref: '#/components/schemas/TraceJob-Multiple'
+    ManagedElement-ncO-TraceControlNrm:
+      type: object
+      properties:
+        TraceJob:
+          $ref: '#/components/schemas/TraceJob-Multiple' 
+   #-------Definition of generic IOCs ----------#   
+
 #-------- Definition of types used in Trace control NRM fragment------------------
                 
     jobType-Type:
@@ -40,8 +53,8 @@ components:
             type: string
             enum:
               - A
-              - Iu-CS
-              - Mc
+              - IU-CS
+              - MC
               - MAP-G
               - MAP-B
               - MAP-E
@@ -54,33 +67,33 @@ components:
           items:
             type: string
             enum:
-              - Mc
-              - Nb-UP
-              - Iu-UP
+              - MC
+              - NB-UP
+              - IU-UP
         RNCInterfaces:
           type: array
           items:
             type: string
             enum:
-              - Iu-CS
-              - Iu-PS
-              - Iur
-              - Iub
-              - Uu
+              - IU-CS
+              - IU-PS
+              - IUR
+              - IUB
+              - UU
         SGSNInterfaces:
           type: array
           items:
             type: string
             enum:
-              - Gb
-              - Iu-PS
-              - Gn
-              - MAP-Gr
-              - MAP-Gd
-              - MAP-Gf
-              - Ge
-              - Gs
-              - S6d
+              - GB
+              - IU-PS
+              - GN
+              - MAP-GR
+              - MAP-GD
+              - MAP-GF
+              - GE
+              - GS
+              - S6D
               - S4
               - S3
               - S13
@@ -89,34 +102,34 @@ components:
           items:
             type: string
             enum:
-              - Gn
-              - Gi
-              - Gmb
+              - GN
+              - GI
+              - GMB
         S-CSCFInterfaces:
           type: array
           items:
             type: string
             enum:
-              - Mw
-              - Mg
-              - Mr
-              - Mi
+              - MW
+              - MG
+              - MR
+              - MI
         P-CSCFInterfaces:
           type: array
           items:
             type: string
             enum:
-              - Gm
-              - Mw
+              - GM
+              - MW
         I-CSCFInterfaces:
           type: array
           items:
             type: string
             enum:
-              - Cx
-              - Dx
-              - Mg
-              - Mw
+              - CX
+              - DX
+              - MG
+              - MW
         MRFCInterfaces:
           type: array
           items:
@@ -129,42 +142,42 @@ components:
           items:
             type: string
             enum:
-              - Mg
-              - Mj
-              - Mn
+              - MG
+              - MJ
+              - MN
         IBCFInterfaces:
           type: array
           items:
             type: string
             enum:
-              - Ix
-              - Mx
+              - IX
+              - MX
         E-CSCFInterfaces:
           type: array
           items:
             type: string
             enum:
-              - Mw
-              - Ml
-              - Mm
-              - Mi/Mg
+              - MW
+              - ML
+              - MM
+              - MI/MG
         BGCFInterfaces:
           type: array
           items:
             type: string
             enum:
-              - Mi
-              - Mj
-              - Mk
+              - MI
+              - MJ
+              - MK
         ASInterfaces:
           type: array
           items:
             type: string
             enum:
-              - Dh
-              - Sh
+              - DH
+              - SH
               - ISC
-              - Ut
+              - UT
         HSSInterfaces:
           type: array
           items:
@@ -172,12 +185,12 @@ components:
             enum:
               - MAP-C
               - MAP-D
-              - Gc
-              - Gr
-              - Cx
-              - S6d
-              - S6a
-              - Sh
+              - GC
+              - GR
+              - CX
+              - S6D
+              - S6A
+              - SH
               - N70
               - N71
               - NU1
@@ -188,13 +201,13 @@ components:
             enum:
               - MAP-F
               - S13
-              - MAP-Gf
+              - MAP-GF
         BM-SCInterfaces:
           type: array
           items:
             type: string
             enum:
-              - Gmb
+              - GMB
         MMEInterfaces:
           type: array
           items:
@@ -202,7 +215,7 @@ components:
             enum:
               - S1-MME
               - S3
-              - S6a
+              - S6A
               - S10
               - S11
               - S13
@@ -215,20 +228,20 @@ components:
               - S5
               - S8
               - S11
-              - Gxc
+              - GXC
         PDN_GWInterfaces:
           type: array
           items:
             type: string
             enum:
-              - S2a
-              - S2b
-              - S2c
+              - S2A
+              - S2B
+              - S2C
               - S5
-              - S6b
-              - Gx
+              - S6B
+              - GX
               - S8
-              - SGi
+              - SGI
         eNBInterfaces:
           type: array
           items:
@@ -243,7 +256,7 @@ components:
             enum:
               - S1-MME
               - X2
-              - Uu
+              - UU
               - F1-C
               - E1
         AMFInterfaces:
@@ -336,16 +349,16 @@ components:
             type: string
             enum:
               - NG-C
-              - Xn-C
-              - Uu
+              - XN-C
+              - UU
         gNB-CU-CPInterfaces:
           type: array
           items:
             type: string
             enum:
               - NG-C
-              - Xn-C
-              - Uu
+              - XN-C
+              - UU
               - F1-C
               - E1
               - X2-C
@@ -459,9 +472,9 @@ components:
             - UTRAN_CELL
             - E-UTRAN_CELL
             - NG-RAN_CELL
-            - eNB
+            - ENB
             - RNC
-            - gNB
+            - GNB
             - SUPI
         TargetIdValue:
           type: string
@@ -480,7 +493,7 @@ components:
             enum:
               - MO_MT_CALLS
               - MO_MT_SMS
-              - LU_IMSIattach_IMSIdetach
+              - LU_IMSIATTACH_IMSIDETACH
               - HANDOVER
               - SS
         SGSN:
@@ -488,10 +501,10 @@ components:
           items:
             type: string
             enum:
-              - PDPcontext
+              - PDPCONTEXT
               - MO_MT_SMS
-              - RAU_GPRSattach_GPRSdetach
-              - MBMScontext
+              - RAU_GPRSATTACH_GPRSDETACH
+              - MBMSCONTEXT
         MGW:
           type: array
           items:
@@ -503,129 +516,129 @@ components:
           items:
             type: string
             enum:
-              - PDPcontext
-              - MBMScontext
+              - PDPCONTEXT
+              - MBMSCONTEXT
         IMS:
           type: array
           items:
             type: string
             enum:
-              - SIPsession_StandaloneTransaction
+              - SIPSESSION_STANDALONETRANSACTION
         BM_SC:
           type: array
           items:
             type: string
             enum:
-              - MBMSactivation
+              - MBMSACTIVATION
         MME:
           type: array
           items:
             type: string
             enum:
-              - UEinitiatedPDNconnectivityRequest
-              - ServiceRequest
-              - InitialAttach_TAU_Detach
-              - UEinitiatedPDNdisconnection
-              - BearerActivationModificationDeletion
-              - Handover
+              - UE_INITIATEDPDN_CONNECTIVITY_REQUEST
+              - SERVICE_REQUEST
+              - INITIALATTACH_TAU_DETACH
+              - UE_INITIATEDPDN_DISCONNECTION
+              - BEAR_ACTIVIATION_MODIFICATION_DELETION
+              - HANDOVER
         SGW:
           type: array
           items:
             type: string
             enum:
-              - PDNconnectionCreation
-              - PDNconnectionTermination
-              - BearerActivationModificationDeletion
+              - PDN_CONNECTION_CREATION
+              - PDN_CONNECTION_TERMINATION
+              - BEAR_ACTIVATION_MODIFICATION_DELETION
         PGW:
           type: array
           items:
             type: string
             enum:
-              - PDNconnectionCreation
-              - PDNconnectionTermination
-              - BearerActivationModificationDeletion
+              - PDN_CONNECTION_CREATION
+              - PDN_CONNECTION_TERMINATION
+              - BEAR_ACTIVATION_MODIFICATION_DELETION
         AMF:
           type: array
           items:
             type: string
             enum:
-              - Registration
-              - ServiceRequest
-              - Handover
-              - UEderegistration
-              - NetworkDeregistration
-              - UEMobilityFromEPC
-              - UEMobilityToEPC
+              - REGISTRATION
+              - SERVICE_REQUEST
+              - HANDOVER
+              - UE_DEREGISTRATION
+              - NETWORK_DEREGISTRATION
+              - UE_MOBILITY_FROM_EPC
+              - UE_MOBILITY_TO_EPC
         SMF:
           type: array
           items:
             type: string
             enum:
-              - PDUsessionEstablishment
-              - PDUsessionModification
-              - PDUsessionRelease
-              - PDUsessionUPactivationDeactivation
-              - MobilityBtw3gppAndN3gppTo5GC
-              - MobilityFromEpc
+              - PDU_SESSION_ESTABLISHMENT
+              - PDU_SESSION_MODIFICATION
+              - PDU_SESSIOON_RELEASE
+              - PDU_SESSION_UP_ACTIVATION_DEACTIVATION
+              - MOBILITY_BTW_3GPP_AND_N3GPP_TO_5GC
+              - MOBILITY_FROM_EPC
         PCF:
           type: array
           items:
             type: string
             enum:
-              - AMpolicy
-              - SMpolicy
-              - Authorization
-              - BDTpolicy
+              - AM_POLICY
+              - SM_POLICY
+              - AUTHORIZATION
+              - BDT_POLICY
         UPF:
           type: array
           items:
             type: string
             enum:
-              - N4Session
+              - N4SESSION
         AUSF:
           type: array
           items:
             type: string
             enum:
-              - UEauthentication
+              - UE_AUTHENTICATION
         NEF:
           type: array
           items:
             type: string
             enum:
-              - EventExposure
-              - PFDmanagement
-              - ParameterProvision
-              - Trigger
+              - EVENT_EXPOSURE
+              - PFD_MANAGEMENT
+              - PARAMETER_PROVISION
+              - TRIGGER
         NRF:
           type: array
           items:
             type: string
             enum:
-              - NFmanagement
-              - NFdiscovery
+              - NF_MANAGEMEENT
+              - NF_DISCOVERY
         NSSF:
           type: array
           items:
             type: string
             enum:
-              - NSSelection
+              - NS_SELECTION
               - NSSAI
         SMSF:
           type: array
           items:
             type: string
             enum:
-              - SMservice
+              - SMSERVICE
         UDM:
           type: array
           items:
             type: string
             enum:
-              - UEcontext
-              - SubscriberData
-              - UEauthentication
-              - EventExposure
+              - UE_CONTEXT
+              - SUBSCRIBER_DATA
+              - UE_AUTHENTICATION
+              - EVENT_EXPOSURE
     
     anonymizationOfMdtData-Type:
       description: Specifies level of MDT anonymization. For additional details see 3GPP TS 32.422 clause 5.10.12.
@@ -943,9 +956,9 @@ components:
       description: See details in 3GPP TS 32.422 clause 5.10.15.
       type: string
       enum:
-        - CPICH_EcNo
+        - CPICH_ECNO
         - CPICH_RSCP
-        - PathLoss
+        - PATHLOSS
 
     eventThresholdUphUmts-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.A.