diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml
index b8c44996d60e77b24fb715444f65aa11316bf9c7..5dcbd234c7285eeaad422b68ba4762b86d486207 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 825a03d6283c8d67c326042bab7b0dd3513822f5..5c2a0f525d052dd88ff7c471bc9eb7f9f124c073 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:
@@ -218,7 +218,7 @@ components:
         nfInstanceID:
           type: string
         nfType:
-          $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType'
+          $ref: '#/components/schemas/NFType'
         heartbeatTimer:
           type: integer
         authzInfo:
@@ -240,7 +240,7 @@ components:
         allowedNfTypes:
           type: array
           items:
-            $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType'
+            $ref: '#/components/schemas/NFType'
         allowedNfDomains:
           type: array
           items: 
@@ -1050,7 +1050,7 @@ components:
         servingNfTypeList:
           type: array
           items:
-            $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType'
+            $ref: '#/components/schemas/NFType'
           minItems: 1
         mlAnalyticsList:
           type: array
@@ -1523,7 +1523,7 @@ components:
         servingNfTypeList:
           type: array
           items:
-            $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType'
+            $ref: '#/components/schemas/NFType'
           minItems: 1
         servingNfSetIdList:
           type: array
@@ -1545,7 +1545,7 @@ components:
         servingNfTypeList:
           type: array
           items:
-            $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType'
+            $ref: '#/components/schemas/NFType'
         servingNfSetIdList:
           type: array
           items:
@@ -2925,7 +2925,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:
@@ -3075,6 +3177,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_N2:
@@ -3188,6 +3291,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:
@@ -3244,6 +3348,7 @@ components:
                     upfInfo:
                       $ref: '#/components/schemas/UpfInfo'        
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
         - type: object
           properties:
             EP_N3:
@@ -3271,6 +3376,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:
@@ -3304,6 +3410,7 @@ components:
                     dynamic5QISetRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
         - type: object
           properties:
             EP_N5:
@@ -3344,6 +3451,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:
@@ -3375,6 +3483,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:
@@ -3408,6 +3517,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'
@@ -3427,6 +3537,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'
@@ -3448,6 +3559,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:
@@ -3477,6 +3589,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:
@@ -3506,6 +3619,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:
@@ -3539,6 +3653,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:
@@ -3564,6 +3679,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:
@@ -3589,6 +3705,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:
@@ -3634,7 +3751,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'
@@ -3652,6 +3769,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:
@@ -3679,6 +3797,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:
@@ -3711,6 +3830,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:
@@ -3735,6 +3855,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:
@@ -3767,6 +3888,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:
@@ -3822,6 +3944,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'
@@ -3835,6 +3958,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'
@@ -3848,6 +3972,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'
@@ -3865,7 +3990,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'
@@ -4630,6 +4755,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:
@@ -4664,6 +4790,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'
@@ -4715,6 +4842,7 @@ components:
                     dccfInfo:
                       $ref: '#/components/schemas/DccfInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
 
     MfafFunction-Single:
       allOf:
@@ -4737,6 +4865,7 @@ components:
                     mfafInfo:
                       $ref: '#/components/schemas/MfafInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
 
     ChfFunction-Single:
       allOf:
@@ -4759,6 +4888,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:
@@ -4921,6 +5051,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:
@@ -4954,6 +5085,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:
@@ -5077,6 +5209,7 @@ components:
                     bsfInfo:
                       $ref: '#/components/schemas/BsfInfo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
+        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
 
     MbSmfFunction-Single:
       allOf:
@@ -5097,6 +5230,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:
@@ -5170,6 +5304,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:
@@ -5200,6 +5335,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:
@@ -5322,9 +5458,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:
@@ -5762,7 +5935,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:
@@ -5788,6 +5964,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/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index b7978e4b5bb25cb6922dedaa08ed508b7bab77b3..04139e9b5ca2749c8b7dc89a2ef56e697c39baa5 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
@@ -542,8 +442,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'
 
@@ -565,32 +463,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'
@@ -718,10 +591,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:
@@ -761,7 +630,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'