diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml
index a4afbb61980a9559233a8694183f95ddd92ff75f..01a77f34a674a41a48f47a40cf7fd898f92e2200 100644
--- a/OpenAPI/TS28105_AiMlNrm.yaml
+++ b/OpenAPI/TS28105_AiMlNrm.yaml
@@ -30,11 +30,19 @@ components:
         aIMLEntityVersion:
           type: string
         expectedRunTimeContext:
-          type: string
+          $ref: '#/components/schemas/AIMLContext'
         trainingContext:
-          type: string
+          $ref: '#/components/schemas/AIMLContext'
         runTimeContext:
-          type: string
+          $ref: '#/components/schemas/AIMLContext'
+
+    AIMLContext:
+      type: object
+      properties:
+        inferenceEntityRef:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
+        dataProviderRef:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
 
     RequestStatus:
       type: string
diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml
index 54a5bc02897db7b099b1c00c21218af54a66fe62..cb4d86c57484114e55ab97c158acf8177a137319 100644
--- a/OpenAPI/TS28312_IntentNrm.yaml
+++ b/OpenAPI/TS28312_IntentNrm.yaml
@@ -12,7 +12,6 @@ externalDocs:
 paths: {}
 components:
   schemas:
-
     Intent-Single:
       allOf:
       - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'    
@@ -23,14 +22,22 @@ components:
           intentExpectations:
             type: array
             items:
-              $ref: "#/components/schemas/IntentExpectation"
+              type: object
+              oneOf:
+                - $ref: "#/components/schemas/IntentExpectation"
+                - $ref: "#/components/schemas/RadioNetworkExpectation"
+                - $ref: "#/components/schemas/ServiceSupportExpectation"                
           intentContexts:
             type: array
             items:
               $ref: "#/components/schemas/IntentContext"
           intentFulfilmentInfo:
             $ref: "#/components/schemas/FulfilmentInfo"
+
+   #-------Definition of the IntentExpectation dataType ----------#    
     IntentExpectation:
+      description: >-
+        This data type is the "IntentExpectation" data type without specialisations
       type: object
       properties:
         expectationId:
@@ -50,9 +57,82 @@ components:
           items:
             $ref: "#/components/schemas/ExpectationContext"
         expectationfulfilmentInfo:
-            $ref: "#/components/schemas/FulfilmentInfo"
-    
+            $ref: "#/components/schemas/FulfilmentInfo"            
+    RadioNetworkExpectation:
+      description: >-
+        This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for radio network  delivering and performance assurance    
+      type: object
+      properties:
+        expectationId:
+          type: string
+        expectationVerb:
+           $ref: "#/components/schemas/ExpectationVerb"
+        expectationObjects:
+          type: array
+          items:
+            $ref: "#/components/schemas/RadioNetworkExpectationObject"
+        expectationTargets:
+          type: array
+          items:
+            type: object
+            oneOf:
+              - $ref: "#/components/schemas/WeakRSRPRatioTarget"
+              - $ref: "#/components/schemas/LowSINRRatioTarget"
+              - $ref: "#/components/schemas/AveULRANUEThptTarget"
+              - $ref: "#/components/schemas/AveDLRANUEThptTarget"
+              - $ref: "#/components/schemas/LowULRANUEThptRatioTarget"
+              - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget" 
+              - $ref: "#/components/schemas/ExpectationTarget"
+        expectationContexts:
+          type: array
+          items:
+            $ref: "#/components/schemas/ExpectationContext"
+        expectationfulfilmentInfo:
+            $ref: "#/components/schemas/FulfilmentInfo"                  
+    ServiceSupportExpectation:
+      description: >-
+        This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for service deployment    
+      type: object
+      properties:
+        expectationId:
+          type: string
+        expectationVerb:
+           $ref: "#/components/schemas/ExpectationVerb"
+        expectationObjects:
+          type: array
+          items:
+            $ref: "#/components/schemas/ServiceSupportExpectationObject"
+        expectationTargets:
+          type: array
+          items:
+            type: object
+            oneOf:
+              - $ref: "#/components/schemas/DLThptPerUETarget"
+              - $ref: "#/components/schemas/ULThptPerUETarget"
+              - $ref: "#/components/schemas/DLLatencyTarget"
+              - $ref: "#/components/schemas/ULLatencyTarget"
+              - $ref: "#/components/schemas/MaxNumberofUEsTarget"
+              - $ref: "#/components/schemas/ActivityFactorTarget"
+              - $ref: "#/components/schemas/UESpeedTarget"
+              - $ref: "#/components/schemas/ExpectationTarget"
+        expectationContexts:
+          type: array
+          items:
+            type: object
+            oneOf:
+              - $ref: "#/components/schemas/ServiceStartTimeContext"
+              - $ref: "#/components/schemas/ServiceEndTimeContext"
+              - $ref: "#/components/schemas/UEMobilityLevelContext"
+              - $ref: "#/components/schemas/ResourceSharingLevelContext"
+              - $ref: "#/components/schemas/ExpectationContext"
+        expectationfulfilmentInfo:
+            $ref: "#/components/schemas/FulfilmentInfo"              
+   #-------Definition of the IntentExpectation dataType ----------#    
+
+   #-------Definition of the ExpectationObject dataType ----------#    
     ExpectationObject:
+      description: >-
+        This data type is the "ExpectationObject" data type without specialisations
       type: object
       properties:
         objectType:
@@ -66,70 +146,52 @@ components:
         objectContexts:
           type: array
           items:
-            $ref: "#/components/schemas/ObjectContext"            
-    
-    ExpectationTarget:
-      oneOf:
-      #--ExpectationTargets defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)- #      
-        - $ref: "#/components/schemas/WeakRSRPRatioTarget"
-        - $ref: "#/components/schemas/LowSINRRatioTarget"
-        - $ref: "#/components/schemas/AveULRANUEThptTarget"
-        - $ref: "#/components/schemas/AveDLRANUEThptTarget"
-        - $ref: "#/components/schemas/LowULRANUEThptRatioTarget"
-        - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget"
-      #--ExpectationTargets defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)- #   
-      #--ExpectationTargets defind for Service Support Expectation (ObjectType is ServiceSupport)- #
-        - $ref: "#/components/schemas/DLThptPerUETarget"
-        - $ref: "#/components/schemas/ULThptPerUETarget"
-        - $ref: "#/components/schemas/DLLatencyTarget"
-        - $ref: "#/components/schemas/ULLatencyTarget"
-        - $ref: "#/components/schemas/MaxNumberofUEsTarget"
-        - $ref: "#/components/schemas/ActivityFactorTarget"
-        - $ref: "#/components/schemas/UESpeedTarget"
-     #--ExpectationTargets defind for Service Support Expectation (ObjectType is ServiceSupport)- #
-      #--ExpectationTargets defind for other Scenario specific Expectation-----TBD---------------# 
-      #--ExpectationTargets defind for other Scenario specific Expectation-----TBD---------------# 
-    
-    
-    ObjectContext:
-      oneOf:
-      #--ObjectContext defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)-------#          
-        - $ref: "#/components/schemas/CoverageAreaPolygonContext"
-        - $ref: "#/components/schemas/CoverageTACContext"
-        - $ref: "#/components/schemas/PLMNContext"
-        - $ref: "#/components/schemas/NRFqBandContext"
-        - $ref: "#/components/schemas/RATContext"
-      #--ObjectContext defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)-------#   
-      #--ObjectContext defind for Service Support Expectation (ObjectType is ServiceSupport)-------#
-        - $ref: "#/components/schemas/EdgeIdenfiticationIdContext"
-        - $ref: "#/components/schemas/EdgeIdenfiticationLocContext"
-        - $ref: "#/components/schemas/CoverageAreaTAContext"
-      #--ObjectContext defind for Service Support Expectation (ObjectType is ServiceSupport)-------#
-
-      #--ObjectContext defind for other Scenario specific Expectation -----------TBD------------#  
-      #--ObjectContext defind for other Scenario specific Expectation -----------TBD------------#  
-
- 
-    ExpectationContext:
-      oneOf:
-     #--ExpectationContext defind for Service Support Expectation (ObjectType is Service_Support)- #
-        - $ref: "#/components/schemas/ServiceStartTimeContext"
-        - $ref: "#/components/schemas/ServiceEndTimeContext"
-        - $ref: "#/components/schemas/UEMobilityLevelContext"
-        - $ref: "#/components/schemas/ResourceSharingLevelContext"
-     #--ExpectationContext defind for Service Support Expectation (ObjectType is Service_Support)- #   
-
-    IntentContext:
+            $ref: "#/components/schemas/ObjectContext"           
+    RadioNetworkExpectationObject:
+      description: >-
+        This data type is the "ExpectationObject" data type with specialisations for RadioNetworkExpectation
       type: object
       properties:
-        contextAttribute:
+        objectType:
           type: string
-        contextCondition:
-          $ref: "#/components/schemas/Condition"
-        contextValueRange:
+          enum:
+            - RAN_SubNetwrok  #value for Radio Network Expectation--#
+        objectInstance:
+          $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn"
+        objectContexts:
           type: array
           items:
-            type: number 
+            type: object
+            oneOf:
+              - $ref: "#/components/schemas/CoverageAreaPolygonContext"
+              - $ref: "#/components/schemas/CoverageTACContext"
+              - $ref: "#/components/schemas/PLMNContext"
+              - $ref: "#/components/schemas/NRFqBandContext"
+              - $ref: "#/components/schemas/RATContext"
+              - $ref: "#/components/schemas/ObjectContext"               
+    ServiceSupportExpectationObject: 
+      description: >-
+        This data type is the "ExpectationObject" data type with specialisations for ServiceSupportExpectation
+      type: object
+      properties:
+        objectType:
+          type: string
+          enum:
+            - Service_Support  #value for Radio Network Expectation--#
+        objectInstance:
+          $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn"
+        objectContexts:
+          type: array
+          items:
+            type: object
+            oneOf:
+              - $ref: "#/components/schemas/EdgeIdenfiticationIdContext"
+              - $ref: "#/components/schemas/EdgeIdenfiticationLocContext"
+              - $ref: "#/components/schemas/CoverageAreaTAContext"   
+              - $ref: "#/components/schemas/ObjectContext"   
+   #-------Definition of the ExpectationObject dataType ----------#    
+
+   #-------Definition of the generic dataType --------------#    
     Condition:
       type: string
       enum:
@@ -137,13 +199,11 @@ components:
         - Is_less_than
         - Is_greater_than
         - Is_within_the_range
-
     FulfilStatus:
       type: string
       enum:
           - FULFILLED
           - NOT_FULFILLED
-
     NotFulfilledState:
       type: string
       enum:
@@ -153,7 +213,6 @@ components:
           - SUSPENDED
           - TERMINATED
           - FULFILMENTFAILED
-
     FulfilmentInfo:
       type: object
       properties:
@@ -167,15 +226,59 @@ components:
           description: ->
             An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo
           type: string
-
     ExpectationVerb:
       type: string
       enum:
           - DELIVER
           - ENSURE
+   #-------Definition of the generic dataType --------------#    
 
-   #-------Definition of the concrete ExpectationTarget dataType----------#     
+   #-------Definition of the IntentContext dataType --------------#    
+    IntentContext:
+      description: >-
+        This data type is the "IntentContext" data type without specialisations
+      type: object
+      properties:
+        contextAttribute:
+          type: string
+        contextCondition:
+          $ref: "#/components/schemas/Condition"
+        contextValueRange:
+          type: array
+          items:
+            type: number 
+   #-------Definition of the IntentContext dataType --------------#   
+   
+   #-------Definition of the ExpectationTarget dataType----------#     
+    ExpectationTarget:
+      description: >-
+        This data type is the "ExpectationTarget" data type without specialisations
+      type: object
+      properties:
+        targetName:
+          type: string
+        targetCondition:
+          $ref: "#/components/schemas/Condition"
+        targetValueRange:
+          type: number
+        targetContexts:
+          type: array
+          items:
+            $ref: "#/components/schemas/TargetContext"
+    TargetContext:
+      description: >-
+        This data type is the "TargetContext" data type without specialisations
+      type: object
+      properties:
+        contextAttribute:
+          type: string
+        contextCondition:
+          $ref: "#/components/schemas/Condition"
+        contextValueRange:
+          type: number        
     WeakRSRPRatioTarget:
+      description: >-
+        This data type is the "ExpectationTarget" data type with specialisations for WeakRSRPRatioTarget
       type: object
       properties:
         targetName:
@@ -194,8 +297,9 @@ components:
           $ref: "#/components/schemas/WeakRSRPContext"
         targetFulfilmentInfo:
           $ref: "#/components/schemas/FulfilmentInfo"
-
     WeakRSRPContext:
+      description: >-
+        This data type is the "TargetContext" data type with specialisations for WeakRSRPContext
       type: object
       properties:
         contextAttribute:
@@ -208,8 +312,9 @@ components:
             - Is_less_than
         contextValueRange:
           type: number
-
     LowSINRRatioTarget:
+      description: >-
+        This data type is the "ExpectationTarget" data type with specialisations for LowSINRatioTarget
       type: object
       properties:
         targetName:
@@ -228,8 +333,9 @@ components:
           $ref: "#/components/schemas/LowSINRContext"
         targetFulfilmentInfo:
           $ref: "#/components/schemas/FulfilmentInfo"
-
     LowSINRContext:
+      description: >-
+        This data type is the "TargetContext" data type with specialisations for LowSINRContext
       type: object
       properties:
         contextAttribute:
@@ -242,8 +348,9 @@ components:
             - Is_less_than
         contextValueRange:
           type: integer
-
     AveULRANUEThptTarget:
+      description: >-
+        This data type is the "ExpectationTarget" data type with specialisations for AveULRANUEThptTarget
       type: object
       properties:
         targetName:
@@ -258,8 +365,9 @@ components:
           type: integer
         targetFulfilmentInfo:
           $ref: "#/components/schemas/FulfilmentInfo"
-
     AveDLRANUEThptTarget:
+      description: >-
+        This data type is the "ExpectationTarget" data type with specialisations for AveDLRANUEThptTarget    
       type: object
       properties:
         targetName:
@@ -274,8 +382,9 @@ components:
           type: integer
         targetFulfilmentInfo:
           $ref: "#/components/schemas/FulfilmentInfo"
-
     LowULRANUEThptRatioTarget:
+      description: >-
+        This data type is the "ExpectationTarget" data type with specialisations for LowULRANUEThptRatioTarget        
       type: object
       properties:
         targetName:
@@ -294,8 +403,9 @@ components:
           $ref: "#/components/schemas/LowULRANUEThptContext"
         targetFulfilmentInfo:
           $ref: "#/components/schemas/FulfilmentInfo"
-
     LowULRANUEThptContext:
+      description: >-
+        This data type is the "TargetContext" data type with specialisations for LowULRANUEThptContext    
       type: object
       properties:
         contextAttribute:
@@ -308,8 +418,9 @@ components:
             - Is_less_than
         contextValueRange:
           type: number
-
     LowDLRANUEThptRatioTarget:
+      description: >-
+        This data type is the "ExpectationTarget" data type with specialisations for LowDLRANUEThptRatioTarget         
       type: object
       properties:
         targetName:
@@ -328,8 +439,9 @@ components:
           $ref: "#/components/schemas/LowDLRANUEThptContext"
         targetFulfilmentInfo:
           $ref: "#/components/schemas/FulfilmentInfo"
-
     LowDLRANUEThptContext:
+      description: >-
+        This data type is the "TargetContext" data type with specialisations for LowDLRANUEThptContext      
       type: object
       properties:
         contextAttribute:
@@ -343,6 +455,8 @@ components:
         contextValueRange:
           type: number
     DLThptPerUETarget:
+      description: >-
+        This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget       
       type: object
       properties:
         targetName:
@@ -356,6 +470,8 @@ components:
         targetValueRange:
           $ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt"
     ULThptPerUETarget:
+      description: >-
+        This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget       
       type: object
       properties:
         targetName:
@@ -369,6 +485,8 @@ components:
         targetValueRange:
           $ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt"
     DLLatencyTarget:
+      description: >-
+        This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget       
       type: object
       properties:
         targetName:
@@ -382,6 +500,8 @@ components:
         targetValueRange:
           type: integer
     ULLatencyTarget:
+      description: >-
+        This data type is the "ExpectationTarget" data type with specialisations for ULLatencyTarget     
       type: object
       properties:
         targetName:
@@ -395,6 +515,8 @@ components:
         targetValueRange:
           type: integer
     MaxNumberofUEsTarget:
+      description: >-
+        This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofUEsTarget     
       type: object
       properties:
         targetAttribute:
@@ -408,6 +530,8 @@ components:
         targetValueRange:
           type: integer
     ActivityFactorTarget:
+      description: >-
+        This data type is the "ExpectationTarget" data type with specialisations for ActivityFactorTarget       
       type: object
       properties:
         targetAttribute:
@@ -421,6 +545,8 @@ components:
         targetValueRange:
           type: integer
     UESpeedTarget:
+      description: >-
+        This data type is the "ExpectationTarget" data type with specialisations for UESpeedTarget      
       type: object
       properties:
         targetAttribute:
@@ -433,11 +559,25 @@ components:
             - Is_less _than
         targetValueRange:
           type: integer
-
    #-------Definition of the concrete ExpectationTarget  dataType----------#  
    
-   #-------Definition of the concrete ObjectTarget dataType----------------#  
+   #-------Definition of the concrete ObjectTarget dataType----------------#
+    ObjectContext:
+      description: >-
+        This data type is the "ObjectContext" data type without specialisations        
+      type: object
+      properties:
+        contextAttribute:
+          type: string
+        contextCondition:
+          $ref: "#/components/schemas/Condition"
+        contextValueRange:
+          type: array
+          items:
+            type: number 
     CoverageAreaPolygonContext:
+      description: >-
+        This data type is the "ObjectContext" data type with specialisations for CoverageAreaPolygonContext          
       type: object
       properties:
         contextAttribute:
@@ -455,6 +595,8 @@ components:
     CoverageArea:
       type: string
     CoverageTACContext:
+      description: >-
+        This data type is the "ObjectContext" data type with specialisations for CoverageTACContext     
       type: object
       properties:
         contextAttribute:
@@ -469,8 +611,9 @@ components:
           type: array
           items:
             $ref: "TS28541_NrNrm.yaml#/components/schemas/NrTac"
-
     PLMNContext:
+      description: >-
+        This data type is the "ObjectContext" data type with specialisations for PLMNContext       
       type: object
       properties:
         contextAttribute:
@@ -485,8 +628,9 @@ components:
           type: array
           items:
             $ref: "TS28541_NrNrm.yaml#/components/schemas/PlmnId"
-
     NRFqBandContext:
+      description: >-
+        This data type is the "ObjectContext" data type with specialisations for NRFqBandContext       
       type: object
       properties:
         contextAttribute:
@@ -501,8 +645,9 @@ components:
           type: array
           items:
             type: string
-
     RATContext:
+      description: >-
+        This data type is the "ObjectContext" data type with specialisations for RATContext           
       type: object
       properties:
         contextAttribute:
@@ -522,6 +667,8 @@ components:
               - EUTRAN
               - NR
     EdgeIdenfiticationIdContext:
+      description: >-
+        This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationIdContext      
       type: object
       properties:
         contextAttribute:
@@ -537,6 +684,8 @@ components:
           items:
             type: string
     EdgeIdenfiticationLocContext:
+      description: >-
+        This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationLocContext    
       type: object
       properties:
         contextAttribute:
@@ -552,6 +701,8 @@ components:
           items:
             type: string
     CoverageAreaTAContext:
+      description: >-
+        This data type is the "ObjectContext" data type with specialisations for CoverageAreaTAContext       
       type: object
       properties:
         contextAttribute:
@@ -568,10 +719,25 @@ components:
             $ref: "#/components/schemas/CoverageAreaTAList"
     CoverageAreaTAList:
           type: integer
-
    #-------Definition of the concrete ObjectTarget dataType----------------#
+   
    #-------Definition of the concrete ExpectionContext dataType----------------#
+    ExpectationContext:
+      description: >-
+        This data type is the "ExpectationContext" data type without specialisations       
+      type: object
+      properties:
+        contextAttribute:
+          type: string
+        contextCondition:
+          $ref: "#/components/schemas/Condition"
+        contextValueRange:
+          type: array
+          items:
+            type: number 
     ServiceStartTimeContext:
+      description: >-
+        This data type is the "ExpectationContext" data type with specialisations for ServiceStartTimeContext       
       type: object
       properties:
         contextAttribute:
@@ -585,6 +751,8 @@ components:
         contextValueRange:
           type: string
     ServiceEndTimeContext:
+      description: >-
+        This data type is the "ExpectationContext" data type with specialisations for ServiceEndTimeContext         
       type: object
       properties:
         contextAttribute:
@@ -598,6 +766,8 @@ components:
         contextValueRange:
           type: string
     UEMobilityLevelContext:
+      description: >-
+        This data type is the "ExpectationContext" data type with specialisations for UEMobilityLevelContext       
       type: object
       properties:
         contextAttribute:
@@ -613,6 +783,8 @@ components:
           items:
             $ref: "TS28541_SliceNrm.yaml#/components/schemas/MobilityLevel"
     ResourceSharingLevelContext:
+      description: >-
+        This data type is the "ExpectationContext" data type with specialisations for ResourceSharingLevelContext          
       type: object
       properties:
         contextAttribute:
diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml
index fbe3805380da9e9edab64088d822f2ef87b1d197..c531829770230566402fc94297431f7dbecccf40 100755
--- a/OpenAPI/TS28532_ProvMnS.yaml
+++ b/OpenAPI/TS28532_ProvMnS.yaml
@@ -426,7 +426,10 @@ components:
             - $ref: 'TS28541_NrNrm.yaml#/components/schemas/resources-nrNrm'
             - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/resources-5gcNrm'
             - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/resources-sliceNrm'
-            - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/resources-intentNrm'            
+            - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/resources-coslaNrm'            
+            - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/resources-intentNrm'
+            - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/resources-mdaNrm'
+            - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/resources-AiMlNrm'                           
 
     MoiChange:
       type: object
diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml
index 62753ce70484acb535ea2f6fb4c73bcfb41749bd..4b3554df76be35f34fadedd3afce3ccb10a07c76 100644
--- a/OpenAPI/TS28538_EdgeNrm.yaml
+++ b/OpenAPI/TS28538_EdgeNrm.yaml
@@ -86,15 +86,6 @@ components:
           type: string
         swImageRef:
           type: string
-    RegistrationInfo:
-      type: object
-      properties:
-        registrationExpiry:
-          type: string
-        registrationID:
-          type: string
-        secCredential:
-          type: string
 
 #-------- Definition of concrete IOCs --------------------------------------------
     MnS:
@@ -156,14 +147,10 @@ components:
                         type: string
                     eASRequirementsRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
-                    eESFunctionRef:
-                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
                     eASAddress:
                       type: array
                       items:
                         type: string
-                    registrationInfo:
-                      $ref: '#/components/schemas/RegistrationInfo'  
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
     EESFunction-Single:
       allOf:
@@ -189,10 +176,8 @@ components:
                       $ref: '#/components/schemas/SoftwareImageInfo'
                     serviceContinuitySupport:
                       type: boolean
-                    eASFunctionRef:
+                    eASFunctonRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'  
-                    registrationInfo:
-                      $ref: '#/components/schemas/RegistrationInfo'  
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
 
     ECSFunction-Single:
diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml
index b62b132c7e921824f551691254d5ed434d693281..a50921f0bfd2d564db195c8b76ed981c0ac4b5b8 100755
--- a/OpenAPI/TS28541_5GcNrm.yaml
+++ b/OpenAPI/TS28541_5GcNrm.yaml
@@ -741,6 +741,8 @@ components:
               $ref: '#/components/schemas/Dynamic5QISet-Multiple'
             EcmConnectionInfo:
               $ref: '#/components/schemas/EcmConnectionInfo-Multiple'
+            EASDFFunction:
+              $ref: '#/components/schemas/EASDFFunction-Multiple'
 
     AmfFunction-Single:
       allOf:
@@ -752,8 +754,8 @@ components:
                 - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
-                    plmnIdList:
-                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList'
+                    pLMNInfoList:
+                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList'
                     amfIdentifier:
                       $ref: '#/components/schemas/AmfIdentifier'
                     sBIFqdn:
@@ -768,8 +770,6 @@ components:
                         $ref: '#/components/schemas/TaiRange'
                     weightFactor:
                       $ref: '#/components/schemas/WeightFactor'
-                    snssaiList:
-                      $ref: '#/components/schemas/SnssaiList'
                     cNSIIdList:
                       $ref: '#/components/schemas/CNSIIdList'
                     gUAMIdList:
@@ -880,9 +880,7 @@ components:
                       items:
                         $ref: '#/components/schemas/SNssaiSmfInfoItem'
                     taiList:
-                      type: array
-                      items:
-                        $ref: 'TS28541_NrNrm.yaml#/components/schemas/Tai'
+                      $ref: '#/components/schemas/TaiList'
                     taiRangeList:
                       type: array
                       items:
@@ -1338,8 +1336,7 @@ components:
                     isCAPIFSup:
                       type: boolean
                     taiList:
-                      items:
-                        $ref: '#/components/schemas/TaiList'
+                      $ref: '#/components/schemas/TaiList'
                     taiRangeList:
                       type: array
                       items:
@@ -1369,8 +1366,7 @@ components:
                       items:
                         $ref: '#/components/schemas/NsacfInfoSnssai'
                     taiList:
-                      items:
-                        $ref: '#/components/schemas/TaiList'
+                      $ref: '#/components/schemas/TaiList'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
@@ -1428,8 +1424,8 @@ components:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
-            EP_Nxx:
-              $ref: '#/components/schemas/EP_Nxx-Multiple'
+            EP_N88:
+              $ref: '#/components/schemas/EP_N88-Multiple'
 
     EcmConnectionInfo-Single:
       allOf:
@@ -2029,7 +2025,7 @@ components:
                     remoteAddress:
                       $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'
                       
-    EP_Nxx-Single:
+    EP_N88-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
         - type: object
@@ -2094,9 +2090,7 @@ components:
                 - type: object
                   properties:
                     configurable5QIs:
-                      type: array
-                      items:
-                        $ref: '#/components/schemas/FiveQICharacteristics-Multiple'  
+                      $ref: '#/components/schemas/FiveQICharacteristics-Multiple'  
    
     Dynamic5QISet-Single:
       allOf:
@@ -2108,9 +2102,7 @@ components:
                 - type: object
                   properties:
                     dynamic5QIs:
-                      type: array
-                      items:
-                        $ref: '#/components/schemas/FiveQICharacteristics-Multiple'                           
+                      $ref: '#/components/schemas/FiveQICharacteristics-Multiple'                           
                       
     GtpUPathQoSMonitoringControl-Single:
       allOf:
@@ -2313,7 +2305,12 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/AmfRegion-Single'
-  
+
+    EASDFFunction-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/EASDFFunction-Single'
+
     EP_N2-Multiple:
       type: array
       items:
@@ -2457,10 +2454,10 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/EP_Npc8-Single'
-    EP_Nxx-Multiple:
+    EP_N88-Multiple:
       type: array
       items:
-        $ref: '#/components/schemas/EP_Nxx-Single'
+        $ref: '#/components/schemas/EP_N88-Single'
     Configurable5QISet-Multiple:
       type: array
       items:
@@ -2543,7 +2540,7 @@ components:
        - $ref: '#/components/schemas/EP_N32-Single'
        - $ref: '#/components/schemas/EP_N33-Single'       
        - $ref: '#/components/schemas/EP_N60-Single'
-       - $ref: '#/components/schemas/EP_Nxx-Single'
+       - $ref: '#/components/schemas/EP_N88-Single'
 
        - $ref: '#/components/schemas/EP_Npc4-Single'
        - $ref: '#/components/schemas/EP_Npc6-Single'
diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index 81e0ffdb88d5cf4da1b083b21eb4f53320f4feae..419f054dbc87035322848c808b7155395d11ff14 100755
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -109,6 +109,10 @@ components:
     NrTac:
       type: integer
       maximum: 16777215
+    NrTacList:
+      type: array
+      items:
+        $ref: '#/components/schemas/NrTac'
     Tai:
       type: object
       properties:
diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml
index 2ea8a2b41973b2b6806e8982a56e4dbc1ae7717b..48c5ceb8fd116158e39988aeaf4da661759b18b5 100755
--- a/OpenAPI/TS28541_SliceNrm.yaml
+++ b/OpenAPI/TS28541_SliceNrm.yaml
@@ -60,13 +60,6 @@ components:
         - SHARED
         - NON-SHARED
 
-    ServiceType:
-      type: string
-      enum:
-        - eMBB
-        - RLLC
-        - MIoT
-        - V2X
     SliceSimultaneousUse:
       type: string
       enum:
@@ -321,7 +314,7 @@ components:
         maxNumberOfPDUSessions:
           type: integer
         coverageAreaTAList:
-          type: integer
+          $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTacList'
         resourceSharingLevel:
           $ref: '#/components/schemas/SharingLevel'
         dLMaxPktSize:
@@ -352,7 +345,7 @@ components:
       type: object
       properties:
         coverageAreaTAList:
-          type: integer
+          $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTacList'
         dLLatency:
           type: number
         uLLatency:
@@ -377,8 +370,8 @@ components:
           type: integer
         reliability:
           type: number
-        serviceType:
-          $ref: '#/components/schemas/ServiceType'
+        sST:
+          $ref: 'TS28541_NrNrm.yaml#/components/schemas/Sst'
         dLMaxPktSize:
           type: integer
         uLMaxPktSize:
@@ -443,7 +436,7 @@ components:
         activityFactor:
           type: integer
         coverageAreaTAList:
-          type: integer
+          $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTacList'
         resourceSharingLevel:
           $ref: '#/components/schemas/SharingLevel'
         uEMobilityLevel:
@@ -452,14 +445,18 @@ components:
           type: integer
         reliability:
           type: number
-        serviceType:
-          $ref: '#/components/schemas/ServiceType'
+        sST:
+          $ref: 'TS28541_NrNrm.yaml#/components/schemas/Sst'
         dLDeterministicComm:
           $ref: '#/components/schemas/DeterministicComm'
         uLDeterministicComm:
           $ref: '#/components/schemas/DeterministicComm'
         survivalTime:
           type: number
+        nssaaSupport:
+          $ref: '#/components/schemas/NSSAASupport'
+        n6Protection:
+          $ref: '#/components/schemas/N6Protection'
 
     ServiceProfile:
       type: object
@@ -531,9 +528,9 @@ components:
           reliability:
             type: number
           maxDLDataVolume:
-            type: string
+            type: number
           maxULDataVolume:
-            type: string
+            type: number
           sliceSimultaneousUse:
             $ref: '#/components/schemas/SliceSimultaneousUse'
           energyEfficiency:
@@ -583,30 +580,30 @@ components:
       items:
         $ref: '#/components/schemas/SliceProfile'
     FeasibilityResult:
-      description: ->
-        An attribute which specifies the feasibility check result for the feasibility check job.
+      description: >-
+        An attribute which specifies the feasibility check result for the feasibility check and reservation job.
       type: string
       enum:
         - FEASIBLE
         - INFEASIBLE
     InFeasibleReason:
-      description: ->
+      description: >-
         An attribute that specifies the additional reason information if the feasibility check result is infeasible.The detailed ENUM value is FFS. 
       type: string
     RecommendedRequirements:
-      description: ->
+      description: >-
         An attribute that specifies the recommended network slicing related requirements (i.e. ServiceProfile and SliceProfile information) which can be supported by the MnS producer.. 
       type: string
     ResourceReservation:
-      description: ->
+      description: >-
         An attribute represents MnS consumer's requirements for resource reservation.
       type: boolean
     RequestedReservationExpiration:
-      description: ->
+      description: >-
         An attribute which specifes MnS consuner's requirements for the validity period of the resource reservation.
       type: string
     ResourceReservationStatus:
-      description: ->
+      description: >-
         An attribute which specifies the resource reservation result for the feasibility check job.
       type: string
       enum:
@@ -614,11 +611,11 @@ components:
         - UNRESERVED
         - USED
     ReservationExpiration:
-      description: ->
+      description: >-
         An attribute which specifes the actual validity period of the resource reservation..
       type: string
     ReservationFailureReason:
-      description: ->
+      description: >-
         An attribute that specifies the additional reason information if the reservation is failed. 
       type: string
 
@@ -658,8 +655,8 @@ components:
               $ref: '#/components/schemas/EP_Transport-Multiple'
             NetworkSliceSubnetProviderCapabilities:
               $ref: '#/components/schemas/NetworkSliceSubnetProviderCapabilities-Multiple'
-            FeasibilityCheckJob:
-              $ref: '#/components/schemas/FeasibilityCheckJob-Multiple'
+            FeasibilityCheckAndReservationJob:
+              $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Multiple'
 
 
     NetworkSlice-Single:
@@ -747,11 +744,9 @@ components:
                   $ref: '#/components/schemas/XLThpt'
                 uLThptPerSliceSubnet:
                   $ref: '#/components/schemas/XLThpt'
-                coverageAreaTAIList:
-                  type: array
-                  items:
-                    type: string
-    FeasibilityCheckJob-Single:
+                coverageAreaTAList:
+                  $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTacList'
+    FeasibilityCheckAndReservationJob-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'     
         - type: object
@@ -764,7 +759,7 @@ components:
                     - $ref: '#/components/schemas/SliceProfile'
                     - $ref: '#/components/schemas/ServiceProfile'
                 resourceReservation:
-                  $ref: '#/components/schemas/ResourceReservation'
+                  $ref: '#/components/schemas/ResourceReservation'              
                 requestedReservationExpiration:
                   $ref: '#/components/schemas/RequestedReservationExpiration'
                 processMonitor:
@@ -808,10 +803,10 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/NetworkSliceSubnetProviderCapabilities-Single'
-    FeasibilityCheckJob-Multiple:
+    FeasibilityCheckAndReservationJob-Multiple:
       type: array
       items:
-        $ref: '#/components/schemas/FeasibilityCheckJob-Single'   
+        $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Single'   
         
 #------------ Definitions in TS 28.541 for TS 28.532 -----------------------------
 
@@ -824,4 +819,4 @@ components:
        - $ref: '#/components/schemas/NetworkSliceSubnet-Single'
        - $ref: '#/components/schemas/EP_Transport-Single'
        - $ref: '#/components/schemas/NetworkSliceSubnetProviderCapabilities-Single'
-       - $ref: '#/components/schemas/FeasibilityCheckJob-Single'       
+       - $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Single'       
diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index adfc72fd66f1a45414370888c8a627baa67bc801..c9834fd84930ae73a25020ff000b3353d070a8be 100755
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -646,6 +646,8 @@ components:
               - N10
               - N11
               - S5-C
+              - N16
+              - N16a
         SMSFInterfaces:
           type: array
           items:
@@ -701,7 +703,7 @@ components:
             enum:
               - F1-C
 
-    listOfNeTypes-Type:
+    listOfNETypes-Type:
       description: The Network Element types where Trace Session activation is needed. See 3GPP TS 32.422 clause 5.4 for additional details.
       type: array
       items:
@@ -730,7 +732,7 @@ components:
           - HSS
           - UDM
 
-    plmnTarget-Type:
+    pLMNTarget-Type:
       type: object
       description: The PLMN for which sessions shall be selected in the Trace Session in case of management based activation when several PLMNs are supported in the RAN (this means that shared cells and not shared cells are allowed for the specified PLMN. Note that the PLMN Target might differ from the PLMN specified in the Trace Reference, as that specifies the PLMN that is containing the management system requesting the Trace Session from the NE. See 3GPP TS 32.422 clause 5.9b for additional details.
       properties:
@@ -957,7 +959,7 @@ components:
               - UEauthentication
               - EventExposure
     
-    anonymizationOfMdtData-Type:
+    anonymizationOfMDTData-Type:
       description: Specifies level of MDT anonymization. For additional details see 3GPP TS 32.422 clause 5.10.12.
       type: string
       enum:
@@ -968,7 +970,7 @@ components:
       description: Determines whether beam level measurements shall be included in case of immediate MDT M1 measurement in NR. For additional details see 3GPP TS 32.422 clause 5.10.40.
       type: boolean
     
-    collectionPeriodRrmLte-Type:
+    collectionPeriodRRMLTE-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.20.
       type: string
       enum:
@@ -983,7 +985,7 @@ components:
         - 10240ms
         - 60000ms
 
-    collectionPeriodM6Lte-Type:
+    collectionPeriodM6LTE-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.32.
       type: string
       enum:
@@ -992,13 +994,13 @@ components:
         - 5120ms
         - 10240ms
 
-    collectionPeriodM7Lte-Type:
+    collectionPeriodM7LTE-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.33.
       type: integer
       minimum: 1
       maximum: 60
 
-    collectionPeriodRrmUmts-Type:
+    collectionPeriodRRMUMTS-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.21.
       type: string
       enum:
@@ -1011,7 +1013,7 @@ components:
         - 4000ms
         - 6000ms
     
-    collectionPeriodRrmNr-Type:
+    collectionPeriodRRMNR-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.30.
       type: string
       enum:
@@ -1021,7 +1023,7 @@ components:
         - 10240ms
         - 60000ms
 
-    collectionPeriodM6Nr-Type:
+    collectionPeriodM6NR-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.34.
       type: string
       enum:
@@ -1040,7 +1042,7 @@ components:
         - 12min
         - 30min
 
-    collectionPeriodM7Nr-Type:
+    collectionPeriodM7NR-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.35.
       type: integer
       minimum: 1
@@ -1240,7 +1242,7 @@ components:
         - 2560ms
         - 5120ms
 
-    measurementPeriodLte-Type:
+    measurementPeriodLTE-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.23.
       type: string
       enum:
@@ -1250,7 +1252,7 @@ components:
         - 10240ms
         - 1min
 
-    measurementPeriodUmts-Type:
+    measurementPeriodUMTS-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.22.
       type: string
       enum:
@@ -1276,13 +1278,13 @@ components:
         - CPICH_RSCP
         - PathLoss
 
-    eventThresholdUphUmts-Type:
+    eventThresholdUphUMTS-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.A.
       type: integer
       minimum: 0
       maximum: 31
 
-    plmnList-Type:
+    pLMNList-Type:
       description: See details in 3GPP TS 32.422 clause 5.10.24.
       type: array
       items:
@@ -1600,13 +1602,13 @@ components:
           $ref: '#/components/schemas/jobType-Type'
         listOfInterfaces:
           $ref: '#/components/schemas/listOfInterfaces-Type'                  
-        listOfNeTypes:
-          $ref: '#/components/schemas/listOfNeTypes-Type'
-        plmnTarget:
-          $ref: '#/components/schemas/plmnTarget-Type'
+        listOfNETypes:
+          $ref: '#/components/schemas/listOfNETypes-Type'
+        pLMNTarget:
+          $ref: '#/components/schemas/pLMNTarget-Type'
         traceReportingConsumerUri:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
-        traceCollectionEntityIpAddress:
+        traceCollectionEntityIPAddress:
           $ref: '#/components/schemas/IpAddr'
         traceDepth:
           $ref: '#/components/schemas/traceDepth-Type'
@@ -1622,8 +1624,8 @@ components:
           $ref: '#/components/schemas/traceTarget-Type'
         triggeringEvents:
           $ref: '#/components/schemas/triggeringEvents-Type'
-        anonymizationOfMdtData:
-          $ref: '#/components/schemas/anonymizationOfMdtData-Type'
+        anonymizationOfMDTData:
+          $ref: '#/components/schemas/anonymizationOfMDTData-Type'
         areaConfigurationForNeighCell:
           $ref: '#/components/schemas/AreaConfig'
         areaScope:
@@ -1632,20 +1634,20 @@ components:
             $ref: '#/components/schemas/AreaScope'
         beamLevelMeasurement:
           $ref: '#/components/schemas/beamLevelMeasurement-Type'
-        collectionPeriodRrmLte:
-          $ref: '#/components/schemas/collectionPeriodRrmLte-Type'
-        collectionPeriodM6Lte:
-          $ref: '#/components/schemas/collectionPeriodM6Lte-Type'
-        collectionPeriodM7Lte:
-          $ref: '#/components/schemas/collectionPeriodM7Lte-Type'
-        collectionPeriodRrmUmts:
-          $ref: '#/components/schemas/collectionPeriodRrmUmts-Type'
-        collectionPeriodRrmNr:
-          $ref: '#/components/schemas/collectionPeriodRrmNr-Type'
-        collectionPeriodM6Nr:
-          $ref: '#/components/schemas/collectionPeriodM6Nr-Type'
-        collectionPeriodM7Nr:
-          $ref: '#/components/schemas/collectionPeriodM7Nr-Type'
+        collectionPeriodRRMLTE:
+          $ref: '#/components/schemas/collectionPeriodRRMLTE-Type'
+        collectionPeriodM6LTE:
+          $ref: '#/components/schemas/collectionPeriodM6LTE-Type'
+        collectionPeriodM7LTE:
+          $ref: '#/components/schemas/collectionPeriodM7LTE-Type'
+        collectionPeriodRRMUMTS:
+          $ref: '#/components/schemas/collectionPeriodRRMUMTS-Type'
+        collectionPeriodRRMNR:
+          $ref: '#/components/schemas/collectionPeriodRRMNR-Type'
+        collectionPeriodM6NR:
+          $ref: '#/components/schemas/collectionPeriodM6NR-Type'
+        collectionPeriodM7NR:
+          $ref: '#/components/schemas/collectionPeriodM7NR-Type'
         eventListForEventTriggeredMeasurement:
           $ref: '#/components/schemas/eventListForEventTriggeredMeasurement-Type'
         eventThreshold:
@@ -1662,20 +1664,20 @@ components:
           $ref: '#/components/schemas/hysteresisL1-Type'
         timeToTriggerL1:
           $ref: '#/components/schemas/timeToTriggerL1-Type'
-        mbsfnAreaList:
+        mBSFNAreaList:
           type: array
           items:
             $ref: '#/components/schemas/MbsfnArea'
-        measurementPeriodLte:
-          $ref: '#/components/schemas/measurementPeriodLte-Type'
-        measurementPeriodUmts:
-          $ref: '#/components/schemas/measurementPeriodUmts-Type'
+        measurementPeriodLTE:
+          $ref: '#/components/schemas/measurementPeriodLTE-Type'
+        measurementPeriodUMTS:
+          $ref: '#/components/schemas/measurementPeriodUMTS-Type'
         measurementQuantity:
           $ref: '#/components/schemas/measurementQuantity-Type'
-        eventThresholdUphUmts:
-          $ref: '#/components/schemas/eventThresholdUphUmts-Type'
-        plmnList:
-          $ref: '#/components/schemas/plmnList-Type'
+        eventThresholdUphUMTS:
+          $ref: '#/components/schemas/eventThresholdUphUMTS-Type'
+        pLMNList:
+          $ref: '#/components/schemas/pLMNList-Type'
         positioningMethod:
           $ref: '#/components/schemas/positioningMethod-Type'
         reportAmount:
diff --git a/yang-models/_3gpp-common-filemanagement.yang b/yang-models/_3gpp-common-filemanagement.yang
index b2c76e85e0d610626211a4637299fee8d8bf0fd4..34c6d9ae6c4168fa6ad6f585f24c07873eb83d8e 100644
--- a/yang-models/_3gpp-common-filemanagement.yang
+++ b/yang-models/_3gpp-common-filemanagement.yang
@@ -6,6 +6,7 @@ module _3gpp-common-filemanagement {
   import _3gpp-common-subnetwork { prefix subnet3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
   import _3gpp-common-yang-types { prefix yang3gpp; }
+  import _3gpp-common-yang-extensions { prefix yext3gpp; }
   import _3gpp-common-managed-element { prefix me3gpp; }
    
   organization "3GPP SA5";
@@ -14,6 +15,7 @@ module _3gpp-common-filemanagement {
     Class (IOC) that is part of the Generic Network Resource Model (NRM).";
   reference "3GPP TS 28.623 Generic Network Resource Model (NRM)";
 
+  revision 2022-10-31 { reference CR-0195;   }
   revision 2022-02-10 { reference "Initial revision, S5-221757"; }
 
   grouping FileDownloadProcessMonitor {
@@ -50,11 +52,13 @@ module _3gpp-common-filemanagement {
         allowedValues:  File URI (See RFC 8089)";
       mandatory true;
       type string;
+      yext3gpp:notNotifyable;
     }
     
     leaf notificationRecipientAddress {
       description "Address of the notification recipient.";
       type string;
+      yext3gpp:notNotifyable;
     }
 
     leaf cancelJob {
diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang
index 1399a086f6524651ae881b78af17a5c673927bf4..0488b43833687e395a3be7cc273b5a63ac0c867d 100755
--- a/yang-models/_3gpp-common-fm.yang
+++ b/yang-models/_3gpp-common-fm.yang
@@ -6,6 +6,7 @@ module _3gpp-common-fm {
   import ietf-yang-types { prefix yang; }
   import _3gpp-common-top { prefix top3gpp; }
   import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-yang-extensions { prefix yext3gpp; }
 
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -22,6 +23,7 @@ module _3gpp-common-fm {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
+  revision 2022-10-31 { reference CR-0195;   }
   revision 2021-08-08 { reference "CR-0132"; }
   revision 2021-06-02 { reference "CR-0130"; }
   revision 2020-06-03 { reference "CR-0091"; }
@@ -107,58 +109,68 @@ module _3gpp-common-fm {
         type string;
         mandatory true;
         description "Identifies the alarmRecord";
+        yext3gpp:notNotifyable;
       }
 
       leaf objectInstance {
         type string;
         config false ;
         mandatory true;
+        yext3gpp:notNotifyable;
       }
 
       leaf notificationId {
         type int32;
         config false ;
         mandatory true;
+        yext3gpp:notNotifyable;
       }
 
       leaf alarmRaisedTime {
         type yang:date-and-time ;
         config false ;
+        yext3gpp:notNotifyable;
       }
 
       leaf alarmChangedTime {
         type yang:date-and-time ;
         config false ;
         description "not applicable if related alarm has not changed";
+        yext3gpp:notNotifyable;
       }
 
       leaf alarmClearedTime {
         type yang:date-and-time ;
         config false ;
         description "not applicable if related alarm was not cleared";
+        yext3gpp:notNotifyable;
       }
 
       leaf alarmType {
         type eventType;
         config false ;
         description "General category for the alarm.";
+        yext3gpp:notNotifyable;
       }
 
       leaf probableCause {
         type string;
         config false ;
+        yext3gpp:notNotifyable;
       }
 
       leaf specificProblem {
         type string;
         config false ;
         reference "ITU-T Recommendation X.733 clause 8.1.2.2.";
+        yext3gpp:notNotifyable;
       }
 
       leaf perceivedSeverity {
         type severity-level;
         description "This is Writable only if producer supports consumer
           to set perceivedSeverity to CLEARED";
+        yext3gpp:notNotifyable;
       }
 
       leaf backedUpStatus {
@@ -166,11 +178,13 @@ module _3gpp-common-fm {
         config false ;
         description "Indicates if an object (the MonitoredEntity) has a back
           up. See definition in ITU-T Recommendation X.733 clause 8.1.2.4.";
+        yext3gpp:notNotifyable;
       }
 
       leaf backUpObject {
         type string;
         config false ;
+        yext3gpp:notNotifyable;
       }
 
       leaf trendIndication {
@@ -179,6 +193,7 @@ module _3gpp-common-fm {
         description "Indicates if some observed condition is getting better,
           worse, or not changing. ";
         reference "ITU-T Recommendation X.733 clause 8.1.2.6.";
+        yext3gpp:notNotifyable;
       }
 
       grouping ThresholdPackGrp {
@@ -227,6 +242,7 @@ module _3gpp-common-fm {
       list thresholdInfo {
         config false ;
         uses ThresholdInfoGrp;
+        yext3gpp:notNotifyable;
       }
 
       leaf stateChangeDefinition {
@@ -234,6 +250,7 @@ module _3gpp-common-fm {
         config false ;
         description "Indicates MO attribute value changes. See definition
           in ITU-T Recommendation X.733 clause 8.1.2.11.";
+        yext3gpp:notNotifyable;
       }
 
       leaf monitoredAttributes {
@@ -242,6 +259,7 @@ module _3gpp-common-fm {
         description "Indicates MO attributes whose value changes are being
           monitored.";
         reference "ITU-T Recommendation X.733 clause 8.1.2.11.";
+        yext3gpp:notNotifyable;
       }
 
       leaf proposedRepairActions {
@@ -249,15 +267,18 @@ module _3gpp-common-fm {
         config false ;
         description "Indicates proposed repair actions. See definition in
           ITU-T Recommendation X.733 clause 8.1.2.12.";
+        yext3gpp:notNotifyable;
       }
 
       leaf additionalText {
         type string;
         config false ;
+        yext3gpp:notNotifyable;
       }
 
       anydata additionalInformation {
         config false ;
+        yext3gpp:notNotifyable;
       }
 
       leaf rootCauseIndicator {
@@ -269,6 +290,7 @@ module _3gpp-common-fm {
         description "It indicates that this AlarmInformation is the root cause
           of the events captured by the notifications whose identifiers are in
           the related CorrelatedNotification instances.";
+        yext3gpp:notNotifyable;
       }
 
       leaf ackTime  {
@@ -277,12 +299,14 @@ module _3gpp-common-fm {
         description "It identifies the time when the alarm has been
           acknowledged or unacknowledged the last time, i.e. it registers the
           time when ackState changes.";
+        yext3gpp:notNotifyable;
       }
 
       leaf ackUserId  {
         type string;
         description "It identifies the last user who has changed the
           Acknowledgement State.";
+        yext3gpp:notNotifyable;
       }
 
       leaf ackSystemId  {
@@ -290,6 +314,7 @@ module _3gpp-common-fm {
         description "It identifies the system (Management System) that last
           changed the ackState of an alarm, i.e. acknowledged or unacknowledged
           the alarm.";
+        yext3gpp:notNotifyable;
       }
 
       leaf ackState  {
@@ -302,16 +327,19 @@ module _3gpp-common-fm {
               been acknowledged.";
           }
         }
+        yext3gpp:notNotifyable;
       }
 
       leaf clearUserId {
         type string;
         description "Carries the identity of the user who invokes the
           clearAlarms operation.";
+        yext3gpp:notNotifyable;
       }
 
       leaf clearSystemId {
         type string;
+        yext3gpp:notNotifyable;
       }
 
       leaf serviceUser {
@@ -320,6 +348,7 @@ module _3gpp-common-fm {
         description "It identifies the service-user whose request for service
           provided by the serviceProvider led to the generation of the
           security alarm.";
+        yext3gpp:notNotifyable;
       }
 
       leaf serviceProvider {
@@ -328,11 +357,13 @@ module _3gpp-common-fm {
         description "It identifies the service-provider whose service is
           requested by the serviceUser and the service request provokes the
           generation of the security alarm.";
+        yext3gpp:notNotifyable;
       }
 
       leaf securityAlarmDetector {
         type string;
         config false ;
+        yext3gpp:notNotifyable;
       }
   }
 
@@ -361,18 +392,21 @@ module _3gpp-common-fm {
       config false;
       mandatory true;
       description "The number of alarm records in the AlarmList";
+      yext3gpp:notNotifyable;
     }
 
     leaf lastModification {
       type yang:date-and-time ;
       config false;
       description "The last time when an alarm record was modified";
+      yext3gpp:notNotifyable;
     }
 
     list alarmRecords {
       key alarmId;
       description "List of alarmRecords";
       uses AlarmRecordGrp;
+      yext3gpp:notNotifyable;
     }
   }
 
diff --git a/yang-models/_3gpp-common-managed-function.yang b/yang-models/_3gpp-common-managed-function.yang
index a2bca7e8378a0ca67d0c3b812ffac1550cf2de98..608ced2963e6e5596463e43fe528a4bee7723e89 100755
--- a/yang-models/_3gpp-common-managed-function.yang
+++ b/yang-models/_3gpp-common-managed-function.yang
@@ -4,6 +4,7 @@ module _3gpp-common-managed-function {
   prefix mf3gpp;
 
   import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-yang-extensions { prefix yext3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
   import _3gpp-common-measurements { prefix meas3gpp; }
   import _3gpp-common-trace { prefix trace3gpp; }
@@ -20,6 +21,7 @@ module _3gpp-common-managed-function {
     
     3GPP TS 28.620 
     Umbrella Information Model (UIM)";
+  revision 2022-10-31 { reference CR-0195;   }
   revision 2022-01-07 { reference "CR-0146"; }
   revision 2021-01-25 { reference "CR-0122"; }  
   revision 2020-09-30 { reference "CR-bbbb"; }  
@@ -46,6 +48,7 @@ module _3gpp-common-managed-function {
     leaf name {
       type string;
       mandatory true;
+      yext3gpp:notNotifyable;
     }
     
     leaf-list allowedNFTypes {
@@ -83,6 +86,7 @@ module _3gpp-common-managed-function {
       type string; 
       description "The type of the managed NF service instance
         The specifc values allowed are described in clause 7.2 of TS 23.501";
+      yext3gpp:notNotifyable;
     }
  
     list sAP {
diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang
index 96893e6c393426eef89f311c6b2c8e53c1fa8487..3cf5e75a3bb339df5bd074856a3958b49caa0102 100755
--- a/yang-models/_3gpp-common-measurements.yang
+++ b/yang-models/_3gpp-common-measurements.yang
@@ -5,6 +5,7 @@ module _3gpp-common-measurements {
 
   import _3gpp-common-top { prefix top3gpp; }
   import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-yang-extensions { prefix yext3gpp; }
 
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -53,6 +54,7 @@ module _3gpp-common-measurements {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
+  revision 2022-10-31 { reference CR-0195;   }
   revision 2021-07-22 { reference "CR-0137"; }
   revision 2020-11-06 { reference "CR-0118"; }
   revision 2020-09-04 { reference "CR-000107"; }
@@ -371,12 +373,14 @@ module _3gpp-common-measurements {
 
      leaf-list objectInstances {
       type types3gpp:DistinguishedName;
+      yext3gpp:notNotifyable;
     }
 
     leaf-list rootObjectInstances {
       type types3gpp:DistinguishedName;
       description "Each object instance designates the root of a subtree that
       contains the root object and all descendant objects.";
+      yext3gpp:notNotifyable;
     }
   }
 
diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang
index 25bde6927d08e51784ebcf38167c8ebcb7e36419..6594d185747e8e5e92baeed9506b79337c5f73a1 100755
--- a/yang-models/_3gpp-common-subscription-control.yang
+++ b/yang-models/_3gpp-common-subscription-control.yang
@@ -3,6 +3,7 @@ module _3gpp-common-subscription-control {
   namespace "urn:3gpp:sa5:_3gpp-common-subscription-control";
   prefix "subscr3gpp";
     
+  import _3gpp-common-yang-extensions { prefix yext3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
 
   organization "3GPP SA5";
@@ -15,6 +16,7 @@ module _3gpp-common-subscription-control {
       Solution Set (SS) definitions
       3GPP TS 28.623";
   
+  revision 2022-10-31 { reference CR-0195;   }
   revision 2021-01-16 { reference "CR-0120"; }  
   revision 2020-08-26 { reference "CR-0106"; }
   revision 2019-11-29 { reference "S5-197648 S5-197647 S5-197829 S5-197828"; }
@@ -90,8 +92,7 @@ module _3gpp-common-subscription-control {
   }
   
   grouping HeartbeatControlGrp {
-   description "Attributes of HeartbeatControl. Note the triggerHeartbeatNtf
-     attribute has no mapping in the present release.";
+   description "Attributes of HeartbeatControl.";
     
     leaf heartbeatNtfPeriod {
       type uint32;
@@ -101,6 +102,20 @@ module _3gpp-common-subscription-control {
         The value of zero has the special meaning of stopping the heartbeat 
         notification emission.";
     }
+    
+    leaf triggerHeartbeatNtf {
+      type boolean;
+      default false;
+      description "Setting this attribute to 'true' triggers an immediate 
+        additional heartbeat notification emission. Setting the value to 
+        'false' has no observable result.
+
+        The periodicity of notifyHeartbeat emission is not changed.
+        
+        After triggering the heartbeat the system SHALL set the value 
+        back to false.";
+      yext3gpp:notNotifyable;
+    }
   }
   
   grouping SubscriptionControlSubtree {
diff --git a/yang-models/_3gpp-common-yang-extensions.yang b/yang-models/_3gpp-common-yang-extensions.yang
index 9bc0a82be8cb514da33f2b79e3ec972509342cb1..fe703ee2ba215e74fdc2edcd8c4b02b86f7c3958 100755
--- a/yang-models/_3gpp-common-yang-extensions.yang
+++ b/yang-models/_3gpp-common-yang-extensions.yang
@@ -40,8 +40,26 @@ module _3gpp-common-yang-extensions {
     the extension e.g. with a deviation.
           ";
 
-  revision "2019-06-23" {
-    description "Initial version";
+  revision 2022-10-31 { reference CR-0195;   }
+  revision 2019-06-23 { reference "Initial version";   }
+
+  extension notNotifyable {
+    description
+      "Indicates that data change notifications shall not be sent 
+      for this attribute. If the extension is not present and other 
+      conditions are fulfilled data change notification should be sent.
+      If a list or container already has the notNotifyable 
+      extension, that is also valid for all contained data nodes.
+
+      The statement MUST only be a substatement of a leaf, leaf-list, list,
+      container statement that is contained within the 'attributes' 
+      container of an IOC and that represents an attribute or sub-parts of 
+      an attribute .
+      
+      Zero or one notNotifyable statement is allowed per parent statement.
+      NO substatements are allowed.
+            
+      Adding this statement is an NBC change, removing it is BC.";
   }
 
   extension inVariant {
diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang
index 0986cdefc8c37198f54cce746dd44ef36197bc6b..ce58a8a01e7317cd6177d654500e14386acf910e 100755
--- a/yang-models/_3gpp-common-yang-types.yang
+++ b/yang-models/_3gpp-common-yang-types.yang
@@ -5,6 +5,7 @@ module _3gpp-common-yang-types {
   
   import ietf-inet-types { prefix inet; }
   import ietf-yang-types { prefix yang; }
+  import _3gpp-common-yang-extensions { prefix yext3gpp; }
 
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -13,6 +14,7 @@ module _3gpp-common-yang-types {
     network slicing.";
   reference "3GPP TS 28.623";
 
+  revision 2022-10-31 { reference CR-0195;   }
   revision 2022-07-26 { reference CR-0180 ; }
   revision 2022-02-09 { reference "CR-0144"; }
   revision 2021-11-01 { reference "CR-0141"; }
@@ -210,6 +212,7 @@ module _3gpp-common-yang-types {
         
         Once the timer is set, the consumer can not change it anymore. 
         If the consumer has not set the timer the MnS Producer may set it.";
+      yext3gpp:notNotifyable;
     }
   }