diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index 30b636f3c7fbd27be14a13b06d957fc7298cb1e7..7bf2ab9191890131b21ff1f42aa5ebbd8fa4103c 100755
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -812,6 +812,8 @@ components:
           $ref: '#/components/schemas/NRECMappingRule-Multiple'
         MWAB:
           $ref: '#/components/schemas/MWAB-Multiple'
+        NRFemtoGW:
+          $ref: '#/components/schemas/NRFemtoGW-Single'
 
     ManagedElement-ncO-NrNrm:
       type: object
@@ -846,6 +848,8 @@ components:
           $ref: '#/components/schemas/NRECMappingRule-Multiple'
         MWAB:
           $ref: '#/components/schemas/MWAB-Multiple'
+        NRFemtoGW:
+          $ref: '#/components/schemas/NRFemtoGW-Single'
 
 #-------- Definition of abstract IOCs --------------------------------------------
 
@@ -881,6 +885,8 @@ components:
                       type: boolean
                     onboardSatelliteId:
                       $ref: '#/components/schemas/SatelliteId'
+                    isNRFemtoNode:
+                      type: boolean
                     rimRSReportConf:
                       $ref: '#/components/schemas/RimRSReportConf'
                     configurable5QISetRef:
@@ -958,6 +964,8 @@ components:
                       type: boolean
                     onboardSatelliteId:
                       $ref: '#/components/schemas/SatelliteId'
+                    isNRFemtoNode:
+                      type: boolean
                     PlmnInfoList:
                       $ref: '#/components/schemas/PlmnInfoList'
                     configurable5QISetRef:
@@ -1026,6 +1034,8 @@ components:
                       type: boolean
                     onboardSatelliteId:
                       $ref: '#/components/schemas/SatelliteId'
+                    isNRFemtoNode:
+                      type: boolean
                     tceIDMappingInfoList:
                       $ref: '#/components/schemas/TceIDMappingInfoList'
                     configurable5QISetRef:
@@ -1048,6 +1058,8 @@ components:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'
                     nRECMappingRuleRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+                    nRFemtoGWRef:
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
@@ -2308,6 +2320,24 @@ components:
                       uniqueItems: true
                       items:
                         $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+    NRFemtoGW-Single:
+      allOf:
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              type: object
+              properties:
+                administrativeState:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState'
+                operationalState:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState'     
+                nRFemtoGWId:
+                  type: string
+                nRFemtoPLMNInfoList:
+                  $ref: '#/components/schemas/PlmnInfoList'
+                nRFemtoTACList:
+                  $ref: '#/components/schemas/NRTACList'
 
 
 #-------- Definition of JSON arrays for name-contained IOCs ----------------------