[Task-ID: ODUHIGH-433]Fixed the mismatch between UE ID (calculated from CRNTI) and...
[o-du/l2.git] / src / du_app / du_f1ap_msg_hdl.c
index a6205a5..fcff8e8 100644 (file)
 
 /* This file contains F1AP message handler functions */
 #include "common_def.h"
+#include "ckw.h"
+#include "ckw.x"
+#include "kwu.h"
+#include "kwu.x"
+#include "lkw.h"
 #include "lrg.h"
 #include "legtp.h"
 #include "lkw.x"
 #include "lrg.x"
+#include "F1AP-PDU.h"
 #include "du_app_mac_inf.h"
 #include "du_cfg.h"
 #include "du_app_rlc_inf.h"
 #include "du_mgr_main.h"
+#include "du_mgr.h"
 #include "du_utils.h"
+#include "du_ue_mgr.h"
 #include "RAT-Type.h"
 #include "FeatureSetUplinkPerCC.h"
 #include "FeatureSetDownlinkPerCC.h"
@@ -62,6 +70,7 @@
 #include "DMRS-DownlinkConfig.h"
 #include "PDSCH-Config.h"
 #include "BWP-DownlinkDedicated.h"
+#include "BWP-Downlink.h"
 #include "PUSCH-TimeDomainResourceAllocation.h"
 #include "PUSCH-TimeDomainResourceAllocationList.h"
 #include "DMRS-UplinkConfig.h"
 #include "SchedulingRequestResourceConfig.h"
 #include<ProtocolIE-Field.h>
 #include "ProtocolExtensionField.h"
-#include "F1AP-PDU.h"
 #include "odu_common_codec.h"
 #include "du_mgr.h"
 #include "du_cell_mgr.h"
 #include "DLUPTNLInformation-ToBeSetup-Item.h"
 #include "UPTransportLayerInformation.h"
 #include "GTPTunnel.h"
+#include "SupportedSULFreqBandItem.h"
+#include "du_sys_info_hdl.h"
+#include "du_e2ap_msg_hdl.h"
+#include "du_f1ap_conversions.h"
 
 #ifdef O1_ENABLE
-
-#include "Config.h"
+#include "CmInterface.h"
 extern StartupConfig g_cfg;
-
 #endif
 
 DuCfgParams duCfgParam;
 
-/************************************************************************
+/******************************************************************
  *
- * @brief Converts enum values into actual value of Poll retransmit timer
+ * @brief Function to fetch lcId based on DRB Id
  *
  * @details
  *
- *    Function : getPollPdu
+ *    Function : fetchLcId
  *
- *    Functionality: Converts enum values into actual value of poll 
- *    retransmit timer
+ *    @params[in] drbId
  *
- * @params[in] Enum value of pollPdu
- * @return Actual value of pollPdu
+ *    Functionality: Function to fetch lcId based on DRB Id
  *
- * **********************************************************************/
+ * Returns: lcId - SUCCESS
+ *          RFAILED - FAILURE
+ *****************************************************************/
 
-uint16_t getPollRetxTmr(uint8_t pollRetxTmrCfg)
+uint8_t fetchLcId(uint8_t drbId)
 {
-   uint16_t pollRetxTmr;
+   uint8_t cellIdx = 0, ueIdx = 0, lcIdx = 0, numLcs = 0, lcId = 0;
 
-   /* All values of poll retx timer are at interval of 5ms.
-    * This is valid upto 250ms
-    * Hence converting the enum value to actual value by multiplying it to 5
-    */
-   if(pollRetxTmrCfg <= T_PollRetransmit_ms250)
-      pollRetxTmr = (pollRetxTmrCfg + 1) * 5;
-   else
+   for(cellIdx = 0; cellIdx < MAX_NUM_CELL; cellIdx++)
    {
-      switch(pollRetxTmrCfg)
+      for(ueIdx = 0; ueIdx < MAX_NUM_UE; ueIdx++)
       {
-         case T_PollRetransmit_ms300:
-            pollRetxTmr = 300;
-            break;
-         case T_PollRetransmit_ms350:
-            pollRetxTmr = 350;
-            break;
-         case T_PollRetransmit_ms400:
-            pollRetxTmr = 400;
-            break;
-         case T_PollRetransmit_ms450:
-            pollRetxTmr = 450;
-            break;
-         case T_PollRetransmit_ms500:
-            pollRetxTmr = 500;
-            break;
-         case T_PollRetransmit_ms800:
-            pollRetxTmr = 800;
-            break;
-         default:
-            DU_LOG("\nERROR  -->  F1AP: Invalid value of Poll Retransmit timer");
-            pollRetxTmr = 0;
+         if(duCb.actvCellLst[cellIdx] != NULLP)
+         {
+            numLcs = duCb.actvCellLst[cellIdx]->ueCb[ueIdx].rlcUeCfg.numLcs;
+            for(lcIdx = 0; lcIdx < numLcs; lcIdx++)
+            {
+               if(duCb.actvCellLst[cellIdx]->ueCb[ueIdx].rlcUeCfg.rlcLcCfg[lcIdx].rbId == drbId && \
+                  duCb.actvCellLst[cellIdx]->ueCb[ueIdx].rlcUeCfg.rlcLcCfg[lcIdx].rbType == RB_TYPE_DRB)
+               {
+                  lcId = duCb.actvCellLst[cellIdx]->ueCb[ueIdx].rlcUeCfg.rlcLcCfg[lcIdx].lcId;
+                  return lcId;
+               }
+            }
+         }
       }
    }
-   return pollRetxTmr; 
+   DU_LOG("\nERROR   -->  DU_APP: fetchLcId() failed for drbId %d", drbId);
+   return RFAILED;
 }
 
 /*******************************************************************
- *
- * @brief Converts enum values into actual value of PollPdu
- *
- * @details
- *
- *    Function : getPollPdu
- *
- *    Functionality: Converts enum values into actual value of PollPdu
- *
- * @params[in] Enum value of pollPdu
- * @return Actual value of pollPdu
- *
- * ****************************************************************/
-int32_t getPollPdu(uint8_t pollPduCfg)
+*
+* @brief Adding F1AP pdu to reserved pdu list
+*
+* @details
+*
+*    Function : addToReservedF1apPduList 
+*
+*    Functionality: Adding F1AP pdu to reserved pdu list.
+*     These pdu are awaiting aknowledgment from CU
+*
+* @params[in] uint8_t transId, F1AP_PDU_t *f1apMsg
+*
+* @return ROK - success
+*         RFAILED - failure
+*
+* ****************************************************************/
+void addToReservedF1apPduList(uint8_t transId, F1AP_PDU_t *f1apPdu)
 {
-   int32_t pollPdu;
-   switch(pollPduCfg)
+   CmLList         *node = NULLP;
+   ReservedF1apPduInfo *pduInfo = NULLP;
+   DU_ALLOC(pduInfo, sizeof(ReservedF1apPduInfo));
+   if(pduInfo)
    {
-      case PollPDU_p4:
-         pollPdu = 4;
-         break;
-      case PollPDU_p8:
-         pollPdu = 8;
-         break;
-      case PollPDU_p16:
-         pollPdu = 16;
-         break;
-      case PollPDU_p32:
-         pollPdu = 32;
-         break;
-      case PollPDU_p64:
-         pollPdu = 64;
-         break;
-      case PollPDU_p128:
-         pollPdu = 128;
-         break;
-      case PollPDU_p256:
-         pollPdu = 256;
-         break;
-      case PollPDU_p512:
-         pollPdu = 512;
-         break;
-      case PollPDU_p1024:
-         pollPdu = 1024;
-         break;
-      case PollPDU_p2048:
-         pollPdu = 2048;
-         break;
-      case PollPDU_p4096:
-         pollPdu = 4096;
-         break;
-      case PollPDU_p6144:
-         pollPdu = 6144;
-         break;
-      case PollPDU_p8192:
-         pollPdu = 8192;
-         break;
-      case PollPDU_p12288:
-         pollPdu = 12288;
-         break;
-      case PollPDU_p16384:
-         pollPdu = 16384;
-         break;
-      case PollPDU_p20480:
-         pollPdu = 20480;
-         break;
-      case PollPDU_p24576:
-         pollPdu = 24576;
-         break;
-      case PollPDU_p28672:
-         pollPdu = 28672;
-         break;
-      case PollPDU_p32768:
-         pollPdu = 32768;
-         break;
-      case PollPDU_p40960:
-         pollPdu = 40960;
-         break;
-      case PollPDU_p49152:
-         pollPdu = 49152;
-         break;
-      case PollPDU_p57344:
-         pollPdu = 57344;
-         break;
-      case PollPDU_p65536:
-         pollPdu = 65536;
-         break;
-      case PollPDU_infinity:
-         pollPdu = -1;
-        break;
-      default:
-         DU_LOG("\nERROR  -->  F1AP: Invalid value of poll pdu");
-        pollPdu = 0;
-         break;
-   }
-   return pollPdu;
-}
+      DU_ALLOC(node, sizeof(CmLList));
+      if(node)
+      {
+         pduInfo->transId = transId;
+         pduInfo->f1apMsg = (void*) f1apPdu;
 
-/*******************************************************************
- *
- * @brief Converts enum values into actual value of poll bytes
- *
- * @details
- *
- *    Function : getPollByte
- *
- *    Functionality: Converts enum values into actual value of pollBytes
- *
- * @params[in] Enum value
- * @return Actual value
- *
- * ****************************************************************/
-int32_t getPollByte(uint16_t pollBytesCfg)
-{
-   int32_t pollBytes;
-   switch(pollBytesCfg)
-   {
-      case PollByte_kB1:
-         pollBytes = 1000;
-         break;
-      case PollByte_kB2:
-         pollBytes = 2000;
-         break;
-      case PollByte_kB5:
-         pollBytes = 5000;
-         break;
-      case PollByte_kB8:
-         pollBytes = 8000;
-         break;
-      case PollByte_kB10:
-         pollBytes = 10000;
-         break;
-      case PollByte_kB15:
-         pollBytes = 15000;
-         break;
-      case PollByte_kB25:
-         pollBytes = 25000;
-         break;
-      case PollByte_kB50:
-         pollBytes = 50000;
-         break;
-      case PollByte_kB75:
-         pollBytes = 75000;
-         break;
-      case PollByte_kB100:
-         pollBytes = 100000;
-         break;
-      case PollByte_kB125:
-         pollBytes = 125000;
-         break;
-      case PollByte_kB250:
-         pollBytes = 250000;
-         break;
-      case PollByte_kB375:
-         pollBytes = 375000;
-         break;
-      case PollByte_kB500:
-         pollBytes = 500000;
-         break;
-      case PollByte_kB750:
-         pollBytes = 750000;
-         break;
-      case PollByte_kB1000:
-         pollBytes = 1000000;
-         break;
-      case PollByte_kB1250:
-         pollBytes = 1250000;
-         break;
-      case PollByte_kB1500:
-         pollBytes = 1500000;
-         break;
-      case PollByte_kB2000:
-         pollBytes = 2000000;
-         break;
-      case PollByte_kB3000:
-         pollBytes = 3000000;
-         break;
-      case PollByte_kB4000:
-         pollBytes = 4000000;
-         break;
-      case PollByte_kB4500:
-         pollBytes = 4500000;
-         break;
-      case PollByte_kB5000:
-         pollBytes = 5000000;
-         break;
-      case PollByte_kB5500:
-         pollBytes = 5500000;
-         break;
-      case PollByte_kB6000:
-         pollBytes = 6000000;
-         break;
-      case PollByte_kB6500:
-         pollBytes = 6500000;
-         break;
-      case PollByte_kB7000:
-         pollBytes = 7000000;
-         break;
-      case PollByte_kB7500:
-         pollBytes = 7500000;
-         break;
-      case PollByte_mB8:
-         pollBytes = 8000000;
-         break;
-      case PollByte_mB9:
-         pollBytes = 9000000;
-         break;
-      case PollByte_mB10:
-         pollBytes = 10000000;
-         break;
-      case PollByte_mB11:
-         pollBytes = 11000000;
-         break;
-      case PollByte_mB12:
-         pollBytes = 12000000;
-         break;
-      case PollByte_mB13:
-         pollBytes = 13000000;
-         break;
-      case PollByte_mB14:
-         pollBytes = 14000000;
-         break;
-      case PollByte_mB15:
-         pollBytes = 15000000;
-         break;
-      case PollByte_mB16:
-         pollBytes = 16000000;
-         break;
-      case PollByte_mB17:
-         pollBytes = 17000000;
-         break;
-      case PollByte_mB18:
-         pollBytes = 18000000;
-         break;
-      case PollByte_mB20:
-         pollBytes = 20000000;
-         break;
-      case PollByte_mB25:
-         pollBytes = 25000000;
-         break;
-      case PollByte_mB30:
-         pollBytes = 30000000;
-         break;
-      case PollByte_mB40:
-         pollBytes = 40000000;
-         break;
-      case PollByte_infinity:
-         pollBytes = -1;
-         break;
-      default:
-         DU_LOG("\nERROR  -->  F1AP: Invalid value of poll bytes");
-         pollBytes = 0;
+         node->node = (PTR)pduInfo;
+         cmLListAdd2Tail(&duCb.reservedF1apPduList, node);
+      }
    }
-   return pollBytes;
 }
 
 /*******************************************************************
- *
- * @brief Converts enum values into actual value of maxRetx
- *
- * @details
- *
- *    Function : getMaxRetx
- *
- *    Functionality: Converts enum values into actual value of maxRetx
- *
- * @params[in] Enum value
- * @return Actual value
- *
- * ****************************************************************/
-uint8_t getMaxRetx(uint8_t maxRetxCfg)
+*
+* @brief searching for F1AP pdu from ReservedF1apPduList 
+*
+* @details
+*
+*    Function : searchFromReservedF1apPduList 
+*
+*    Functionality: searching for F1AP pdu information
+*
+* @params[in] uint8_t transId
+*
+* @return pointer to F1AP_PDU_t
+*
+* ****************************************************************/
+
+CmLList *searchFromReservedF1apPduList(uint8_t transId)
 {
-   uint8_t maxRetx;
-   switch(maxRetxCfg)
+   CmLList         *node;
+   ReservedF1apPduInfo *f1apPdu;
+   if(duCb.reservedF1apPduList.count)
    {
-      case UL_AM_RLC__maxRetxThreshold_t1:
-         maxRetx = 1;
-         break;
-      case UL_AM_RLC__maxRetxThreshold_t2:
-         maxRetx = 2;
-         break;
-      case UL_AM_RLC__maxRetxThreshold_t3:
-         maxRetx = 3;
-         break;
-      case UL_AM_RLC__maxRetxThreshold_t4:
-         maxRetx = 4;
-         break;
-      case UL_AM_RLC__maxRetxThreshold_t6:
-         maxRetx = 6;
-         break;
-      case UL_AM_RLC__maxRetxThreshold_t8:
-         maxRetx = 8;
-         break;
-      case UL_AM_RLC__maxRetxThreshold_t16:
-         maxRetx = 16;
-         break;
-      case UL_AM_RLC__maxRetxThreshold_t32:
-         maxRetx = 32;
-         break;
-      default:
-         DU_LOG("\nERROR  -->  F1AP: Invalid configuration for Max retransmission threshold");
-         maxRetx = 0;
+      CM_LLIST_FIRST_NODE(&duCb.reservedF1apPduList, node);
+      while(node)
+      {
+         f1apPdu = (ReservedF1apPduInfo*)node->node;
+         if(f1apPdu->transId == transId)
+         {
+            return node;
+         }
+         node = node->next;
+      }
    }
-   return maxRetx;
+   return NULL;
 }
 
 /*******************************************************************
- * @brief Converts enum values into actual value of reassembly timer
- *
- * @details
- *
- *    Function : getReAsmblTmr
- *
- *    Functionality: Converts enum values into actual value of reassembly 
- *    timer
- *
- * @params[in] Enum value of reassembly timer
- * @return Actual value of reassembly timer
- *
- * **********************************************************************/
+*
+* @brief deleting F1AP pdu information from ReservedF1apPduList
+*
+* @details
+*
+*    Function : deleteFromReservedF1apPduList 
+*
+*    Functionality: deleting pdu information from ReservedF1apPduList
+*
+* @params[in] CmLList *node 
+*
+* @return void 
+*
+* ****************************************************************/
 
-int8_t getReAsmblTmr(uint8_t reAsmblTmrCfg)
+void deleteFromReservedF1apPduList(CmLList *node)
 {
-   int8_t reAsmblTmr = 0;
-   
-   if(reAsmblTmrCfg == T_Reassembly_ms0)
-   {
-      reAsmblTmr = 0;
-   }
-   else if(reAsmblTmrCfg >= T_Reassembly_ms5 || reAsmblTmrCfg <= T_Reassembly_ms100)
-   {
-     /* All values of re assembly timer are at interval of 5ms.
-      * This is valid upto 100ms
-      * Hence converting the enum value to actual value by multiplying it to 5
-      */
-      reAsmblTmr = reAsmblTmrCfg * 5;
-   }
-   else if(reAsmblTmrCfg >= T_Reassembly_ms110 || reAsmblTmrCfg <= T_Reassembly_ms200)
-   {
-     /* All values of re assembly timer are at interval of 10ms.
-      * This is valid upto 200ms
-      * since enum value starts from 20 for 100ms, subtracting 10 and
-      * converting the enum value to actual value by multiplying it to 10
-      */
-      reAsmblTmr = ((reAsmblTmrCfg-10) * 10);
-   }
-   else
-   {
-      DU_LOG("\nERROR  -->  F1AP : Invalid value of Re Assembly timer %d", reAsmblTmrCfg);
-      reAsmblTmr = -1;
-   }
-   return reAsmblTmr; 
-}
-
-/************************************************************************
- *
- * @brief Converts enum values into actual value of status prohibit timer
- *
- * @details
- *
- *    Function : getStatProhTmr
- *
- *    Functionality: Converts enum values into actual value of status prohibit 
- *    timer
- *
- * @params[in] Enum value of status prohibit timer
- * @return Actual value of status prohibit timer
- *
- * **********************************************************************/
+   ReservedF1apPduInfo *f1apPdu;
 
-int16_t getStatProhTmr(uint8_t statProhTmrCfg)
-{
-   int16_t statProhTmr =0;
-   
-   if(statProhTmrCfg == T_StatusProhibit_ms0)
-   {
-      statProhTmr = 0;
-   }
-   else if(statProhTmrCfg >= T_StatusProhibit_ms5 || statProhTmrCfg <= T_StatusProhibit_ms250)
-   {
-      /* All values of re assembly timer are at interval of 5ms.
-       * This is valid upto 250ms
-       * Hence converting the enum value to actual value by multiplying it to 5
-       */
-      statProhTmr = statProhTmrCfg * 5;
-   }
-   else
+   if(node != NULL)
    {
-      switch(statProhTmrCfg)
-      {
-         case T_StatusProhibit_ms300:
-            statProhTmr = 300;
-            break;
-         case T_StatusProhibit_ms350:
-            statProhTmr = 350;
-            break;
-         case T_StatusProhibit_ms400:
-            statProhTmr = 400;
-            break;
-         case T_StatusProhibit_ms450:
-            statProhTmr = 450;
-            break;
-         case T_StatusProhibit_ms500:
-            statProhTmr = 500;
-            break;
-         case T_StatusProhibit_ms800:
-            statProhTmr = 800;
-            break;
-         case T_StatusProhibit_ms1000:
-            statProhTmr = 1000;
-            break;
-         case T_StatusProhibit_ms1200:
-            statProhTmr = 1200;
-            break;
-         case T_StatusProhibit_ms1600:
-            statProhTmr = 1600;
-            break;
-         case T_StatusProhibit_ms2000:
-            statProhTmr = 2000;
-            break;
-         case T_StatusProhibit_ms2400:
-            statProhTmr = 2400;
-            break;
-         default:
-            DU_LOG("\nInvalid value of Status Prohibit timer %d", statProhTmrCfg);
-            statProhTmr = -1;
-           break;
-      }
+      f1apPdu = (ReservedF1apPduInfo *)node->node;
+      cmLListDelFrm(&duCb.reservedF1apPduList, node);
+      DU_FREE(f1apPdu, sizeof(ReservedF1apPduInfo));
+      DU_FREE(node, sizeof(CmLList));
+      node = NULL;
    }
-   return statProhTmr; 
 }
 
 /*******************************************************************
@@ -703,7 +369,7 @@ uint8_t BuildDLNRInfo(NRFreqInfo_t *dlnrfreq)
 S16 BuildNrCellId(BIT_STRING_t *nrcell)
 {
    memset(nrcell->buf, 0, nrcell->size);
-   nrcell->buf[4]   = 16
+   nrcell->buf[4]   = duCfgParam.sib1Params.cellIdentity
    nrcell->bits_unused = 4;
    return ROK;
 }
@@ -785,66 +451,174 @@ uint8_t BuildFiveGSTac(Served_Cell_Information_t *servcell)
    servcell->fiveGS_TAC->buf[2] = duCfgParam.srvdCellLst[0].duCellInfo.tac;
    return ROK;  
 }
+
 /*******************************************************************
  *
- * @brief Builds NR Mode 
+ * @brief fill nr frequency information
  *
  * @details
  *
- *    Function : BuildNrMode
+ *    Function : fillNrTddInfo 
  *
- *    Functionality: Building the NR Mode
+ *    Functionality: fill nr frequency information
  *
- * @params[in] NR_Mode_Info_t *fdd
+ * @params[in] NRFreqInfo_t freqInfo
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildNrMode(NR_Mode_Info_t *mode)
+uint8_t fillNrTddInfo(TDD_Info_t *tddInfo)
 {
-   uint8_t BuildDLNRInforet=0;
-   uint8_t BuildULNRInforet=0; 
-   /* FDD Mode */
-   mode->present = NR_Mode_Info_PR_fDD;
-   if(mode->present == NR_Mode_Info_PR_fDD)
+   uint8_t elementCnt = 1, freqBandListIdx = 0, supportedBandIdx = 0;
+   NRFreqInfo_t *freqInfo = NULLP;
+
+   if(tddInfo == NULLP)
    {
-      DU_ALLOC(mode->choice.fDD,sizeof(FDD_Info_t));
-      if(mode->choice.fDD == NULLP)
+      DU_LOG("\nERROR  --> DU APP : Null pointer received at fillNrTddInfo");
+      return RFAILED;
+   }
+   
+   freqInfo = &tddInfo->nRFreqInfo;
+   freqInfo->nRARFCN = duCfgParam.srvdCellLst[0].duCellInfo.f1Mode.mode.tdd.nrFreqInfo.nrArfcn; 
+
+   freqInfo->freqBandListNr.list.count = elementCnt; 
+   freqInfo->freqBandListNr.list.size = freqInfo->freqBandListNr.list.count  * sizeof(FreqBandNrItem_t *);
+   DU_ALLOC(freqInfo->freqBandListNr.list.array, freqInfo->freqBandListNr.list.size );
+   if(!freqInfo->freqBandListNr.list.array)
+   {
+      DU_LOG("\nERROR  --> DU APP : Memory allocation failed at fillNrTddInfo");
+      return RFAILED;
+   }
+
+   for(freqBandListIdx = 0; freqBandListIdx<freqInfo->freqBandListNr.list.count; freqBandListIdx++)
+   {
+      DU_ALLOC(freqInfo->freqBandListNr.list.array[freqBandListIdx],  sizeof(FreqBandNrItem_t ));
+      if(!freqInfo->freqBandListNr.list.array[freqBandListIdx])
       {
-        return RFAILED;
+         DU_LOG("\nERROR  --> DU APP : Memory allocation failed at fillNrTddInfo");
+         return RFAILED;
       }
-      BuildULNRInforet = BuildULNRInfo(&mode->choice.fDD->uL_NRFreqInfo);
-      if(BuildULNRInforet != ROK)
+
+      freqInfo->freqBandListNr.list.array[freqBandListIdx]->freqBandIndicatorNr = duCfgParam.srvdCellLst[0].duCellInfo.\
+      f1Mode.mode.tdd.nrFreqInfo.freqBand[0].nrFreqBand;
+      freqInfo->freqBandListNr.list.array[freqBandListIdx]->supportedSULBandList.list.count = elementCnt;
+      freqInfo->freqBandListNr.list.array[freqBandListIdx]->supportedSULBandList.list.size = freqInfo->freqBandListNr.list.array[freqBandListIdx]->\
+      supportedSULBandList.list.count * sizeof(SupportedSULFreqBandItem_t*);
+
+      DU_ALLOC(freqInfo->freqBandListNr.list.array[freqBandListIdx]->supportedSULBandList.list.array,\
+            freqInfo->freqBandListNr.list.array[freqBandListIdx]->supportedSULBandList.list.size);
+      if(!freqInfo->freqBandListNr.list.array[freqBandListIdx]->supportedSULBandList.list.array)
       {
-        return RFAILED;    
+         DU_LOG("\nERROR  --> DU APP : Memory allocation failed at fillNrTddInfo");
+         return RFAILED;
       }
-      BuildDLNRInforet = BuildDLNRInfo(&mode->choice.fDD->dL_NRFreqInfo);
-      if(BuildDLNRInforet != ROK)
+
+      for(supportedBandIdx = 0; supportedBandIdx<freqInfo->freqBandListNr.list.array[freqBandListIdx]->supportedSULBandList.list.count; supportedBandIdx++)
       {
-        return RFAILED;
+         DU_ALLOC(freqInfo->freqBandListNr.list.array[freqBandListIdx]->supportedSULBandList.list.array[supportedBandIdx],\
+               sizeof(SupportedSULFreqBandItem_t));
+         if(!freqInfo->freqBandListNr.list.array[freqBandListIdx]->supportedSULBandList.list.array[supportedBandIdx])
+         {
+            DU_LOG("\nERROR  --> DU APP : Memory allocation failed at fillNrTddInfo");
+            return RFAILED;
+         }
+
+         freqInfo->freqBandListNr.list.array[freqBandListIdx]->supportedSULBandList.list.array[supportedBandIdx]->freqBandIndicatorNr =\
+         duCfgParam.srvdCellLst[0].duCellInfo.f1Mode.mode.tdd.nrFreqInfo.freqBand[0].sulBand[0];
       }
    }
-   mode->choice.fDD->uL_Transmission_Bandwidth.nRSCS = \
-                                                      duCfgParam.srvdCellLst[0].duCellInfo.\
-                                                      f1Mode.mode.fdd.ulTxBw.nrScs;
-   mode->choice.fDD->uL_Transmission_Bandwidth.nRNRB = \
-                                                      duCfgParam.srvdCellLst[0].duCellInfo.\
-                                                      f1Mode.mode.fdd.ulTxBw.nrb;
-   mode->choice.fDD->dL_Transmission_Bandwidth.nRSCS = \
-                                                      duCfgParam.srvdCellLst[0].duCellInfo.\
-                                                      f1Mode.mode.fdd.dlTxBw.nrScs;
-   mode->choice.fDD->dL_Transmission_Bandwidth.nRNRB = \
-                                                      duCfgParam.srvdCellLst[0].duCellInfo.\
-                                                      f1Mode.mode.fdd.dlTxBw.nrb;
+
+   tddInfo->transmission_Bandwidth.nRSCS = duCfgParam.srvdCellLst[0].duCellInfo.f1Mode.mode.tdd.nrFreqInfo.sulInfo.sulTxBw.nrScs;
+   tddInfo->transmission_Bandwidth.nRNRB = duCfgParam.srvdCellLst[0].duCellInfo.f1Mode.mode.tdd.nrFreqInfo.sulInfo.sulTxBw.nrb;
+
    return ROK;
 }
+
 /*******************************************************************
  *
- * @brief Builds IE Extensions for Served PLMNs 
+ * @brief Builds NR Mode 
  *
  * @details
  *
- *    Function : BuildExtensions
+ *    Function : BuildNrMode
+ *
+ *    Functionality: Building the NR Mode
+ *
+ * @params[in] NR_Mode_Info_t *fdd
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildNrMode(NR_Mode_Info_t *mode)
+{
+   uint8_t BuildDLNRInforet=0;
+   uint8_t BuildULNRInforet=0; 
+   
+#ifdef NR_TDD
+   mode->present = NR_Mode_Info_PR_tDD;
+#else
+   mode->present = NR_Mode_Info_PR_fDD;
+#endif   
+   
+   if(mode->present == NR_Mode_Info_PR_fDD)
+   {
+      DU_ALLOC(mode->choice.fDD,sizeof(FDD_Info_t));
+      if(mode->choice.fDD == NULLP)
+      {
+         DU_LOG("\nERROR  --> Memory allocation failed in BuildNrMode");
+         return RFAILED;
+      }
+      BuildULNRInforet = BuildULNRInfo(&mode->choice.fDD->uL_NRFreqInfo);
+      if(BuildULNRInforet != ROK)
+      {
+         DU_LOG("\nERROR  --> Failed to build UlNrFreqInfo");
+         return RFAILED;    
+      }
+      BuildDLNRInforet = BuildDLNRInfo(&mode->choice.fDD->dL_NRFreqInfo);
+      if(BuildDLNRInforet != ROK)
+      {
+         DU_LOG("\nERROR  --> Failed to build DlNrFreqInfo");
+         return RFAILED;
+      }
+      mode->choice.fDD->uL_Transmission_Bandwidth.nRSCS = \
+                                                          duCfgParam.srvdCellLst[0].duCellInfo.\
+                                                          f1Mode.mode.fdd.ulTxBw.nrScs;
+      mode->choice.fDD->uL_Transmission_Bandwidth.nRNRB = \
+                                                          duCfgParam.srvdCellLst[0].duCellInfo.\
+                                                          f1Mode.mode.fdd.ulTxBw.nrb;
+      mode->choice.fDD->dL_Transmission_Bandwidth.nRSCS = \
+                                                          duCfgParam.srvdCellLst[0].duCellInfo.\
+                                                          f1Mode.mode.fdd.dlTxBw.nrScs;
+      mode->choice.fDD->dL_Transmission_Bandwidth.nRNRB = \
+                                                          duCfgParam.srvdCellLst[0].duCellInfo.\
+                                                          f1Mode.mode.fdd.dlTxBw.nrb;
+   }
+   else if(mode->present == NR_Mode_Info_PR_tDD) 
+   {
+      DU_ALLOC(mode->choice.tDD,sizeof(TDD_Info_t));
+      if(mode->choice.tDD == NULLP)
+      {
+         DU_LOG("\nERROR  --> Memory allocation failed in BuildNrMode");
+         return RFAILED;
+      }
+
+      if(fillNrTddInfo(mode->choice.tDD) != ROK)
+      {
+         DU_LOG("\nERROR  --> Failed to fill Nr TDD information");
+         return RFAILED;
+      }
+
+   }
+
+   return ROK;
+}
+/*******************************************************************
+ *
+ * @brief Builds IE Extensions for Served PLMNs 
+ *
+ * @details
+ *
+ *    Function : BuildExtensions
  *
  *    Functionality: Building the IE Extensions
  *
@@ -855,95 +629,107 @@ uint8_t BuildNrMode(NR_Mode_Info_t *mode)
  * ****************************************************************/
 uint8_t BuildExtensions(ProtocolExtensionContainer_4624P3_t **ieExtend)
 {
-   uint8_t idx;
-   uint8_t plmnidx;
-   uint8_t extensionCnt=1;
-   uint8_t sliceId=0;
-   uint8_t sdId;
+   uint8_t idx=0, plmnidx=0, sliceLstIdx=0;
+   uint8_t elementCnt=0, extensionCnt=0;
+
+   extensionCnt=IE_EXTENSION_LIST_COUNT;
    DU_ALLOC(*ieExtend,sizeof(ProtocolExtensionContainer_4624P3_t));
    if((*ieExtend) == NULLP)
    {
+      DU_LOG("ERROR  --> DU_APP : BuildExtensions(): Memory allocation failed");
       return RFAILED;
    }
    (*ieExtend)->list.count = extensionCnt;
    (*ieExtend)->list.size = \
-                           extensionCnt * sizeof(ServedPLMNs_ItemExtIEs_t *);
+                            extensionCnt * sizeof(ServedPLMNs_ItemExtIEs_t *);
    DU_ALLOC((*ieExtend)->list.array,(*ieExtend)->list.size);
    if((*ieExtend)->list.array == NULLP)
    {
+      DU_LOG("ERROR  --> DU_APP : BuildExtensions(): Memory allocation failed");
       return RFAILED;
    }
    for(plmnidx=0;plmnidx<extensionCnt;plmnidx++)
    {
       DU_ALLOC((*ieExtend)->list.array[plmnidx],\
-           sizeof(ServedPLMNs_ItemExtIEs_t));
+            sizeof(ServedPLMNs_ItemExtIEs_t));
       if((*ieExtend)->list.array[plmnidx] == NULLP)
       {
-        return RFAILED;
+         DU_LOG("ERROR  --> DU_APP : BuildExtensions(): Memory allocation failed");
+         return RFAILED;
       }
    }
+   
+   elementCnt = duCfgParam.srvdCellLst[0].duCellInfo.cellInfo.srvdPlmn[0].taiSliceSuppLst.numSupportedSlices;
    idx = 0;
    (*ieExtend)->list.array[idx]->id = ProtocolIE_ID_id_TAISliceSupportList;
    (*ieExtend)->list.array[idx]->criticality = Criticality_ignore;
    (*ieExtend)->list.array[idx]->extensionValue.present = \
-                                                         ServedPLMNs_ItemExtIEs__extensionValue_PR_SliceSupportList;
-   (*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
-      list.count = 1;
-   (*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
-      list.size = sizeof(SliceSupportItem_t *);
-   DU_ALLOC((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
-        list.array,sizeof(SliceSupportItem_t *));
-   if((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
-        list.array == NULLP)
-   {
-      return RFAILED;
-   }
-   DU_ALLOC((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
-        list.array[sliceId],sizeof(SliceSupportItem_t));
-   if((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
-        list.array[sliceId] == NULLP) 
-   {
-      return RFAILED;
-   }
+   ServedPLMNs_ItemExtIEs__extensionValue_PR_SliceSupportList;
    (*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
-      list.array[sliceId]->sNSSAI.sST.size = sizeof(uint8_t);
-   DU_ALLOC((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList\
-        .list.array[sliceId]->sNSSAI.sST.buf,(*ieExtend)->list.array[idx]->\
-        extensionValue.choice.SliceSupportList.\
-        list.array[sliceId]->sNSSAI.sST.size);
-   if((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList\
-        .list.array[sliceId]->sNSSAI.sST.buf == NULLP)
-   {
-      return RFAILED;
-   }
+      list.count = elementCnt;
    (*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
-      list.array[sliceId]->sNSSAI.sST.buf[0] = 3;
+      list.size = (*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
+      list.count * sizeof(SliceSupportItem_t *);
+
    DU_ALLOC((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
-        list.array[sliceId]->sNSSAI.sD,sizeof(OCTET_STRING_t));
+         list.array, elementCnt * sizeof(SliceSupportItem_t *));
    if((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
-        list.array[sliceId]->sNSSAI.sD == NULLP)
+         list.array == NULLP)
    {
+      DU_LOG("ERROR  --> DU_APP : BuildExtensions(): Memory allocation failed");
       return RFAILED;
    }
-   (*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
-      list.array[sliceId]->sNSSAI.sD->size = 3*sizeof(uint8_t);
-   DU_ALLOC((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
-        list.array[sliceId]->sNSSAI.sD->buf,(*ieExtend)->list.array[idx]->extensionValue.choice.\
-        SliceSupportList.list.array[sliceId]->sNSSAI.sD->size);
-   if((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
-        list.array[sliceId]->sNSSAI.sD->buf == NULLP)
+
+   for(sliceLstIdx =0; sliceLstIdx<elementCnt; sliceLstIdx++)
    {
-      return RFAILED;
+      DU_ALLOC((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
+            list.array[sliceLstIdx],sizeof(SliceSupportItem_t));
+      if((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
+            list.array[sliceLstIdx] == NULLP) 
+      {
+         DU_LOG("ERROR  --> DU_APP : BuildExtensions(): Memory allocation failed");
+         return RFAILED;
+      }
+      (*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
+         list.array[sliceLstIdx]->sNSSAI.sST.size = sizeof(uint8_t);
+      DU_ALLOC((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList\
+            .list.array[sliceLstIdx]->sNSSAI.sST.buf,(*ieExtend)->list.array[idx]->\
+            extensionValue.choice.SliceSupportList.\
+            list.array[sliceLstIdx]->sNSSAI.sST.size);
+      if((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList\
+            .list.array[sliceLstIdx]->sNSSAI.sST.buf == NULLP)
+      {
+         DU_LOG("ERROR  --> DU_APP : BuildExtensions(): Memory allocation failed");
+         return RFAILED;
+      }
+      (*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
+         list.array[sliceLstIdx]->sNSSAI.sST.buf[0] = duCfgParam.srvdCellLst[0].duCellInfo.\
+         cellInfo.srvdPlmn[0].taiSliceSuppLst.snssai[sliceLstIdx]->sst;
+      
+      DU_ALLOC((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
+            list.array[sliceLstIdx]->sNSSAI.sD,sizeof(OCTET_STRING_t));
+      if((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
+            list.array[sliceLstIdx]->sNSSAI.sD == NULLP)
+      {
+         DU_LOG("ERROR  --> DU_APP : BuildExtensions(): Memory allocation failed");
+         return RFAILED;
+      }
+      (*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
+         list.array[sliceLstIdx]->sNSSAI.sD->size = 3 * sizeof(uint8_t);
+      DU_ALLOC((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
+            list.array[sliceLstIdx]->sNSSAI.sD->buf, (*ieExtend)->list.array[idx]->extensionValue.choice.\
+            SliceSupportList.list.array[sliceLstIdx]->sNSSAI.sD->size);
+      if((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
+            list.array[sliceLstIdx]->sNSSAI.sD->buf == NULLP)
+      {
+         DU_LOG("ERROR  --> DU_APP : BuildExtensions(): Memory allocation failed");
+         return RFAILED;
+      }
+      memcpy((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
+      list.array[sliceLstIdx]->sNSSAI.sD->buf, duCfgParam.srvdCellLst[0].duCellInfo.\
+      cellInfo.srvdPlmn[0].taiSliceSuppLst.snssai[sliceLstIdx]->sd, (*ieExtend)->list.array[idx]->\
+      extensionValue.choice.SliceSupportList.list.array[sliceLstIdx]->sNSSAI.sD->size);
    }
-   sdId = 0;
-   (*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
-      list.array[sliceId]->sNSSAI.sD->buf[sdId] = 3;
-   sdId++;
-   (*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
-      list.array[sliceId]->sNSSAI.sD->buf[sdId] = 6;
-   sdId++;
-   (*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
-      list.array[sliceId]->sNSSAI.sD->buf[sdId] = 9;
    return ROK;
 }
 /*******************************************************************
@@ -1203,7 +989,7 @@ uint8_t BuildRrcVer(RRC_Version_t *rrcVer)
  *
  * @details
  *
- *    Function : SendF1APMsg
+ *    Function : sendF1APMsg
  *
  *    Functionality: Sends F1 msg over SCTP
  *
@@ -1213,11 +999,11 @@ uint8_t BuildRrcVer(RRC_Version_t *rrcVer)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t SendF1APMsg(Region region, Pool pool)
+uint8_t sendF1APMsg()
 {
    Buffer *mBuf = NULLP;
   
-   if(ODU_GET_MSG_BUF(region, pool, &mBuf) == ROK)
+   if(ODU_GET_MSG_BUF(DU_APP_MEM_REGION, DU_POOL, &mBuf) == ROK)
    {
       if(ODU_ADD_POST_MSG_MULT((Data *)encBuf, encBufSize, mBuf) == ROK)
       {
@@ -1244,7 +1030,7 @@ uint8_t SendF1APMsg(Region region, Pool pool)
       return RFAILED;
    }
    return ROK; 
-} /* SendF1APMsg */
+} /* sendF1APMsg */
 
 /*******************************************************************
  *
@@ -1287,6 +1073,90 @@ void FreeRrcVer(RRC_Version_t *rrcVer)
       DU_FREE(rrcVer->latest_RRC_Version.buf,rrcVer->latest_RRC_Version.size);
    }
 }
+
+/*******************************************************************
+ *
+ * @brief Deallocating memory of TDD NrFreqInfo 
+ *
+ * @details
+ *
+ *    Function : freeTddNrFreqInfo 
+ *
+ *    Functionality: freeTddNrFreqInfo 
+ *
+ * @params[in]  F1AP_PDU_t *f1apDuCfg
+ *
+ * @return ROK     - void
+ *
+ * ****************************************************************/
+void freeTddNrFreqInfo(NRFreqInfo_t *freqInfo)
+{
+   uint8_t freqBandListIdx = 0, supportedBandIdx = 0;
+
+   if(freqInfo->freqBandListNr.list.array)
+   {
+      for(freqBandListIdx = 0; freqBandListIdx<freqInfo->freqBandListNr.list.count; freqBandListIdx++)
+      {
+         if(freqInfo->freqBandListNr.list.array[freqBandListIdx])
+         {
+            if(freqInfo->freqBandListNr.list.array[freqBandListIdx]->supportedSULBandList.list.array)
+            {
+               for(supportedBandIdx = 0; supportedBandIdx<freqInfo->freqBandListNr.list.array[freqBandListIdx]->supportedSULBandList.list.count; supportedBandIdx++)
+               {
+                  DU_FREE(freqInfo->freqBandListNr.list.array[freqBandListIdx]->supportedSULBandList.list.array[supportedBandIdx],\
+                        sizeof(SupportedSULFreqBandItem_t));
+               }
+               DU_FREE(freqInfo->freqBandListNr.list.array[freqBandListIdx]->supportedSULBandList.list.array,\
+                     freqInfo->freqBandListNr.list.array[freqBandListIdx]->supportedSULBandList.list.size);
+
+            }
+            DU_FREE(freqInfo->freqBandListNr.list.array[freqBandListIdx],  sizeof(FreqBandNrItem_t ));
+         }
+      }
+      DU_FREE(freqInfo->freqBandListNr.list.array, freqInfo->freqBandListNr.list.size );
+   }
+}
+
+/*******************************************************************
+ *
+ * @brief Deallocating memory allocated for Nr fdd frequencey mode 
+ *
+ * @details
+ *
+ *    Function : freeFddNrFreqInfo 
+ *
+ *    Functionality:Free memory allocated for Nr fdd frequencey mode 
+ *
+ * @params[in]  
+ *
+ * @return ROK     - void
+ *
+ * ****************************************************************/
+void freeFddNrFreqInfo(FDD_Info_t *fDD)
+{
+   uint8_t arrIdx =0;
+
+   if(fDD != NULLP)
+   {
+      if(fDD->uL_NRFreqInfo.freqBandListNr.list.array != NULLP)
+      {
+         DU_FREE(fDD->uL_NRFreqInfo.freqBandListNr.list.\
+               array[arrIdx], sizeof(FreqBandNrItem_t));
+         DU_FREE(fDD->uL_NRFreqInfo.freqBandListNr.list.array, \
+               fDD->uL_NRFreqInfo.freqBandListNr.list.size);
+      }
+
+      if(fDD->dL_NRFreqInfo.freqBandListNr.list.array != NULLP)
+      {
+         DU_FREE(fDD->dL_NRFreqInfo.freqBandListNr.list.\
+               array[arrIdx], sizeof(FreqBandNrItem_t));
+         DU_FREE(fDD->dL_NRFreqInfo.freqBandListNr.list.array,\
+               fDD->dL_NRFreqInfo.freqBandListNr.list.size);
+      }
+      DU_FREE(fDD,sizeof(FDD_Info_t));
+   }
+}
+
 /*******************************************************************
  *
  * @brief  deallocating the memory of function BuildAndSendF1SetupReq()
@@ -1305,161 +1175,127 @@ void FreeRrcVer(RRC_Version_t *rrcVer)
  * ****************************************************************/
 void FreeServedCellList( GNB_DU_Served_Cells_List_t *duServedCell)
 {
-   uint8_t   plmnCnt=1;
-   uint8_t  servId=0;
-   uint8_t sliceId=0;
-   uint8_t  ieId=0;
-   uint8_t   extensionCnt=1;
-   uint8_t plmnidx=0;
-   GNB_DU_Served_Cells_Item_t *srvCellItem= &duServedCell->list.array[0]->value.choice.GNB_DU_Served_Cells_Item;
+   uint8_t   plmnCnt=MAX_PLMN;
+   uint8_t  extensionCnt=IE_EXTENSION_LIST_COUNT;
+   uint8_t  plmnIdx=0, sliceIdx=0;
+   GNB_DU_Served_Cells_Item_t *srvCellItem;
+   ServedPLMNs_Item_t  *servedPlmnItem;
+   SliceSupportItem_t  *sliceSupportItem;
+
    if(duServedCell->list.array!=NULLP)
    {
       if(duServedCell->list.array[0]!=NULLP)
       {
-        if(srvCellItem->served_Cell_Information.nRCGI.pLMN_Identity.buf!=NULLP)
-        {
-           if(srvCellItem->served_Cell_Information.nRCGI.nRCellIdentity.buf !=NULLP)
-           {
-              if(srvCellItem->served_Cell_Information.fiveGS_TAC!=NULLP)
-              {
-                 if(srvCellItem->served_Cell_Information.fiveGS_TAC->buf!=NULLP)
-                 {
-                    if(srvCellItem->served_Cell_Information.servedPLMNs.list.array!=NULLP)
-                    {
-                       if(srvCellItem->served_Cell_Information.servedPLMNs.list.array[0]!=NULLP)
-                       {
-                          if(srvCellItem->served_Cell_Information.servedPLMNs.list.array[servId]->pLMN_Identity.buf!=NULLP)
-                          {
-                             if(srvCellItem->served_Cell_Information.servedPLMNs.list.array[servId]->iE_Extensions!=NULLP)
-                             {
-                                if(srvCellItem->served_Cell_Information.servedPLMNs.list.array[servId]->iE_Extensions->list.array!=NULLP)
-                                {
-                                   if(srvCellItem->served_Cell_Information.servedPLMNs.list.array[servId]->iE_Extensions->list.array[0]!=NULLP)
-                                   {
-                                      if(srvCellItem->served_Cell_Information.servedPLMNs.list.array[servId]->iE_Extensions->list.array[0]->\
-                                            extensionValue.choice.SliceSupportList.list.array!=NULLP)
-                                      {
-                                         if(srvCellItem->served_Cell_Information.servedPLMNs.list.array[servId]->iE_Extensions->list.array[0]->\
-                                               extensionValue.choice.SliceSupportList.list.array[sliceId]!= NULLP)
-                                         {
-                                            if(srvCellItem->served_Cell_Information.servedPLMNs.list.array[servId]->iE_Extensions->list.array[0]->\
-                                                  extensionValue.choice.SliceSupportList.list.array[sliceId]->sNSSAI.sST.buf!=NULLP)
-                                            {
-                                               if(srvCellItem->served_Cell_Information.servedPLMNs.list.array[servId]->iE_Extensions->list.array[0]->\
-                                                     extensionValue.choice.SliceSupportList.list.array[sliceId]->sNSSAI.sD!=NULLP)
-                                               {
-                                                  if(srvCellItem->served_Cell_Information.servedPLMNs.list.array[servId]->iE_Extensions->\
-                                                        list.array[0]->extensionValue.choice.SliceSupportList.list.array[sliceId]->sNSSAI.sD->buf!=NULLP)
-                                                  {
-                                                     if(srvCellItem->served_Cell_Information.nR_Mode_Info.choice.fDD!=NULLP)
-                                                     {
-                                                        if(srvCellItem->served_Cell_Information.nR_Mode_Info.choice.fDD->uL_NRFreqInfo.\
-                                                              freqBandListNr.list.array!=NULLP)
-                                                        {
-                                                           if(srvCellItem->served_Cell_Information.nR_Mode_Info.choice.fDD->uL_NRFreqInfo.\
-                                                                 freqBandListNr.list.array[0]!=NULLP)
-                                                           {
-                                                              if(srvCellItem->served_Cell_Information.nR_Mode_Info.choice.fDD->dL_NRFreqInfo.\
-                                                                    freqBandListNr.list.array)
-                                                              {
-                                                                 if(srvCellItem->served_Cell_Information.nR_Mode_Info.choice.fDD->dL_NRFreqInfo.\
-                                                                       freqBandListNr.list.array[0]!=NULLP)
-                                                                 {
-                                                                    if(srvCellItem->served_Cell_Information.measurementTimingConfiguration.buf!=NULLP)
-                                                                    {
-                                                                       if(!srvCellItem->gNB_DU_System_Information)
-                                                                       {
-                                                                          if(srvCellItem->gNB_DU_System_Information->mIB_message.buf!=NULLP)
-                                                                          {
-                                                                             if(srvCellItem->gNB_DU_System_Information->sIB1_message.buf!=NULLP)
-                                                                             { 
-                                                                                DU_FREE(srvCellItem->gNB_DU_System_Information->sIB1_message.buf,\
-                                                                                      srvCellItem->gNB_DU_System_Information->sIB1_message.size);
-                                                                                DU_FREE(duCfgParam.srvdCellLst[0].duSysInfo.sib1Msg,\
-                                                                                      srvCellItem->gNB_DU_System_Information->sIB1_message.size);
-                                                                             }
-                                                                             DU_FREE(srvCellItem->gNB_DU_System_Information->mIB_message.buf,\
-                                                                                   srvCellItem->gNB_DU_System_Information->mIB_message.size);
-                                                                             DU_FREE(duCfgParam.srvdCellLst[0].duSysInfo.mibMsg,\
-                                                                                   strlen((char*)duCfgParam.srvdCellLst[0].duSysInfo.mibMsg));
-                                                                          }
-                                                                          DU_FREE(srvCellItem->gNB_DU_System_Information,sizeof(GNB_DU_System_Information_t));
-                                                                       }
-                                                                       DU_FREE(srvCellItem->served_Cell_Information.measurementTimingConfiguration.buf,\
-                                                                             srvCellItem->served_Cell_Information.measurementTimingConfiguration.size);
-                                                                    }
-                                                                    DU_FREE(srvCellItem->served_Cell_Information.nR_Mode_Info.choice.fDD->dL_NRFreqInfo.\
-                                                                          freqBandListNr.list.array[0],sizeof(FreqBandNrItem_t));
-                                                                 }
-                                                                 DU_FREE(srvCellItem->served_Cell_Information.nR_Mode_Info.choice.fDD->dL_NRFreqInfo.\
-                                                                       freqBandListNr.list.array,sizeof(FreqBandNrItem_t *));
-                                                              }
-                                                              DU_FREE(srvCellItem->served_Cell_Information.nR_Mode_Info.choice.fDD->uL_NRFreqInfo.freqBandListNr.\
-                                                                    list.array[0],sizeof(FreqBandNrItem_t));
-                                                           }
-                                                           DU_FREE(srvCellItem->served_Cell_Information.nR_Mode_Info.choice.fDD->uL_NRFreqInfo.freqBandListNr.\
-                                                                 list.array,sizeof(FreqBandNrItem_t*));
-                                                        }
-                                                        DU_FREE(srvCellItem->served_Cell_Information.nR_Mode_Info.choice.fDD,sizeof(FDD_Info_t));
-                                                     }
-                                                     DU_FREE(srvCellItem->served_Cell_Information.servedPLMNs.list.array[servId]->\
-                                                           iE_Extensions->list.array[ieId]->extensionValue.choice.SliceSupportList.list.array[sliceId]->\
-                                                           sNSSAI.sD->buf,srvCellItem->served_Cell_Information.servedPLMNs.list.array[servId]->iE_Extensions->
-                                                           list.array[ieId]->extensionValue.choice.SliceSupportList.list.array[sliceId]->sNSSAI.sD->size);
-                                                  }
-                                                  DU_FREE(srvCellItem->served_Cell_Information.servedPLMNs.list.array[servId]->\
-                                                        iE_Extensions->list.array[ieId]->extensionValue.choice.SliceSupportList.\
-                                                        list.array[sliceId]->sNSSAI.sD,sizeof(OCTET_STRING_t));
-                                               }
-                                               DU_FREE(srvCellItem->served_Cell_Information.servedPLMNs.list.array[servId]->\
-                                                     iE_Extensions->list.array[ieId]->extensionValue.choice.SliceSupportList.list.array[sliceId]->\
-                                                     sNSSAI.sST.buf,sizeof(uint8_t));
-                                            }
-                                            DU_FREE(srvCellItem->served_Cell_Information.servedPLMNs.list.array[servId]->iE_Extensions->list.array[0]->\
-                                                  extensionValue.choice.SliceSupportList.list.array[sliceId],sizeof(SliceSupportItem_t));
-                                         }
-                                         DU_FREE(srvCellItem->served_Cell_Information.servedPLMNs.list.array[servId]->iE_Extensions->list.array[0]->\
-                                               extensionValue.choice.SliceSupportList.list.array,sizeof(SliceSupportItem_t*));
-                                      }
-                                      DU_FREE(srvCellItem->served_Cell_Information.servedPLMNs.list.\
-                                            array[servId]->iE_Extensions->list.array[plmnidx],sizeof(ServedPLMNs_ItemExtIEs_t));
-                                   }
-                                   DU_FREE(srvCellItem->served_Cell_Information.servedPLMNs.list.\
-                                         array[servId]->iE_Extensions->list.array,\
-                                         extensionCnt*sizeof(ServedPLMNs_ItemExtIEs_t*));
-                                }
-                                DU_FREE(srvCellItem->served_Cell_Information.servedPLMNs.list.\
-                                      array[servId]->iE_Extensions,sizeof(ProtocolExtensionContainer_4624P3_t));
-                             }
-                             DU_FREE(srvCellItem->served_Cell_Information.servedPLMNs.list.\
-                                   array[servId]->pLMN_Identity.buf,srvCellItem->served_Cell_Information.\
-                                   servedPLMNs.list.array[servId]->pLMN_Identity.size
-                                   * sizeof(uint8_t));
-                          }
-                          DU_FREE(srvCellItem->served_Cell_Information.servedPLMNs.list.array[plmnidx],\
-                                sizeof(ServedPLMNs_Item_t *));
-                       }
-                       DU_FREE(srvCellItem->served_Cell_Information.servedPLMNs.list.array,\
-                             sizeof(ServedPLMNs_Item_t *));
-                    }
-                    DU_FREE(srvCellItem->served_Cell_Information.fiveGS_TAC->buf,\
-                          sizeof(srvCellItem->served_Cell_Information.fiveGS_TAC->size));
-                 }
-                 DU_FREE(srvCellItem->served_Cell_Information.fiveGS_TAC,sizeof(FiveGS_TAC_t));
-              }
-              DU_FREE(srvCellItem->served_Cell_Information.nRCGI.nRCellIdentity.buf,\
-                    srvCellItem->served_Cell_Information.nRCGI.nRCellIdentity.size *
-                    sizeof(uint8_t));
-           }
-           DU_FREE(srvCellItem->served_Cell_Information.nRCGI.pLMN_Identity.buf,\
-                 srvCellItem->served_Cell_Information.nRCGI.pLMN_Identity.size *
-                 sizeof(uint8_t));
-        }
-        DU_FREE(duServedCell->list.array[plmnidx],sizeof(GNB_DU_Served_Cells_ItemIEs_t));
+         srvCellItem= &duServedCell->list.array[0]->value.choice.GNB_DU_Served_Cells_Item;
+
+         DU_FREE(srvCellItem->served_Cell_Information.nRCGI.pLMN_Identity.buf,\
+               srvCellItem->served_Cell_Information.nRCGI.pLMN_Identity.size * sizeof(uint8_t));
+         DU_FREE(srvCellItem->served_Cell_Information.nRCGI.nRCellIdentity.buf,\
+               srvCellItem->served_Cell_Information.nRCGI.nRCellIdentity.size * sizeof(uint8_t));
+
+         if(srvCellItem->served_Cell_Information.fiveGS_TAC!=NULLP)
+         {
+            DU_FREE(srvCellItem->served_Cell_Information.fiveGS_TAC->buf,\
+                  sizeof(srvCellItem->served_Cell_Information.fiveGS_TAC->size));
+            DU_FREE(srvCellItem->served_Cell_Information.fiveGS_TAC,sizeof(FiveGS_TAC_t));
+         }
+
+         if(srvCellItem->served_Cell_Information.servedPLMNs.list.array!=NULLP)
+         {
+            if(srvCellItem->served_Cell_Information.servedPLMNs.list.array[plmnIdx] != NULLP)
+            {
+               servedPlmnItem = srvCellItem->served_Cell_Information.servedPLMNs.list.array[plmnIdx];
+               DU_FREE(servedPlmnItem->pLMN_Identity.buf, servedPlmnItem->pLMN_Identity.size);
+
+               if(servedPlmnItem->iE_Extensions != NULLP)
+               {
+                  if(servedPlmnItem->iE_Extensions->list.array != NULLP)
+                  {
+                     if(servedPlmnItem->iE_Extensions->list.array[0] != NULLP)
+                     {
+                        if(servedPlmnItem->iE_Extensions->list.array[0]->extensionValue.choice.\
+                              SliceSupportList.list.array != NULLP)
+                        {
+                           for(sliceIdx =0; sliceIdx<servedPlmnItem->iE_Extensions->list.array[0]->\
+                                 extensionValue.choice.SliceSupportList.list.count; sliceIdx++)
+                           {
+                              if(servedPlmnItem->iE_Extensions->list.array[0]->extensionValue.choice.\
+                                    SliceSupportList.list.array[sliceIdx] != NULLP)
+                              {
+                                 sliceSupportItem = servedPlmnItem->iE_Extensions->list.array[0]->\
+                                                    extensionValue.choice.SliceSupportList.list.array[sliceIdx];
+
+                                 DU_FREE(sliceSupportItem->sNSSAI.sST.buf, sizeof(uint8_t));
+
+                                 if(sliceSupportItem->sNSSAI.sD != NULLP)
+                                 {
+                                    DU_FREE(sliceSupportItem->sNSSAI.sD->buf,\
+                                          sliceSupportItem->sNSSAI.sD->size);
+                                    DU_FREE(sliceSupportItem->sNSSAI.sD, sizeof(OCTET_STRING_t));
+                                 }
+
+                                 DU_FREE(servedPlmnItem->iE_Extensions->list.array[0]->extensionValue.\
+                                       choice.SliceSupportList.list.array[sliceIdx], sizeof(SliceSupportItem_t));
+                              }
+                           }
+                           DU_FREE(servedPlmnItem->iE_Extensions->list.array[0]->extensionValue.choice.\
+                                 SliceSupportList.list.array, servedPlmnItem->iE_Extensions->list.array[0]->\
+                                 extensionValue.choice.SliceSupportList.list.size);
+                        }
+                        DU_FREE(servedPlmnItem->iE_Extensions->list.array[0],\
+                              sizeof(ServedPLMNs_ItemExtIEs_t));
+                     }
+                     DU_FREE(servedPlmnItem->iE_Extensions->list.array,\
+                           extensionCnt*sizeof(ServedPLMNs_ItemExtIEs_t*));
+                  }
+                  DU_FREE(servedPlmnItem->iE_Extensions, sizeof(ProtocolExtensionContainer_4624P3_t));
+               }
+               DU_FREE(srvCellItem->served_Cell_Information.servedPLMNs.list.array[plmnIdx],\
+                     sizeof(ServedPLMNs_Item_t));
+            }
+            DU_FREE(srvCellItem->served_Cell_Information.servedPLMNs.list.array,\
+                  sizeof(ServedPLMNs_Item_t *));
+         }
+
+         if(srvCellItem->served_Cell_Information.nR_Mode_Info.present == NR_Mode_Info_PR_fDD)
+         {
+            freeFddNrFreqInfo(srvCellItem->served_Cell_Information.nR_Mode_Info.choice.fDD);
+         }
+         else   
+         {
+            if(srvCellItem->served_Cell_Information.nR_Mode_Info.choice.tDD != NULLP)
+            {
+               freeTddNrFreqInfo(&srvCellItem->served_Cell_Information.nR_Mode_Info.choice.tDD->nRFreqInfo);
+               DU_FREE(srvCellItem->served_Cell_Information.nR_Mode_Info.choice.tDD, sizeof(TDD_Info_t));
+            }
+         }
+         
+         DU_FREE(srvCellItem->served_Cell_Information.measurementTimingConfiguration.buf,\
+               srvCellItem->served_Cell_Information.measurementTimingConfiguration.size);
+
+         if(srvCellItem->gNB_DU_System_Information != NULLP)
+         {
+            if(srvCellItem->gNB_DU_System_Information->mIB_message.buf != NULLP)
+            {
+               DU_FREE(srvCellItem->gNB_DU_System_Information->mIB_message.buf,\
+                     srvCellItem->gNB_DU_System_Information->mIB_message.size);
+            }
+
+            if(srvCellItem->gNB_DU_System_Information->sIB1_message.buf != NULLP)
+            { 
+               DU_FREE(srvCellItem->gNB_DU_System_Information->sIB1_message.buf,\
+                     srvCellItem->gNB_DU_System_Information->sIB1_message.size);
+            }
+
+            DU_FREE(srvCellItem->gNB_DU_System_Information, sizeof(GNB_DU_System_Information_t));
+         }
+
+         DU_FREE(duServedCell->list.array[0], sizeof(GNB_DU_Served_Cells_ItemIEs_t));
       }
-      DU_FREE(duServedCell->list.array,plmnCnt*sizeof(GNB_DU_Served_Cells_ItemIEs_t*));
+      DU_FREE(duServedCell->list.array, plmnCnt * sizeof(GNB_DU_Served_Cells_ItemIEs_t*));
    }
 }
+
 /*******************************************************************
  *
  * @brief  deallocating the memory of function BuildAndSendF1SetupReq()
@@ -1515,7 +1351,6 @@ void FreeF1SetupReq(F1AP_PDU_t *f1apMsg)
                        break;
                  }
               }
-              break;
            }
            for(ieIdx2=0; ieIdx2< ieIdx; ieIdx2++)
            {
@@ -1682,24 +1517,33 @@ uint8_t BuildAndSendF1SetupReq()
       /* Encode results */
       if(encRetVal.encoded == ENCODE_FAIL)
       {
-        DU_LOG("\nERROR  -->  F1AP : Could not encode F1SetupRequest structure (at %s)\n",\
-              encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
-        break;
+         DU_LOG("\nERROR  -->  F1AP : Could not encode F1SetupRequest structure (at %s)\n",\
+               encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+         break;
       }
       else
       {
-        DU_LOG("\nDEBUG   -->  F1AP : Created APER encoded buffer for F1SetupRequest\n");
-        for(ieIdx=0; ieIdx< encBufSize; ieIdx++)
-        {
-           printf("%x",encBuf[ieIdx]);
-        }
+         DU_LOG("\nDEBUG   -->  F1AP : Created APER encoded buffer for F1SetupRequest\n");
+         for(ieIdx=0; ieIdx< encBufSize; ieIdx++)
+         {
+            printf("%x",encBuf[ieIdx]);
+         }
+         
+         duCb.f1SetupReqAndRspMsg.f1MsgReqBufSize = encBufSize;
+         DU_ALLOC(duCb.f1SetupReqAndRspMsg.f1MsgReqBuf, encBufSize);
+         if(duCb.f1SetupReqAndRspMsg.f1MsgReqBuf == NULLP)
+         {
+             DU_LOG("\nERROR  -->  F1AP : Memory allocation failed to store the encoding of f1setup req");
+             return RFAILED;
+         }
+         memcpy(duCb.f1SetupReqAndRspMsg.f1MsgReqBuf, &encBuf, duCb.f1SetupReqAndRspMsg.f1MsgReqBufSize);
       }
 
       /* Sending msg */
-      if(SendF1APMsg(DU_APP_MEM_REGION, DU_POOL) != ROK)
+      if(sendF1APMsg() != ROK)
       {
-        DU_LOG("\nERROR  -->  F1AP : Sending F1 Setup request failed");
-        break;
+         DU_LOG("\nERROR  -->  F1AP : Sending F1 Setup request failed");
+         break;
       }
 
       ret=ROK;
@@ -1713,247 +1557,210 @@ uint8_t BuildAndSendF1SetupReq()
 
 /*******************************************************************
  *
- * @brief Deallocating memory of BuildAndSendDUConfigUpdate
+ * @brief Deallocating memory allocated for Served_Cells_To_Modify_Item_t
  *
  * @details
  *
- *    Function : FreeDUConfigUpdate
+ *    Function : freeCellsToModifyItem 
  *
  *    Functionality: Deallocating memory of variables allocated in
  *                    BuildAndSendDUConfigUpdate function
  *
- * @params[in]  F1AP_PDU_t *f1apDuCfg
+ * @params[in]  Served_Cells_To_Modify_Item_t *modifyItem
  *
  * @return ROK     - void
  *
  * ****************************************************************/
-void FreeDUConfigUpdate(F1AP_PDU_t *f1apDuCfg)
+
+void freeCellsToModifyItem(Served_Cells_To_Modify_Item_t *modifyItem)
 {
-   uint8_t  i;
-   uint8_t  idx;
-   GNBDUConfigurationUpdate_t *duCfgUpdate = NULLP;
-   Served_Cells_To_Modify_List_t  *cellsToModify;
-   Served_Cells_To_Modify_Item_t *modifyItem;
-   idx=0;
-   i=1;
-   if(f1apDuCfg != NULLP)
+   uint8_t arrIdx=0, servedPlmnIdx=0, sliceLstIdx=0;
+   ServedPLMNs_Item_t *servedPlmnItem = NULLP;
+   SliceSupportItem_t *sliceSupportItem = NULLP;
+
+   DU_FREE(modifyItem->oldNRCGI.pLMN_Identity.buf, modifyItem->oldNRCGI.pLMN_Identity.size);
+   DU_FREE(modifyItem->oldNRCGI.nRCellIdentity.buf, modifyItem->oldNRCGI.nRCellIdentity.size);
+
+   DU_FREE(modifyItem->served_Cell_Information.nRCGI.pLMN_Identity.buf,\
+           modifyItem->served_Cell_Information.nRCGI.pLMN_Identity.size);
+   DU_FREE(modifyItem->served_Cell_Information.nRCGI.nRCellIdentity.buf,\
+         modifyItem->served_Cell_Information.nRCGI.nRCellIdentity.size);
+
+   if(modifyItem->served_Cell_Information.servedPLMNs.list.array != NULLP)
    {
-      if(f1apDuCfg->choice.initiatingMessage != NULLP)
+      if(modifyItem->served_Cell_Information.servedPLMNs.list.array[arrIdx] != NULLP)
       {
-        duCfgUpdate = &f1apDuCfg->choice.initiatingMessage->\
-                      value.choice.GNBDUConfigurationUpdate;
-        if(duCfgUpdate->protocolIEs.list.array != NULLP)
-        {
-           if(duCfgUpdate->protocolIEs.list.array[i] != NULLP)
-           {
-              cellsToModify = &duCfgUpdate->protocolIEs.list.array[i]->\
-                              value.choice.Served_Cells_To_Modify_List;
-              if(cellsToModify->list.array != NULLP)
-              {
-                 if(cellsToModify->list.array[idx] != NULLP)
-                 {
-                    modifyItem=&cellsToModify->list.array[idx]->value.choice.\
-                               Served_Cells_To_Modify_Item;
-                    if(modifyItem->oldNRCGI.pLMN_Identity.buf != NULLP)
-                    {
-                       if(modifyItem->oldNRCGI.nRCellIdentity.buf != NULLP)
-                       {
-                          if(modifyItem->served_Cell_Information.nRCGI.pLMN_Identity.buf != NULLP)
-                          {
-                             if(modifyItem->served_Cell_Information.nRCGI.nRCellIdentity.buf
-                                   != NULLP)
-                             { 
-                                if(modifyItem->served_Cell_Information.servedPLMNs.list.array\
-                                      != NULLP)
-                                {
-                                   if(!modifyItem->served_Cell_Information.servedPLMNs.list.array[idx])
-                                   {
-                                      if(modifyItem->served_Cell_Information.servedPLMNs.list.\
-                                            array[idx]->pLMN_Identity.buf != NULLP)
-                                      {
-                                         if(modifyItem->served_Cell_Information.servedPLMNs.list.\
-                                               array[idx]->iE_Extensions!= NULLP)
-                                         {
-                                            if(modifyItem->served_Cell_Information.servedPLMNs.list.\
-                                                  array[idx]->iE_Extensions->list.array != NULLP)
-                                            {
-                                               if(modifyItem->served_Cell_Information.servedPLMNs.list.\
-                                                     array[idx]->iE_Extensions->list.array[idx])
-                                               {
-                                                  if(modifyItem->served_Cell_Information.servedPLMNs.list.array[idx]->\
-                                                        iE_Extensions->list.array[idx]->extensionValue.choice.SliceSupportList.\
-                                                        list.array !=NULLP)
-                                                  {
-                                                     if(modifyItem->served_Cell_Information.servedPLMNs.list.array[idx]->\
-                                                           iE_Extensions->list.array[idx]->extensionValue.choice.SliceSupportList.\
-                                                           list.array[idx]!=NULLP)
-                                                     {   
-                                                        if(modifyItem->served_Cell_Information.servedPLMNs.list.array[idx]->\
-                                                              iE_Extensions->list.array[idx]->extensionValue.choice.SliceSupportList.\
-                                                              list.array[idx]->sNSSAI.sST.buf!=NULLP)
-                                                        {
-                                                           if(modifyItem->served_Cell_Information.servedPLMNs.list.array[idx]->\
-                                                                 iE_Extensions->list.array[idx]->extensionValue.choice.SliceSupportList.\
-                                                                 list.array[idx]->sNSSAI.sD != NULLP)
-                                                           { 
-                                                              if(modifyItem->served_Cell_Information.servedPLMNs.list.array[idx]->\
-                                                                    iE_Extensions->list.array[idx]->extensionValue.choice.SliceSupportList.\
-                                                                    list.array[idx]->sNSSAI.sD->buf!=NULLP)
-                                                              {
-                                                                 if(modifyItem->served_Cell_Information.nR_Mode_Info.choice.fDD
-                                                                       !=NULLP)
-                                                                 {
-                                                                    if(modifyItem->served_Cell_Information.nR_Mode_Info.choice.\
-                                                                          fDD->uL_NRFreqInfo.freqBandListNr.list.array!=NULLP)
-                                                                    {
-                                                                       if(modifyItem->served_Cell_Information.nR_Mode_Info.choice.\
-                                                                             fDD->uL_NRFreqInfo.freqBandListNr.list.array[idx]!=NULLP)
-                                                                       {
-                                                                          if(modifyItem->served_Cell_Information.nR_Mode_Info.choice.\
-                                                                                fDD->dL_NRFreqInfo.freqBandListNr.list.array !=NULLP)
-                                                                          {
-                                                                             if(modifyItem->served_Cell_Information.nR_Mode_Info.\
-                                                                                   choice.fDD->dL_NRFreqInfo.freqBandListNr.list.\
-                                                                                   array[idx]!= NULLP)
-                                                                             {
-                                                                                if(modifyItem->served_Cell_Information.\
-                                                                                      measurementTimingConfiguration.buf !=NULLP)
-                                                                                {
-                                                                                   idx=2;
-                                                                                   if(duCfgUpdate->protocolIEs.list.array[idx]->value.\
-                                                                                         choice.GNB_DU_ID.buf!=NULLP)
-                                                                                   {
-                                                                                      DU_FREE(duCfgUpdate->protocolIEs.list.\
-                                                                                            array[idx]->value.choice.GNB_DU_ID.buf,\
-                                                                                            duCfgUpdate->protocolIEs.list.array[idx]->\
-                                                                                            value.choice.GNB_DU_ID.size);
-                                                                                   }
-                                                                                   idx=0;
-                                                                                   DU_FREE(modifyItem->served_Cell_Information.\
-                                                                                         measurementTimingConfiguration.\
-                                                                                         buf,modifyItem->served_Cell_Information.\
-                                                                                         measurementTimingConfiguration.size);
-                                                                                }
-                                                                                DU_FREE(modifyItem->served_Cell_Information.\
-                                                                                      nR_Mode_Info.choice.fDD->dL_NRFreqInfo.freqBandListNr.\
-                                                                                      list.array[idx],sizeof(FreqBandNrItem_t));
-                                                                             }
-                                                                             DU_FREE(modifyItem->served_Cell_Information.nR_Mode_Info\
-                                                                                   .choice.fDD->dL_NRFreqInfo.freqBandListNr.list.array,\
-                                                                                   modifyItem->served_Cell_Information.nR_Mode_Info.\
-                                                                                   choice.fDD->dL_NRFreqInfo.freqBandListNr.list.size);
-                                                                          }
-                                                                          DU_FREE(modifyItem->served_Cell_Information.nR_Mode_Info.\
-                                                                                choice.fDD->uL_NRFreqInfo.freqBandListNr.list.\
-                                                                                array[idx],sizeof(FreqBandNrItem_t));
-                                                                       }
-                                                                       DU_FREE(modifyItem->served_Cell_Information.nR_Mode_Info.\
-                                                                             choice.\
-                                                                             fDD->uL_NRFreqInfo.freqBandListNr.list.\
-                                                                             array,modifyItem->served_Cell_Information.nR_Mode_Info.choice.\
-                                                                             fDD->uL_NRFreqInfo.freqBandListNr.list.size);
-                                                                    }
-                                                                    DU_FREE(modifyItem->served_Cell_Information.nR_Mode_Info.choice.\
-                                                                          fDD,sizeof(FDD_Info_t));
-                                                                 }
-                                                                 DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.\
-                                                                       array[idx]->iE_Extensions->list.array[idx]->extensionValue.choice.\
-                                                                       SliceSupportList.\
-                                                                       list.array[idx]->sNSSAI.sD->buf,modifyItem->served_Cell_Information.\
-                                                                       servedPLMNs.list.array[idx]->iE_Extensions->list.array[idx]->\
-                                                                       extensionValue.choice.SliceSupportList.list.array[idx]->\
-                                                                       sNSSAI.sD->size);
-
-                                                              }
-                                                              DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.\
-                                                                    array[idx]->\
-                                                                    iE_Extensions->list.array[idx]->extensionValue.choice.SliceSupportList.\
-                                                                    list.array[idx]->sNSSAI.sD,sizeof(OCTET_STRING_t));
-                                                           }
-                                                           DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.array[idx]->\
-                                                                 iE_Extensions->list.array[idx]->extensionValue.choice.SliceSupportList.\
-                                                                 list.array[idx]->sNSSAI.sST.buf,modifyItem->served_Cell_Information.\
-                                                                 servedPLMNs.\
-                                                                 list.array[idx]->iE_Extensions->list.array[idx]->extensionValue.choice.\
-                                                                 SliceSupportList.list.array[idx]->sNSSAI.sST.size);
-                                                        }
-                                                        DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.array[idx]->\
-                                                              iE_Extensions->list.array[idx]->extensionValue.choice.SliceSupportList.\
-                                                              list.array[idx],sizeof(SliceSupportItem_t));
-                                                     }
-                                                     DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.array[idx]->\
-                                                           iE_Extensions->list.array[idx]->extensionValue.choice.SliceSupportList.\
-                                                           list.array,\
-                                                           modifyItem->served_Cell_Information.servedPLMNs.list.array[idx]->\
-                                                           iE_Extensions->list.array[idx]->extensionValue.choice.SliceSupportList.list.size);
-                                                  }
-                                               }
-                                               for(i=0;i<modifyItem->served_Cell_Information.servedPLMNs.list.\
-                                                     array[idx]->iE_Extensions->list.count;i++)
-                                               {
-                                                  DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.\
-                                                        array[idx]->iE_Extensions->list.array[i],\
-                                                        sizeof(ServedPLMNs_ItemExtIEs_t ));
-                                               }
-                                               DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.\
-                                                     array[idx]->iE_Extensions->list.array,modifyItem->served_Cell_Information.servedPLMNs.
-                                                     list.array[idx]->iE_Extensions->list.size);
-                                            }
-                                            DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.\
-                                                  array[idx]->iE_Extensions,sizeof(ProtocolExtensionContainer_4624P3_t));
-                                         }
-                                         DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.\
-                                               array[idx]->pLMN_Identity.buf,
-                                               modifyItem->served_Cell_Information.servedPLMNs.list.array[idx]->pLMN_Identity.size);
-                                      }
-                                   }
-                                   for(i=0;i<modifyItem->served_Cell_Information.servedPLMNs.list.count;i++)
-                                   {
-                                      if(modifyItem->served_Cell_Information.servedPLMNs.list.array[i]
-                                            != NULLP)
-                                      {
-                                         DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.array[i],\
-                                               sizeof(ServedPLMNs_Item_t));
-                                      }
-                                   }
-                                   DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.array,\
-                                         modifyItem->served_Cell_Information.servedPLMNs.list.size);
-                                }
-                                DU_FREE(modifyItem->served_Cell_Information.nRCGI.nRCellIdentity.buf,\
-                                      modifyItem->served_Cell_Information.nRCGI.nRCellIdentity.size);          
-                             }
-                             DU_FREE(modifyItem->served_Cell_Information.nRCGI.pLMN_Identity.buf,\
-                                   modifyItem->served_Cell_Information.nRCGI.pLMN_Identity.size);
-                          }
-                          DU_FREE(modifyItem->oldNRCGI.nRCellIdentity.buf,\
-                                modifyItem->oldNRCGI.nRCellIdentity.size);
-                       }
-                       DU_FREE(modifyItem->oldNRCGI.pLMN_Identity.buf,\
-                             modifyItem->oldNRCGI.pLMN_Identity.size);
-                    }
-                 }
-                 for(i=0; i<cellsToModify->list.count ;i++)
-                 {
-                    if(cellsToModify->list.array[i] != NULLP)
-                    {
-                       DU_FREE(cellsToModify->list.array[i],\
-                             sizeof(Served_Cells_To_Modify_ItemIEs_t));
-                    } 
-                 }
-                 DU_FREE(cellsToModify->list.array,cellsToModify->list.size);
-              }
-           }
-           for(i=0;i<duCfgUpdate->protocolIEs.list.count;i++)
-           {
-              if(duCfgUpdate->protocolIEs.list.array[i] !=NULLP)
-              {
-                 DU_FREE(duCfgUpdate->protocolIEs.list.array[i],\
-                       sizeof(GNBDUConfigurationUpdateIEs_t));
-              }
-           }
-           DU_FREE(duCfgUpdate->protocolIEs.list.array,duCfgUpdate->protocolIEs.list.size);
-        }
-        DU_FREE(f1apDuCfg->choice.initiatingMessage,sizeof(InitiatingMessage_t));
+         servedPlmnItem = modifyItem->served_Cell_Information.servedPLMNs.list.array[arrIdx];
+
+         DU_FREE(servedPlmnItem->pLMN_Identity.buf,servedPlmnItem->pLMN_Identity.size);
+
+         if(servedPlmnItem->iE_Extensions != NULLP)
+         {
+            if(servedPlmnItem->iE_Extensions->list.array != NULLP)
+            {
+               if(servedPlmnItem->iE_Extensions->list.array[arrIdx] != NULLP)
+               {
+                  if(servedPlmnItem->iE_Extensions->list.array[arrIdx]->extensionValue.choice.SliceSupportList.\
+                        list.array != NULLP)
+                  {
+                     for(sliceLstIdx =0; sliceLstIdx<servedPlmnItem->iE_Extensions->list.array[arrIdx]->\
+                           extensionValue.choice.SliceSupportList.list.count; sliceLstIdx++)
+                     {
+                        if(servedPlmnItem->iE_Extensions->list.array[arrIdx]->extensionValue.choice.SliceSupportList.\
+                              list.array[sliceLstIdx] != NULLP)
+                        {
+
+                           sliceSupportItem = servedPlmnItem->iE_Extensions->list.array[arrIdx]->extensionValue.choice.\
+                                              SliceSupportList.list.array[sliceLstIdx];
+
+                           DU_FREE(sliceSupportItem->sNSSAI.sST.buf, sliceSupportItem->sNSSAI.sST.size);
+                           if(sliceSupportItem->sNSSAI.sD != NULLP)
+                           {
+                              DU_FREE(sliceSupportItem->sNSSAI.sD->buf, sliceSupportItem->sNSSAI.sD->size);
+                              DU_FREE(sliceSupportItem->sNSSAI.sD,sizeof(OCTET_STRING_t));
+                           }
+                           DU_FREE(servedPlmnItem->iE_Extensions->list.array[arrIdx]->extensionValue.choice.\
+                                 SliceSupportList.list.array[sliceLstIdx], sizeof(SliceSupportItem_t));
+                        }
+                     }
+                     DU_FREE(servedPlmnItem->iE_Extensions->list.array[arrIdx]->extensionValue.\
+                           choice.SliceSupportList.list.array,\
+                           servedPlmnItem->iE_Extensions->list.array[arrIdx]->\
+                           extensionValue.choice.SliceSupportList.list.size);
+                  }
+               }
+               for(servedPlmnIdx=0; servedPlmnIdx< servedPlmnItem->iE_Extensions->list.count ; servedPlmnIdx++)
+               {
+                  DU_FREE(servedPlmnItem->iE_Extensions->list.array[servedPlmnIdx], sizeof(ServedPLMNs_ItemExtIEs_t ));
+               }
+               DU_FREE(servedPlmnItem->iE_Extensions->list.array, servedPlmnItem->iE_Extensions->list.size);
+            }
+            DU_FREE(servedPlmnItem->iE_Extensions,sizeof(ProtocolExtensionContainer_4624P3_t));
+         }
+      }
+      for(servedPlmnIdx=0; servedPlmnIdx<modifyItem->served_Cell_Information.servedPLMNs.list.count; servedPlmnIdx++)
+      {
+         DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.array[servedPlmnIdx], sizeof(ServedPLMNs_Item_t));
+      }
+      DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.array,\
+         modifyItem->served_Cell_Information.servedPLMNs.list.size);
+   }
+   
+   if(modifyItem->served_Cell_Information.nR_Mode_Info.present == NR_Mode_Info_PR_fDD)
+   {
+      freeFddNrFreqInfo(modifyItem->served_Cell_Information.nR_Mode_Info.choice.fDD);
+   }  
+   else
+   {
+      if(modifyItem->served_Cell_Information.nR_Mode_Info.choice.tDD)
+      {
+         freeTddNrFreqInfo(&modifyItem->served_Cell_Information.nR_Mode_Info.choice.tDD->nRFreqInfo);
+         DU_FREE(modifyItem->served_Cell_Information.nR_Mode_Info.choice.tDD, sizeof(TDD_Info_t));
+      }
+   }
+   DU_FREE(modifyItem->served_Cell_Information.measurementTimingConfiguration.buf,\
+      modifyItem->served_Cell_Information.measurementTimingConfiguration.size);
+}
+
+/*******************************************************************
+ *
+ * @brief Deallocating memory of BuildAndSendDUConfigUpdate
+ *
+ * @details
+ *
+ *    Function : FreeDUConfigUpdate
+ *
+ *    Functionality: Deallocating memory of variables allocated in
+ *                    BuildAndSendDUConfigUpdate function
+ *
+ * @params[in]  F1AP_PDU_t *f1apDuCfg
+ *
+ * @return ROK     - void
+ *
+ * ****************************************************************/
+void FreeDUConfigUpdate(F1AP_PDU_t *f1apDuCfg)
+{
+   uint8_t  ieIdx=0, cellModifyIdx=0, cellDeleteIdx=0;
+   GNBDUConfigurationUpdate_t *duCfgUpdate = NULLP;
+   Served_Cells_To_Modify_List_t  *cellsToModify=NULLP;
+   Served_Cells_To_Delete_List_t  *cellsToDelete=NULLP;
+   Served_Cells_To_Delete_Item_t  *deleteItem = NULLP;
+   Served_Cells_To_Delete_ItemIEs_t *deleteItemIe = NULLP;
+
+   if(f1apDuCfg != NULLP)
+   {
+      if(f1apDuCfg->choice.initiatingMessage != NULLP)
+      {
+         duCfgUpdate = &f1apDuCfg->choice.initiatingMessage->\
+                       value.choice.GNBDUConfigurationUpdate;
+         if(duCfgUpdate->protocolIEs.list.array != NULLP)
+         {
+            for(ieIdx=0; ieIdx<duCfgUpdate->protocolIEs.list.count; ieIdx++)
+            {
+               if(duCfgUpdate->protocolIEs.list.array[ieIdx] != NULLP)
+               {
+                  switch(duCfgUpdate->protocolIEs.list.array[ieIdx]->id)
+                  {
+                     case ProtocolIE_ID_id_Served_Cells_To_Modify_List:
+                        {
+                           cellsToModify = &duCfgUpdate->protocolIEs.list.array[ieIdx]->\
+                                           value.choice.Served_Cells_To_Modify_List;
+                           if(cellsToModify->list.array != NULLP)
+                           {
+                              for(cellModifyIdx=0; cellModifyIdx<cellsToModify->list.count ;cellModifyIdx++)
+                              {
+                                 if(cellsToModify->list.array[cellModifyIdx] != NULLP)
+                                 {
+                                    freeCellsToModifyItem(&cellsToModify->list.array[cellModifyIdx]->value.choice.\
+                                          Served_Cells_To_Modify_Item);
+                                    DU_FREE(cellsToModify->list.array[cellModifyIdx],\
+                                          sizeof(Served_Cells_To_Modify_ItemIEs_t));
+                                 }
+                              }
+                              DU_FREE(cellsToModify->list.array,cellsToModify->list.size);
+                           }
+                           break;
+                        }
+                     case ProtocolIE_ID_id_Served_Cells_To_Delete_List:
+                        {
+                           cellsToDelete = &duCfgUpdate->protocolIEs.list.array[ieIdx]->\
+                                           value.choice.Served_Cells_To_Delete_List;
+                           if(cellsToDelete->list.array != NULLP)
+                           {
+                              for(cellDeleteIdx=0; cellDeleteIdx<cellsToDelete->list.count ;cellDeleteIdx++)
+                              {
+                                 if(cellsToDelete->list.array[cellDeleteIdx] != NULLP)
+                                 {
+                                    deleteItemIe = ((Served_Cells_To_Delete_ItemIEs_t*)\
+                                          cellsToDelete->list.array[cellDeleteIdx]);
+                                    deleteItem=&deleteItemIe->value.choice.Served_Cells_To_Delete_Item;
+                                    DU_FREE(deleteItem->oldNRCGI.pLMN_Identity.buf,\
+                                          deleteItem->oldNRCGI.pLMN_Identity.size); 
+                                    DU_FREE(deleteItem->oldNRCGI.nRCellIdentity.buf,\
+                                          deleteItem->oldNRCGI.nRCellIdentity.size);
+                                    DU_FREE(cellsToDelete->list.array[cellDeleteIdx],\
+                                          sizeof(Served_Cells_To_Delete_ItemIEs_t));
+                                 }
+                              }
+                              DU_FREE(cellsToDelete->list.array,cellsToDelete->list.size);
+                           }
+
+                           break;
+                        }
+                     case ProtocolIE_ID_id_gNB_DU_ID:
+                        {
+                           DU_FREE(duCfgUpdate->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_ID.buf,\
+                                 duCfgUpdate->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_ID.size);
+                           break;
+                        }
+                  }
+                  DU_FREE(duCfgUpdate->protocolIEs.list.array[ieIdx],\
+                        sizeof(GNBDUConfigurationUpdateIEs_t));
+               }
+            }
+            DU_FREE(duCfgUpdate->protocolIEs.list.array,duCfgUpdate->protocolIEs.list.size);
+         }
+         DU_FREE(f1apDuCfg->choice.initiatingMessage,sizeof(InitiatingMessage_t));
       }
       DU_FREE(f1apDuCfg, (Size)sizeof(F1AP_PDU_t));
    }
@@ -1978,119 +1785,135 @@ void FreeDUConfigUpdate(F1AP_PDU_t *f1apDuCfg)
 
 uint8_t fillServedPlmns(ServedPLMNs_List_t *servedPlmn)
 {
-   uint8_t ieIdx, ieListCnt;
+   uint8_t ieIdx=0, arrayIdx=0, ieListCnt=0, elementCnt=0, sliceLstIdx=0;
 
-   servedPlmn->list.array[0]->pLMN_Identity.size = 3*sizeof(uint8_t);
-   DU_ALLOC(servedPlmn->list.array[0]->pLMN_Identity.buf, servedPlmn->list.\
-        array[0]->pLMN_Identity.size);
-   if(servedPlmn->list.array[0]->pLMN_Identity.buf == NULLP)
+   servedPlmn->list.array[arrayIdx]->pLMN_Identity.size = 3*sizeof(uint8_t);
+   DU_ALLOC(servedPlmn->list.array[arrayIdx]->pLMN_Identity.buf, servedPlmn->list.\
+         array[arrayIdx]->pLMN_Identity.size);
+   if(servedPlmn->list.array[arrayIdx]->pLMN_Identity.buf == NULLP)
    {
+      DU_LOG("ERROR  --> DU_APP : fillServedPlmns(): Memory allocation failed");
       return RFAILED;
    }
-   buildPlmnId(duCfgParam.srvdCellLst[0].duCellInfo.cellInfo.plmn[0],\
-        servedPlmn->list.array[0]->pLMN_Identity.buf);
-   DU_ALLOC(servedPlmn->list.array[0]->iE_Extensions,sizeof(ProtocolExtensionContainer_4624P3_t));
-   if(servedPlmn->list.array[0]->iE_Extensions == NULLP)
+   buildPlmnId(duCfgParam.srvdCellLst[arrayIdx].duCellInfo.cellInfo.srvdPlmn[arrayIdx].plmn,\
+         servedPlmn->list.array[arrayIdx]->pLMN_Identity.buf);
+   DU_ALLOC(servedPlmn->list.array[arrayIdx]->iE_Extensions,sizeof(ProtocolExtensionContainer_4624P3_t));
+   if(servedPlmn->list.array[arrayIdx]->iE_Extensions == NULLP)
    {
+      DU_LOG("ERROR  --> DU_APP : fillServedPlmns(): Memory allocation failed");
       return RFAILED;
    }
 
    ieListCnt=1;
-   servedPlmn->list.array[0]->iE_Extensions->list.count = ieListCnt;
-   servedPlmn->list.array[0]->iE_Extensions->list.size = ieListCnt *sizeof(ServedPLMNs_ItemExtIEs_t *);
-   DU_ALLOC(servedPlmn->list.array[0]->iE_Extensions->list.array,servedPlmn->list.array[0]->\
-        iE_Extensions->list.size);
-   if(servedPlmn->list.array[0]->iE_Extensions->list.array == NULLP)
+   servedPlmn->list.array[arrayIdx]->iE_Extensions->list.count = ieListCnt;
+   servedPlmn->list.array[arrayIdx]->iE_Extensions->list.size = ieListCnt *sizeof(ServedPLMNs_ItemExtIEs_t *);
+   DU_ALLOC(servedPlmn->list.array[arrayIdx]->iE_Extensions->list.array,servedPlmn->list.array[arrayIdx]->\
+         iE_Extensions->list.size);
+   if(servedPlmn->list.array[arrayIdx]->iE_Extensions->list.array == NULLP)
    {
+      DU_LOG("ERROR  --> DU_APP : fillServedPlmns(): Memory allocation failed");
       return RFAILED;
    }
-   for(ieIdx=0;ieIdx<ieListCnt;ieIdx++)
+   for(ieIdx=arrayIdx;ieIdx<ieListCnt;ieIdx++)
    {
-      DU_ALLOC(servedPlmn->list.array[0]->iE_Extensions->list.array[ieIdx],\
-           sizeof(ServedPLMNs_ItemExtIEs_t));
-      if(servedPlmn->list.array[0]->iE_Extensions->list.array[ieIdx] == NULLP)
+      DU_ALLOC(servedPlmn->list.array[arrayIdx]->iE_Extensions->list.array[ieIdx],\
+            sizeof(ServedPLMNs_ItemExtIEs_t));
+      if(servedPlmn->list.array[arrayIdx]->iE_Extensions->list.array[ieIdx] == NULLP)
       {
-        return RFAILED;
+         DU_LOG("ERROR  --> DU_APP : fillServedPlmns(): Memory allocation failed");
+         return RFAILED;
+      }
+   }
+   
+   ieIdx = 0;
+   elementCnt = duCfgParam.srvdCellLst[0].duCellInfo.cellInfo.srvdPlmn[0].taiSliceSuppLst.numSupportedSlices; 
+   servedPlmn->list.array[arrayIdx]->iE_Extensions->list.array[ieIdx]->id =ProtocolIE_ID_id_TAISliceSupportList;
+   servedPlmn->list.array[arrayIdx]->iE_Extensions->list.array[ieIdx]->criticality = Criticality_ignore;
+   servedPlmn->list.array[arrayIdx]->iE_Extensions->list.array[ieIdx]->extensionValue.present = \
+   ServedPLMNs_ItemExtIEs__extensionValue_PR_SliceSupportList;
+   servedPlmn->list.array[arrayIdx]->iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+      list.count = elementCnt;
+   servedPlmn->list.array[arrayIdx]->\
+      iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+      list.size = elementCnt * sizeof(SliceSupportItem_t *);
+   DU_ALLOC(servedPlmn->list.array[arrayIdx]->\
+         iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+         list.array,servedPlmn->list.array[arrayIdx]->\
+         iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.list.size);
+   if(servedPlmn->list.array[arrayIdx]->\
+         iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+         list.array == NULLP)
+   {
+      DU_LOG("ERROR  --> DU_APP : fillServedPlmns(): Memory allocation failed");
+      return RFAILED;
+   }
+
+   for(sliceLstIdx =0; sliceLstIdx< elementCnt; sliceLstIdx++)
+   {
+      DU_ALLOC(servedPlmn->list.array[arrayIdx]->\
+      iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+      list.array[sliceLstIdx],sizeof( SliceSupportItem_t));
+      if(servedPlmn->list.array[arrayIdx]->\
+      iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+      list.array[sliceLstIdx] == NULLP)
+      {   
+         DU_LOG("ERROR  --> DU_APP : fillServedPlmns(): Memory allocation failed");
+         return RFAILED;
+      }
+      
+      servedPlmn->list.array[arrayIdx]->\
+      iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+      list.array[sliceLstIdx]->sNSSAI.sST.size = sizeof(uint8_t);
+      DU_ALLOC(servedPlmn->list.array[arrayIdx]->\
+      iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+      list.array[sliceLstIdx]->sNSSAI.sST.buf,servedPlmn->list.array[arrayIdx]->\
+      iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.list.array[sliceLstIdx]->\
+      sNSSAI.sST.size);
+      
+      if(servedPlmn->list.array[arrayIdx]->\
+      iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+      list.array[sliceLstIdx]->sNSSAI.sST.buf == NULLP)
+      {
+         DU_LOG("ERROR  --> DU_APP : fillServedPlmns(): Memory allocation failed");
+         return RFAILED;
+      }
+      servedPlmn->list.array[arrayIdx]->\
+      iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+      list.array[sliceLstIdx]->sNSSAI.sST.buf[arrayIdx] =  duCfgParam.srvdCellLst[arrayIdx].duCellInfo.\
+      cellInfo.srvdPlmn[arrayIdx].taiSliceSuppLst.snssai[sliceLstIdx]->sst;
+
+      DU_ALLOC(servedPlmn->list.array[arrayIdx]->\
+      iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+      list.array[sliceLstIdx]->sNSSAI.sD,sizeof(OCTET_STRING_t));
+      if(servedPlmn->list.array[arrayIdx]->\
+      iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+      list.array[sliceLstIdx]->sNSSAI.sD == NULLP)
+      {
+         DU_LOG("ERROR  --> DU_APP : fillServedPlmns(): Memory allocation failed");
+         return RFAILED;
+      }
+      servedPlmn->list.array[arrayIdx]->\
+      iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+      list.array[sliceLstIdx]->sNSSAI.sD->size = 3 * sizeof(uint8_t);
+      DU_ALLOC(servedPlmn->list.array[arrayIdx]->\
+      iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+      list.array[sliceLstIdx]->sNSSAI.sD->buf,servedPlmn->list.array[arrayIdx]->\
+      iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+      list.array[sliceLstIdx]->sNSSAI.sD->size);
+      if(servedPlmn->list.array[arrayIdx]->\
+      iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+      list.array[sliceLstIdx]->sNSSAI.sD->buf == NULLP)
+      {
+         DU_LOG("ERROR  --> DU_APP : fillServedPlmns(): Memory allocation failed");
+         return RFAILED;
       }
+      memcpy(servedPlmn->list.array[arrayIdx]->\
+      iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+      list.array[sliceLstIdx]->sNSSAI.sD->buf, duCfgParam.srvdCellLst[arrayIdx].duCellInfo.\
+      cellInfo.srvdPlmn[arrayIdx].taiSliceSuppLst.snssai[sliceLstIdx]->sd,\
+      servedPlmn->list.array[arrayIdx]->iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+      list.array[sliceLstIdx]->sNSSAI.sD->size);
    }
-   //plmnIeExt = servedPlmn->list.array[0]->iE_Extensions; 
-   servedPlmn->list.array[0]->iE_Extensions->list.array[0]->id =ProtocolIE_ID_id_TAISliceSupportList;
-   servedPlmn->list.array[0]->iE_Extensions->list.array[0]->criticality = Criticality_ignore;
-   servedPlmn->list.array[0]->iE_Extensions->list.array[0]->extensionValue.present = \
-      ServedPLMNs_ItemExtIEs__extensionValue_PR_SliceSupportList;
-   servedPlmn->list.array[0]->iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-      list.count = 1;
-   servedPlmn->list.array[0]->\
-      iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-      list.size = sizeof(SliceSupportItem_t *);
-   DU_ALLOC(servedPlmn->list.array[0]->\
-        iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-        list.array,servedPlmn->list.array[0]->\
-        iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.list.size);
-   if(servedPlmn->list.array[0]->\
-        iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-        list.array == NULLP)
-   {
-      return RFAILED;
-   }
-
-   DU_ALLOC(servedPlmn->list.array[0]->\
-        iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-        list.array[0],sizeof( SliceSupportItem_t));
-   if(servedPlmn->list.array[0]->\
-        iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-        list.array[0] == NULLP)
-   {
-      return RFAILED;
-   }
-   servedPlmn->list.array[0]->\
-      iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-      list.array[0]->sNSSAI.sST.size = sizeof(uint8_t);
-   DU_ALLOC(servedPlmn->list.array[0]->\
-        iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-        list.array[0]->sNSSAI.sST.buf,servedPlmn->list.array[0]->\
-        iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.list.array[0]->sNSSAI.sST.size);
-   if(servedPlmn->list.array[0]->\
-        iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-        list.array[0]->sNSSAI.sST.buf == NULLP)
-   {
-      return RFAILED;
-   }
-   servedPlmn->list.array[0]->\
-      iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-      list.array[0]->sNSSAI.sST.buf[0] = 3;
-   DU_ALLOC(servedPlmn->list.array[0]->\
-        iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-        list.array[0]->sNSSAI.sD,sizeof(OCTET_STRING_t));
-   if(servedPlmn->list.array[0]->\
-        iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-        list.array[0]->sNSSAI.sD == NULLP)
-   {
-      return RFAILED;
-   }
-   servedPlmn->list.array[0]->\
-      iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-      list.array[0]->sNSSAI.sD->size = 3*sizeof(uint8_t);
-   DU_ALLOC(servedPlmn->list.array[0]->\
-        iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-        list.array[0]->sNSSAI.sD->buf,servedPlmn->list.array[0]->\
-        iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-        list.array[0]->sNSSAI.sD->size);
-   if(servedPlmn->list.array[0]->\
-        iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-        list.array[0]->sNSSAI.sD->buf == NULLP)
-   {
-      return RFAILED;
-   }
-   servedPlmn->list.array[0]->\
-      iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-      list.array[0]->sNSSAI.sD->buf[0] = 3;
-   servedPlmn->list.array[0]->\
-      iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-      list.array[0]->sNSSAI.sD->buf[1] = 6;
-   servedPlmn->list.array[0]->\
-      iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
-      list.array[0]->sNSSAI.sD->buf[2] = 9;
    return ROK;
 }
 
@@ -2104,64 +1927,70 @@ uint8_t fillServedPlmns(ServedPLMNs_List_t *servedPlmn)
  *
  *    Functionality: Fills Nr Fdd Info required in ServCellInfo IE
  *
- * @params[in] Pointer to NR_Mode_Info_t *
+ * @params[in] FDD_Info_t *fDD
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  *****************************************************************/
 
-uint8_t fillNrFddInfo(NR_Mode_Info_t *nrFdd)
+uint8_t fillNrFddInfo(FDD_Info_t *fDD)
 {
-   nrFdd->choice.fDD->uL_NRFreqInfo.nRARFCN = duCfgParam.srvdCellLst[0].duCellInfo.\
+   fDD->uL_NRFreqInfo.nRARFCN = duCfgParam.srvdCellLst[0].duCellInfo.\
       f1Mode.mode.fdd.ulNrFreqInfo.nrArfcn;
-   nrFdd->choice.fDD->uL_NRFreqInfo.freqBandListNr.list.count = 1;
-   nrFdd->choice.fDD->uL_NRFreqInfo.freqBandListNr.list.size = sizeof(FreqBandNrItem_t*);
-   DU_ALLOC(nrFdd->choice.fDD->uL_NRFreqInfo.freqBandListNr.list.\
-        array, nrFdd->choice.fDD->uL_NRFreqInfo.freqBandListNr.list.size);
-   if(nrFdd->choice.fDD->uL_NRFreqInfo.freqBandListNr.list.array == NULLP)
+   fDD->uL_NRFreqInfo.freqBandListNr.list.count = 1;
+   fDD->uL_NRFreqInfo.freqBandListNr.list.size = sizeof(FreqBandNrItem_t*);
+   DU_ALLOC(fDD->uL_NRFreqInfo.freqBandListNr.list.\
+        array, fDD->uL_NRFreqInfo.freqBandListNr.list.size);
+   if(fDD->uL_NRFreqInfo.freqBandListNr.list.array == NULLP)
    {
+      DU_LOG("\nERROR  --> Memory allocation failed in fillNrFddInfo");
       return RFAILED;
    }
-   DU_ALLOC(nrFdd->choice.fDD->uL_NRFreqInfo.freqBandListNr.list.array[0], \
+
+   DU_ALLOC(fDD->uL_NRFreqInfo.freqBandListNr.list.array[0], \
       sizeof(FreqBandNrItem_t));
-   if(nrFdd->choice.fDD->uL_NRFreqInfo.freqBandListNr.list.array[0] == NULLP)
+   if(fDD->uL_NRFreqInfo.freqBandListNr.list.array[0] == NULLP)
    {
+      DU_LOG("\nERROR  --> Memory allocation failed in fillNrFddInfo");
       return RFAILED;
    }
-   nrFdd->choice.fDD->uL_NRFreqInfo.freqBandListNr.list.array[0]->freqBandIndicatorNr = \
+   
+   fDD->uL_NRFreqInfo.freqBandListNr.list.array[0]->freqBandIndicatorNr = \
       duCfgParam.srvdCellLst[0].duCellInfo.f1Mode.mode.fdd.ulNrFreqInfo.\
       freqBand[0].nrFreqBand;
-   nrFdd->choice.fDD->uL_NRFreqInfo.freqBandListNr.list.array[0]->supportedSULBandList.list.count=0;
-   nrFdd->choice.fDD->dL_NRFreqInfo.nRARFCN = duCfgParam.srvdCellLst[0].duCellInfo.f1Mode.mode.fdd.\
+   fDD->uL_NRFreqInfo.freqBandListNr.list.array[0]->supportedSULBandList.list.count=0;
+   fDD->dL_NRFreqInfo.nRARFCN = duCfgParam.srvdCellLst[0].duCellInfo.f1Mode.mode.fdd.\
       dlNrFreqInfo.nrArfcn;
-   nrFdd->choice.fDD->dL_NRFreqInfo.freqBandListNr.list.count = 1;
-   nrFdd->choice.fDD->dL_NRFreqInfo.freqBandListNr.list.size = sizeof(FreqBandNrItem_t *);
-   DU_ALLOC(nrFdd->choice.fDD->dL_NRFreqInfo.freqBandListNr.list.array,nrFdd->\
-        choice.fDD->dL_NRFreqInfo.freqBandListNr.list.size);
-   if(nrFdd->choice.fDD->dL_NRFreqInfo.freqBandListNr.list.array == NULLP)
+   fDD->dL_NRFreqInfo.freqBandListNr.list.count = 1;
+   fDD->dL_NRFreqInfo.freqBandListNr.list.size = sizeof(FreqBandNrItem_t *);
+   DU_ALLOC(fDD->dL_NRFreqInfo.freqBandListNr.list.array, fDD->dL_NRFreqInfo.freqBandListNr.list.size);
+   if(fDD->dL_NRFreqInfo.freqBandListNr.list.array == NULLP)
    {
+      DU_LOG("\nERROR  --> Memory allocation failed in fillNrFddInfo");
       return RFAILED;
    }
-   DU_ALLOC(nrFdd->choice.fDD->dL_NRFreqInfo.freqBandListNr.list.array[0],\
-        sizeof(FreqBandNrItem_t));
-   if(nrFdd->choice.fDD->dL_NRFreqInfo.freqBandListNr.list.array[0] == NULLP)
+   
+   DU_ALLOC(fDD->dL_NRFreqInfo.freqBandListNr.list.array[0],  sizeof(FreqBandNrItem_t));
+   if(fDD->dL_NRFreqInfo.freqBandListNr.list.array[0] == NULLP)
    {
+      DU_LOG("\nERROR  --> Memory allocation failed in fillNrFddInfo");
       return RFAILED;
    }
-   nrFdd->choice.fDD->dL_NRFreqInfo.freqBandListNr.list.array[0]->freqBandIndicatorNr = \
+
+   fDD->dL_NRFreqInfo.freqBandListNr.list.array[0]->freqBandIndicatorNr = \
       duCfgParam.srvdCellLst[0].duCellInfo.f1Mode.mode.fdd.dlNrFreqInfo.\
       freqBand[0].nrFreqBand;
-   nrFdd->choice.fDD->dL_NRFreqInfo.freqBandListNr.list.array[0]->supportedSULBandList.list.count=0;
+   fDD->dL_NRFreqInfo.freqBandListNr.list.array[0]->supportedSULBandList.list.count=0;
    
    /*Transmission Bandwidth*/
-   nrFdd->choice.fDD->uL_Transmission_Bandwidth.nRSCS = duCfgParam.srvdCellLst[0].duCellInfo.\
+   fDD->uL_Transmission_Bandwidth.nRSCS = duCfgParam.srvdCellLst[0].duCellInfo.\
       f1Mode.mode.fdd.ulTxBw.nrScs;
-   nrFdd->choice.fDD->uL_Transmission_Bandwidth.nRNRB = duCfgParam.srvdCellLst[0].duCellInfo.\
+   fDD->uL_Transmission_Bandwidth.nRNRB = duCfgParam.srvdCellLst[0].duCellInfo.\
       f1Mode.mode.fdd.ulTxBw.nrb;
-   nrFdd->choice.fDD->dL_Transmission_Bandwidth.nRSCS = duCfgParam.srvdCellLst[0].duCellInfo.\
+   fDD->dL_Transmission_Bandwidth.nRSCS = duCfgParam.srvdCellLst[0].duCellInfo.\
       f1Mode.mode.fdd.dlTxBw.nrScs;
-   nrFdd->choice.fDD->dL_Transmission_Bandwidth.nRNRB = duCfgParam.srvdCellLst[0].duCellInfo.\
+   fDD->dL_Transmission_Bandwidth.nRNRB = duCfgParam.srvdCellLst[0].duCellInfo.\
       f1Mode.mode.fdd.dlTxBw.nrb;
 
    return ROK;
@@ -2186,7 +2015,7 @@ uint8_t fillNrFddInfo(NR_Mode_Info_t *nrFdd)
 
 uint8_t fillServedCellInfo(Served_Cell_Information_t *srvCellInfo)
 {
-   uint8_t tmp, ieIdx, ieListCnt;
+   uint8_t ieIdx, ieListCnt;
 
    /*nRCGI*/
    srvCellInfo->nRCGI.pLMN_Identity.size =3*sizeof(uint8_t);
@@ -2194,6 +2023,7 @@ uint8_t fillServedCellInfo(Served_Cell_Information_t *srvCellInfo)
         srvCellInfo->nRCGI.pLMN_Identity.size);
    if(srvCellInfo->nRCGI.pLMN_Identity.buf == NULLP)
    {
+      DU_LOG("\nERROR  --> Memory allocation failed in fillServedCellInfo");
       return RFAILED;
    }
    buildPlmnId(duCfgParam.srvdCellLst[0].duCellInfo.cellInfo.nrCgi.plmn,\
@@ -2202,17 +2032,12 @@ uint8_t fillServedCellInfo(Served_Cell_Information_t *srvCellInfo)
    DU_ALLOC(srvCellInfo->nRCGI.nRCellIdentity.buf,\
         srvCellInfo->nRCGI.nRCellIdentity.size);
    if(srvCellInfo->nRCGI.nRCellIdentity.buf == NULLP)
-   {
+   {   
+      DU_LOG("\nERROR  --> Memory allocation failed in fillServedCellInfo");
       return RFAILED;
    }
-   for (tmp = 0 ; tmp < srvCellInfo->\
-        nRCGI.nRCellIdentity.size-1 ; tmp++)
-   {
-      srvCellInfo->nRCGI.nRCellIdentity.buf[tmp] = 0;
-   }
-   srvCellInfo->nRCGI.nRCellIdentity.buf[4] = 16;
-   srvCellInfo->nRCGI.nRCellIdentity.bits_unused =4;
-
+   
+   fillBitString(&srvCellInfo->nRCGI.nRCellIdentity, ODU_VALUE_FOUR, ODU_VALUE_FIVE, duCfgParam.sib1Params.cellIdentity);
    /*nRPCI*/
    srvCellInfo->nRPCI = duCfgParam.srvdCellLst[0].duCellInfo.cellInfo.nrPci;
 
@@ -2220,36 +2045,55 @@ uint8_t fillServedCellInfo(Served_Cell_Information_t *srvCellInfo)
    ieListCnt = 1;
    srvCellInfo->servedPLMNs.list.count = ieListCnt;
    srvCellInfo->servedPLMNs.list.size = ieListCnt*sizeof(ServedPLMNs_Item_t *);
-   DU_ALLOC(srvCellInfo->servedPLMNs.list.array,\
-        srvCellInfo->servedPLMNs.list.size);
+   DU_ALLOC(srvCellInfo->servedPLMNs.list.array, srvCellInfo->servedPLMNs.list.size);
    if(srvCellInfo->servedPLMNs.list.array == NULLP)
    {
+      DU_LOG("\nERROR  --> Memory allocation failed in fillServedCellInfo");
       return RFAILED;
    }
    for(ieIdx=0; ieIdx < ieListCnt; ieIdx++)
    {
-      DU_ALLOC(srvCellInfo->servedPLMNs.list.array[ieIdx],\
-           sizeof(ServedPLMNs_Item_t));
+      DU_ALLOC(srvCellInfo->servedPLMNs.list.array[ieIdx], sizeof(ServedPLMNs_Item_t));
       if(srvCellInfo->servedPLMNs.list.array[ieIdx]== NULLP)
       {
-        return RFAILED;
+         DU_LOG("\nERROR  --> Memory allocation failed in fillServedCellInfo");
+         return RFAILED;
       }
    }
    if(fillServedPlmns(&srvCellInfo->servedPLMNs))
    {
+      DU_LOG("\nERROR  --> Failed to fill Served Plmn info");
       return RFAILED;
    }
 
+#ifndef NR_TDD
    /*nR Mode Info with FDD*/
    srvCellInfo->nR_Mode_Info.present = NR_Mode_Info_PR_fDD;
-   DU_ALLOC(srvCellInfo->nR_Mode_Info.choice.fDD,\
-         sizeof(FDD_Info_t));
+   DU_ALLOC(srvCellInfo->nR_Mode_Info.choice.fDD, sizeof(FDD_Info_t));
    if(srvCellInfo->nR_Mode_Info.choice.fDD == NULLP)
    {
+      DU_LOG("\nERROR  --> Memory allocation failed in fillServedCellInfo");
+      return RFAILED;
+   }
+   if(fillNrFddInfo(srvCellInfo->nR_Mode_Info.choice.fDD))
+   {
+       DU_LOG("\nERROR  --> Failed to fill the Nr FDD information");
+      return RFAILED;
+   }
+#else
+   srvCellInfo->nR_Mode_Info.present = NR_Mode_Info_PR_tDD;   
+   DU_ALLOC(srvCellInfo->nR_Mode_Info.choice.tDD, sizeof(TDD_Info_t));
+   if(srvCellInfo->nR_Mode_Info.choice.tDD == NULLP)
+   {
+      DU_LOG("\nERROR  --> Memory allocation failed in fillServedCellInfo");
       return RFAILED;
    }
-   if(fillNrFddInfo(&srvCellInfo->nR_Mode_Info))
+   if(fillNrTddInfo(srvCellInfo->nR_Mode_Info.choice.tDD) != ROK)
+   {
+      DU_LOG("\nERROR  --> Failed to fill the Nr TDD information");
       return RFAILED;
+   }
+#endif
 
    /*Measurement timing Config*/
    srvCellInfo->measurementTimingConfiguration.size = sizeof(uint8_t);
@@ -2284,8 +2128,6 @@ uint8_t fillServedCellInfo(Served_Cell_Information_t *srvCellInfo)
 
 uint8_t fillServCellToModItem(Served_Cells_To_Modify_Item_t *modifyItem)
 {
-   uint8_t ieIdx;
-
    /*pLMN_Identity*/
    modifyItem->oldNRCGI.pLMN_Identity.size = 3*sizeof(uint8_t);
    DU_ALLOC(modifyItem->oldNRCGI.pLMN_Identity.buf,modifyItem->oldNRCGI.pLMN_Identity.size);
@@ -2304,12 +2146,7 @@ uint8_t fillServCellToModItem(Served_Cells_To_Modify_Item_t *modifyItem)
    {
       return RFAILED;
    }
-   for(ieIdx = 0; ieIdx < modifyItem->oldNRCGI.nRCellIdentity.size-1; ieIdx++)
-   {
-      modifyItem->oldNRCGI.nRCellIdentity.buf[ieIdx] = 0;
-   }
-   modifyItem->oldNRCGI.nRCellIdentity.buf[4] = 16;
-   modifyItem->oldNRCGI.nRCellIdentity.bits_unused = 4;
+   fillBitString(&modifyItem->oldNRCGI.nRCellIdentity, ODU_VALUE_FOUR, ODU_VALUE_FIVE, duCfgParam.sib1Params.cellIdentity);
 
    if(fillServedCellInfo(&modifyItem->served_Cell_Information))
       return RFAILED;
@@ -2366,6 +2203,105 @@ uint8_t buildServCellToModList(Served_Cells_To_Modify_List_t *cellsToModify)
    else
       return ROK;
 }
+/*******************************************************************
+ *
+ * @brief filling the DeleteItemList
+ *
+ * @details
+ *
+ *    Function : fillCellToDeleteItem 
+ *
+ *    Functionality: Filling the DeleteItemIe 
+ *
+ * @params[in] Pointer to Served_Cells_To_Delete_ItemIEs_t 
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ *****************************************************************/
+uint8_t fillCellToDeleteItem(struct Served_Cells_To_Delete_ItemIEs *deleteItemIe)
+{
+   Served_Cells_To_Delete_Item_t *deleteItem=NULLP;
+   
+   deleteItemIe->id = ProtocolIE_ID_id_Served_Cells_To_Delete_Item;
+   deleteItemIe->criticality = Criticality_reject;
+   deleteItemIe->value.present =\
+   Served_Cells_To_Delete_ItemIEs__value_PR_Served_Cells_To_Delete_Item;
+   deleteItem=&deleteItemIe->value.choice.Served_Cells_To_Delete_Item;
+
+   /*pLMN_Identity*/
+   deleteItem->oldNRCGI.pLMN_Identity.size = 3*sizeof(uint8_t);
+   DU_ALLOC(deleteItem->oldNRCGI.pLMN_Identity.buf,deleteItem->oldNRCGI.pLMN_Identity.size);
+   if(deleteItem->oldNRCGI.pLMN_Identity.buf == NULLP)
+   {
+      DU_LOG("ERROR  --> F1AP: fillCellToDeleteItem(): Failed to allocate the memory");
+      return RFAILED;
+   }
+   buildPlmnId(duCfgParam.srvdCellLst[0].duCellInfo.cellInfo.nrCgi.plmn,\
+         deleteItem->oldNRCGI.pLMN_Identity.buf);
+
+   /*nRCellIdentity*/
+   deleteItem->oldNRCGI.nRCellIdentity.size = 5*sizeof(uint8_t);
+   DU_ALLOC(deleteItem->oldNRCGI.nRCellIdentity.buf,\
+         deleteItem->oldNRCGI.nRCellIdentity.size);
+   if(deleteItem->oldNRCGI.nRCellIdentity.buf == NULLP)
+   {
+      DU_LOG("ERROR  --> F1AP: fillCellToDeleteItem(): Failed to allocate the memory");
+      return RFAILED;
+   }
+   fillBitString(&deleteItem->oldNRCGI.nRCellIdentity, ODU_VALUE_FOUR, ODU_VALUE_FIVE, duCfgParam.sib1Params.cellIdentity);
+   return ROK;
+} 
+/*******************************************************************
+ *
+ * @brief Builds ServCellToDeleteList
+ *
+ * @details
+ *
+ *    Function : buildServCellToDeleteList
+ *
+ *    Functionality: Builds the serv cell to delete List
+ *
+ * @params[in] Pointer to Served_Cells_To_Delete_List_t *
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ *****************************************************************/
+uint8_t buildServCellToDeleteList(Served_Cells_To_Delete_List_t *cellsToDelete)
+{
+   uint8_t ieListCnt, arrIdx;
+   
+   ieListCnt = 1;
+   cellsToDelete->list.count = ieListCnt;
+   cellsToDelete->list.size = ieListCnt*sizeof(Served_Cells_To_Delete_ItemIEs_t *);
+   
+   DU_ALLOC(cellsToDelete->list.array,cellsToDelete->list.size);
+   if(cellsToDelete->list.array == NULLP)
+   {
+      DU_LOG("\nERROR  --> F1AP : buildServCellToDeleteList(): Memory allocation failed");
+      return RFAILED;
+   }
+   
+   for(arrIdx=0; arrIdx< ieListCnt; arrIdx++)
+   {
+      DU_ALLOC(cellsToDelete->list.array[arrIdx],sizeof(Served_Cells_To_Delete_ItemIEs_t));
+      if(cellsToDelete->list.array[arrIdx] == NULLP)
+      {
+         DU_LOG("\nERROR  --> F1AP : buildServCellToDeleteList(): Memory allocation failed");
+         return RFAILED;
+      }
+   }
+   
+   arrIdx=0;
+   if(fillCellToDeleteItem((Served_Cells_To_Delete_ItemIEs_t*)cellsToDelete->list.array[arrIdx]) !=ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP: buildServCellToDeleteList(): failed to fill Served_Cells_To_Delete_ItemIEs");
+      return RFAILED;
+   }
+   return ROK;
+}
 
 /*******************************************************************
  *
@@ -2385,12 +2321,14 @@ uint8_t buildServCellToModList(Served_Cells_To_Modify_List_t *cellsToModify)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildAndSendDUConfigUpdate()
+uint8_t BuildAndSendDUConfigUpdate(ServCellAction servCellAction)
 {
-   uint8_t ret, ieIdx, elementCnt;
+   uint8_t ret =0, ieIdx=0, elementCnt=0;
+   bool memAlloctionFailure = false;
    F1AP_PDU_t                 *f1apDuCfg = NULLP;
    GNBDUConfigurationUpdate_t *duCfgUpdate = NULLP;
    asn_enc_rval_t encRetVal;     /* Encoder return value */
+   
    memset(&encRetVal, 0, sizeof(asn_enc_rval_t));
    ret= RFAILED;
 
@@ -2401,78 +2339,106 @@ uint8_t BuildAndSendDUConfigUpdate()
       DU_ALLOC(f1apDuCfg, sizeof(F1AP_PDU_t));
       if(f1apDuCfg == NULLP)
       {
-        DU_LOG("\nERROR  -->  F1AP : Memory allocation for F1AP-PDU failed");
-        break;
+         DU_LOG("\nERROR  -->  F1AP : BuildAndSendDUConfigUpdate(): Memory allocation for F1AP-PDU failed");
+         break;
       }
 
       f1apDuCfg->present = F1AP_PDU_PR_initiatingMessage;
       DU_ALLOC(f1apDuCfg->choice.initiatingMessage,sizeof(InitiatingMessage_t));
       if(f1apDuCfg->choice.initiatingMessage == NULLP)
       {
-        DU_LOG("\nERROR  -->  F1AP : Memory allocation for F1AP-PDU failed");
-        break;
+         DU_LOG("\nERROR  -->  F1AP : BuildAndSendDUConfigUpdate(): Memory allocation for F1AP-PDU failed");
+         break;
       }
 
       f1apDuCfg->choice.initiatingMessage->procedureCode = \
-                                                          ProcedureCode_id_gNBDUConfigurationUpdate;
+                                                           ProcedureCode_id_gNBDUConfigurationUpdate;
       f1apDuCfg->choice.initiatingMessage->criticality = Criticality_reject;
       f1apDuCfg->choice.initiatingMessage->value.present = \
-                                                          InitiatingMessage__value_PR_GNBDUConfigurationUpdate;
+                                                           InitiatingMessage__value_PR_GNBDUConfigurationUpdate;
       duCfgUpdate = &f1apDuCfg->choice.initiatingMessage->value.\
-                   choice.GNBDUConfigurationUpdate;
+                    choice.GNBDUConfigurationUpdate;
       elementCnt = 3;
       duCfgUpdate->protocolIEs.list.count = elementCnt;
       duCfgUpdate->protocolIEs.list.size = \
-                                          elementCnt * sizeof(GNBDUConfigurationUpdateIEs_t*);
+                                           elementCnt * sizeof(GNBDUConfigurationUpdateIEs_t*);
 
       /* Initialize the F1Setup members */
       DU_ALLOC(duCfgUpdate->protocolIEs.list.array,duCfgUpdate->protocolIEs.list.size);
       if(duCfgUpdate->protocolIEs.list.array == NULLP)
       {
-        DU_LOG("ERROR  -->  F1AP : Memory allocation for F1RequestIEs failed");
-        break;
+         DU_LOG("ERROR  -->  F1AP : BuildAndSendDUConfigUpdate(): Memory allocation failed");
+         break;
       }
       for(ieIdx=0; ieIdx<elementCnt; ieIdx++)
       {
-        DU_ALLOC(duCfgUpdate->protocolIEs.list.array[ieIdx],sizeof(GNBDUConfigurationUpdateIEs_t));
-        if(duCfgUpdate->protocolIEs.list.array[ieIdx] == NULLP)
-        {
-           break;
-        }
+         DU_ALLOC(duCfgUpdate->protocolIEs.list.array[ieIdx],sizeof(GNBDUConfigurationUpdateIEs_t));
+         if(duCfgUpdate->protocolIEs.list.array[ieIdx] == NULLP)
+         {
+            DU_LOG("ERROR  -->  F1AP : BuildAndSendDUConfigUpdate(): Memory allocation failed");
+            memAlloctionFailure = true;
+            break;
+         }
+      }
+      
+      if(memAlloctionFailure == true)
+      {
+         break;
       }
-
       /*TransactionID*/
       ieIdx = 0;
       duCfgUpdate->protocolIEs.list.array[ieIdx]->id=ProtocolIE_ID_id_TransactionID;
       duCfgUpdate->protocolIEs.list.array[ieIdx]->criticality= Criticality_reject;
       duCfgUpdate->protocolIEs.list.array[ieIdx]->value.present = \
-         GNBDUConfigurationUpdateIEs__value_PR_TransactionID;
+      GNBDUConfigurationUpdateIEs__value_PR_TransactionID;
       duCfgUpdate->protocolIEs.list.array[ieIdx]->value.choice.TransactionID = TRANS_ID;
-
-      /*Served Cell to Modify */
+      
       ieIdx++;
-      duCfgUpdate->protocolIEs.list.array[ieIdx]->id = \
-                                                     ProtocolIE_ID_id_Served_Cells_To_Modify_List;
-      duCfgUpdate->protocolIEs.list.array[ieIdx]->criticality =Criticality_reject;
-      duCfgUpdate->protocolIEs.list.array[ieIdx]->value.present = \
-        GNBDUConfigurationUpdateIEs__value_PR_Served_Cells_To_Modify_List;
-      if(buildServCellToModList(&duCfgUpdate->protocolIEs.list.array[ieIdx]->value.choice.\
-        Served_Cells_To_Modify_List))
-         break;
-
+      if(servCellAction == SERV_CELL_TO_MODIFY)
+      {
+         /*Served Cell to Modify */
+         duCfgUpdate->protocolIEs.list.array[ieIdx]->id = \
+         ProtocolIE_ID_id_Served_Cells_To_Modify_List;
+         duCfgUpdate->protocolIEs.list.array[ieIdx]->criticality =Criticality_reject;
+         duCfgUpdate->protocolIEs.list.array[ieIdx]->value.present = \
+         GNBDUConfigurationUpdateIEs__value_PR_Served_Cells_To_Modify_List;
+         if(buildServCellToModList(&duCfgUpdate->protocolIEs.list.array[ieIdx]->value.choice.\
+                  Served_Cells_To_Modify_List))
+         {
+            DU_LOG("ERROR  --> DU APP : BuildAndSendDUConfigUpdate(): failed to build ServCellToModList");
+            break;
+         }
+      }
+      else
+      {
+         /*Served Cell to Delete */ 
+         duCfgUpdate->protocolIEs.list.array[ieIdx]->id = \
+         ProtocolIE_ID_id_Served_Cells_To_Delete_List;
+         duCfgUpdate->protocolIEs.list.array[ieIdx]->criticality =Criticality_reject;
+         duCfgUpdate->protocolIEs.list.array[ieIdx]->value.present = \
+         GNBDUConfigurationUpdateIEs__value_PR_Served_Cells_To_Delete_List;
+         if(buildServCellToDeleteList(&duCfgUpdate->protocolIEs.list.array[ieIdx]->value.choice.\
+         Served_Cells_To_Delete_List)!=ROK)
+         {
+            DU_LOG("ERROR  --> DU APP : BuildAndSendDUConfigUpdate(): failed to build ServCellToDeleteList");
+            break;
+         }
+         
+      }
       // NOTE :GNB DU SYS INFO:MIB AND SIB1 INFORMATION TO BE BUILT AND FILLED HERE
       /*GNB DU ID */
       ieIdx++;
       duCfgUpdate->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_gNB_DU_ID;
       duCfgUpdate->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
       duCfgUpdate->protocolIEs.list.array[ieIdx]->value.present = \
-       GNBDUConfigurationUpdateIEs__value_PR_GNB_DU_ID;
+      GNBDUConfigurationUpdateIEs__value_PR_GNB_DU_ID;
       duCfgUpdate->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_ID.size = sizeof(uint8_t);
       DU_ALLOC(duCfgUpdate->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_ID.buf,\
-           duCfgUpdate->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_ID.size);
+            duCfgUpdate->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_ID.size);
       if(duCfgUpdate->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_ID.buf == NULLP)
       {
-        break;
+         DU_LOG("ERROR  --> DU APP : BuildAndSendDUConfigUpdate(): Memory allocation failed for GNB_DU_ID");
+         break;
       }
       duCfgUpdate->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_ID.buf[0] = duCfgParam.duId;
 
@@ -2486,30 +2452,30 @@ uint8_t BuildAndSendDUConfigUpdate()
       /* Checking encode results */
       if(encRetVal.encoded == ENCODE_FAIL)
       {
-        DU_LOG("ERROR  -->  F1AP : Could not encode DUConfigUpdate structure (at %s)\n",\
-        encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
-        break;
+         DU_LOG("ERROR  -->  F1AP : Could not encode DUConfigUpdate structure (at %s)\n",\
+               encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+         break;
       }
       else
       {
-        DU_LOG("\nDEBUG   -->  F1AP : Created APER encoded buffer for DUConfigUpdate\n");
-        for(ieIdx =0; ieIdx < encBufSize; ieIdx++)
-        {
-           printf("%x",encBuf[ieIdx]);
-        }
+         DU_LOG("\nDEBUG   -->  F1AP : Created APER encoded buffer for DUConfigUpdate\n");
+         for(ieIdx =0; ieIdx < encBufSize; ieIdx++)
+         {
+            printf("%x",encBuf[ieIdx]);
+         }
       }
       /* Sending msg */
-      if(SendF1APMsg(DU_APP_MEM_REGION, DU_POOL) != ROK)
+      if(sendF1APMsg() != ROK)
       {
-        DU_LOG("\nERROR  -->  F1AP : Sending GNB-DU Config Update failed");
-        break;
+         DU_LOG("\nERROR  -->  F1AP : Sending GNB-DU Config Update failed");
+         break;
       }
 
       ret = ROK;
       break;
    }
-   FreeDUConfigUpdate(f1apDuCfg);
-
+  
+   addToReservedF1apPduList(TRANS_ID,f1apDuCfg);
    return ret;
 }
 
@@ -2703,7 +2669,7 @@ uint8_t BuildAndSendULRRCMessageTransfer(DuUeCb  ueCb, uint8_t lcId, \
       }
 
       /* Sending  msg  */
-      if(SendF1APMsg(DU_APP_MEM_REGION,DU_POOL)        !=      ROK)
+      if(sendF1APMsg() !=      ROK)
       {
         DU_LOG("\nERROR  -->   F1AP : Sending  UL RRC Message Transfer Failed");
         break;
@@ -2732,7 +2698,7 @@ uint8_t BuildAndSendULRRCMessageTransfer(DuUeCb  ueCb, uint8_t lcId, \
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildTagConfig(struct TAG_Config *tagConfig)
+uint8_t BuildTagConfig(DuUeCb *ueCb, struct TAG_Config *tagConfig)
 {
    struct TAG_Config__tag_ToAddModList *tagList;
    uint8_t                     idx, elementCnt;
@@ -2746,7 +2712,11 @@ uint8_t BuildTagConfig(struct TAG_Config *tagConfig)
       return RFAILED;
    }
 
-   elementCnt = 1; //ODU_VALUE_ONE;
+   if(ueCb == NULLP)
+      elementCnt = ODU_VALUE_ONE;
+   else
+      elementCnt = ueCb->macUeCfg.macCellGrpCfg.tagCfg.addModListCount;
+
    tagList = tagConfig->tag_ToAddModList;
    tagList->list.count = elementCnt;
    tagList->list.size  =  elementCnt * sizeof(struct TAG *);
@@ -2765,21 +2735,32 @@ uint8_t BuildTagConfig(struct TAG_Config *tagConfig)
       DU_ALLOC(tagList->list.array[idx], sizeof(struct TAG));
       if(!tagList->list.array[idx])
       {
-        DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildTagConfig");
-        return RFAILED;
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildTagConfig");
+         return RFAILED;
       }
    }
 
-   idx = 0;
-   tagList->list.array[idx]->tag_Id = TAG_ID;
-   tagList->list.array[idx]->timeAlignmentTimer = TIME_ALIGNMENT_TMR;
-
-   return ROK;
-}
-
-/*******************************************************************
- *
- * @brief Builds PHR Config 
+   if(ueCb == NULLP)
+   {
+      idx = 0;
+      tagList->list.array[idx]->tag_Id = TAG_ID;
+      tagList->list.array[idx]->timeAlignmentTimer = TIME_ALIGNMENT_TMR;
+   }
+   else
+   {
+      for(idx=0; idx<tagList->list.count; idx++)
+      {
+         tagList->list.array[idx]->tag_Id = ueCb->macUeCfg.macCellGrpCfg.tagCfg.addModList[idx].tagId;
+         tagList->list.array[idx]->timeAlignmentTimer = ueCb->macUeCfg.macCellGrpCfg.tagCfg.addModList[idx].timeAlignTimer;
+      }
+   }
+
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds PHR Config 
  *
  * @details
  *
@@ -2793,7 +2774,7 @@ uint8_t BuildTagConfig(struct TAG_Config *tagConfig)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildPhrConfig(struct MAC_CellGroupConfig__phr_Config *phrConfig)
+uint8_t BuildPhrConfig(DuUeCb *ueCb, struct MAC_CellGroupConfig__phr_Config *phrConfig)
 {
 
    phrConfig->present = MAC_CellGroupConfig__phr_Config_PR_setup;
@@ -2805,13 +2786,26 @@ uint8_t BuildPhrConfig(struct MAC_CellGroupConfig__phr_Config *phrConfig)
       return RFAILED;
    }
 
-   phrConfig->choice.setup->phr_PeriodicTimer        = PHR_PERIODIC_TMR;
-   phrConfig->choice.setup->phr_ProhibitTimer        = PHR_PROHIBHIT_TMR;
-   phrConfig->choice.setup->phr_Tx_PowerFactorChange = PHR_PWR_FACTOR_CHANGE;
-   phrConfig->choice.setup->multiplePHR              = false;
-   phrConfig->choice.setup->dummy                    = false;
-   phrConfig->choice.setup->phr_Type2OtherCell       = false;
-   phrConfig->choice.setup->phr_ModeOtherCG          = PHR_MODE_OTHER_CG;
+   if(ueCb == NULLP)
+   {
+      phrConfig->choice.setup->phr_PeriodicTimer        = PHR_PERIODIC_TMR;
+      phrConfig->choice.setup->phr_ProhibitTimer        = PHR_PROHIBHIT_TMR;
+      phrConfig->choice.setup->phr_Tx_PowerFactorChange = PHR_PWR_FACTOR_CHANGE;
+      phrConfig->choice.setup->multiplePHR              = false;
+      phrConfig->choice.setup->dummy                    = false;
+      phrConfig->choice.setup->phr_Type2OtherCell       = false;
+      phrConfig->choice.setup->phr_ModeOtherCG          = PHR_MODE_OTHER_CG;
+   }
+   else
+   {
+      phrConfig->choice.setup->phr_PeriodicTimer        = ueCb->macUeCfg.macCellGrpCfg.phrCfg.periodicTimer;
+      phrConfig->choice.setup->phr_ProhibitTimer        = ueCb->macUeCfg.macCellGrpCfg.phrCfg.prohibitTimer;
+      phrConfig->choice.setup->phr_Tx_PowerFactorChange = ueCb->macUeCfg.macCellGrpCfg.phrCfg.txPowerFactor;
+      phrConfig->choice.setup->multiplePHR              = ueCb->macUeCfg.macCellGrpCfg.phrCfg.multiplePHR;
+      phrConfig->choice.setup->dummy                    = ueCb->macUeCfg.macCellGrpCfg.phrCfg.dummy;
+      phrConfig->choice.setup->phr_Type2OtherCell       = ueCb->macUeCfg.macCellGrpCfg.phrCfg.phrType2OtherCell;
+      phrConfig->choice.setup->phr_ModeOtherCG          = ueCb->macUeCfg.macCellGrpCfg.phrCfg.phrOtherCG;
+   }
 
    return ROK;
 }
@@ -2832,11 +2826,28 @@ uint8_t BuildPhrConfig(struct MAC_CellGroupConfig__phr_Config *phrConfig)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildBsrConfig(struct BSR_Config *bsrConfig)
+uint8_t BuildBsrConfig(DuUeCb *ueCb, struct BSR_Config *bsrConfig)
 {
-   bsrConfig->periodicBSR_Timer = PERIODIC_BSR_TMR;
-   bsrConfig->retxBSR_Timer     = RETX_BSR_TMR;
-   bsrConfig->logicalChannelSR_DelayTimer = NULLP;
+   if(ueCb == NULLP)
+   {
+      bsrConfig->periodicBSR_Timer = PERIODIC_BSR_TMR;
+      bsrConfig->retxBSR_Timer     = RETX_BSR_TMR;
+      bsrConfig->logicalChannelSR_DelayTimer = NULLP;
+   }
+   else
+   {
+      bsrConfig->periodicBSR_Timer = convertBsrPeriodicTmrValueToEnum(ueCb->macUeCfg.macCellGrpCfg.bsrTmrCfg.periodicTimer);
+      bsrConfig->retxBSR_Timer     = convertBsrRetxTmrValueToEnum(ueCb->macUeCfg.macCellGrpCfg.bsrTmrCfg.retxTimer);
+
+      bsrConfig->logicalChannelSR_DelayTimer = NULLP;
+      DU_ALLOC(bsrConfig->logicalChannelSR_DelayTimer, sizeof(long));
+      if(bsrConfig->logicalChannelSR_DelayTimer == NULLP)
+      {
+         DU_LOG("\nERROR  --> DU APP: Memory allocation failed in BuildBsrConfig");
+         return RFAILED;
+      }
+      *(bsrConfig->logicalChannelSR_DelayTimer) = convertLcSrDelayTmrValueToEnum(ueCb->macUeCfg.macCellGrpCfg.bsrTmrCfg.srDelayTimer);
+   }
 
    return ROK;
 }
@@ -2857,7 +2868,7 @@ uint8_t BuildBsrConfig(struct BSR_Config *bsrConfig)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildSchedulingReqConfig(struct SchedulingRequestConfig *schedulingRequestConfig)
+uint8_t BuildSchedulingReqConfig(DuUeCb *ueCb, struct SchedulingRequestConfig *schedulingRequestConfig)
 {
    struct SchedulingRequestConfig__schedulingRequestToAddModList *schReqList;
    uint8_t                     idx, elementCnt;
@@ -2871,7 +2882,11 @@ uint8_t BuildSchedulingReqConfig(struct SchedulingRequestConfig *schedulingReque
       return RFAILED;
    }
 
-   elementCnt = 1; //ODU_VALUE_ONE;
+   if(ueCb == NULLP)
+      elementCnt = ODU_VALUE_ONE;
+   else
+      elementCnt = ueCb->macUeCfg.macCellGrpCfg.schReqCfg.addModListCount;
+
    schReqList = schedulingRequestConfig->schedulingRequestToAddModList;
    schReqList->list.count = elementCnt;
    schReqList->list.size  = elementCnt * sizeof(struct SchedulingRequestToAddMod *);
@@ -2884,29 +2899,50 @@ uint8_t BuildSchedulingReqConfig(struct SchedulingRequestConfig *schedulingReque
       return RFAILED;
    }
 
-   for(idx=0;idx<schReqList->list.count; idx++)
+   for(idx=0; idx<schReqList->list.count; idx++)
    {
       schReqList->list.array[idx] = NULLP;
       DU_ALLOC(schReqList->list.array[idx], sizeof(struct SchedulingRequestToAddMod));
       if(!schReqList->list.array[idx])
       {
-        DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSchedulingReqConfig");
-        return RFAILED;
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSchedulingReqConfig");
+         return RFAILED;
       }
    }
 
-   idx = 0;
-   schReqList->list.array[idx]->schedulingRequestId = SCH_REQ_ID;
+   if(ueCb == NULLP)
+   {
+      idx = 0;
+      schReqList->list.array[idx]->schedulingRequestId = SCH_REQ_ID;
 
-   schReqList->list.array[idx]->sr_ProhibitTimer = NULLP;
-   DU_ALLOC(schReqList->list.array[idx]->sr_ProhibitTimer, sizeof(long));
-   if(!schReqList->list.array[idx]->sr_ProhibitTimer)
+      schReqList->list.array[idx]->sr_ProhibitTimer = NULLP;
+      DU_ALLOC(schReqList->list.array[idx]->sr_ProhibitTimer, sizeof(long));
+      if(!schReqList->list.array[idx]->sr_ProhibitTimer)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSchedulingReqConfig");
+         return RFAILED;
+      }
+      *(schReqList->list.array[idx]->sr_ProhibitTimer) = SR_PROHIBIT_TMR;
+      schReqList->list.array[idx]->sr_TransMax = SR_TRANS_MAX;
+   }
+   else
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSchedulingReqConfig");
-      return RFAILED;
+      for(idx=0; idx<schReqList->list.count; idx++)
+      {
+         schReqList->list.array[idx]->schedulingRequestId = ueCb->macUeCfg.macCellGrpCfg.schReqCfg.addModList[idx].schedReqId;
+
+         schReqList->list.array[idx]->sr_ProhibitTimer = NULLP;
+         DU_ALLOC(schReqList->list.array[idx]->sr_ProhibitTimer, sizeof(long));
+         if(!schReqList->list.array[idx]->sr_ProhibitTimer)
+         {
+            DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSchedulingReqConfig");
+            return RFAILED;
+         }
+         *(schReqList->list.array[idx]->sr_ProhibitTimer) = ueCb->macUeCfg.macCellGrpCfg.schReqCfg.addModList[idx].srProhibitTmr;
+         schReqList->list.array[idx]->sr_TransMax = ueCb->macUeCfg.macCellGrpCfg.schReqCfg.addModList[idx].srTransMax;
+      }
    }
-   *(schReqList->list.array[idx]->sr_ProhibitTimer) = SR_PROHIBIT_TMR;
-   schReqList->list.array[idx]->sr_TransMax = SR_TRANS_MAX;
+
    schedulingRequestConfig->schedulingRequestToReleaseList = NULLP;
 
    return ROK;
@@ -2914,209 +2950,228 @@ uint8_t BuildSchedulingReqConfig(struct SchedulingRequestConfig *schedulingReque
 
 /*******************************************************************
  *
- * @brief Builds RLC Config
+ * @brief Builds RLC Configuration for AM mode
  *
  * @details
  *
- *    Function : BuildRlcConfig
+ *    Function : BuildRlcConfigAm
  *
- *    Functionality: Builds RLC Config in BuildRlcBearerToAddModList 
+ *    Functionality: 
+ *       Builds AM mode RLC Config in BuildRlcBearerToAddModList
  *
- * @params[in] RLC_Config *rlcConfig
+ * @params[in] AmBearerCfg *amCfg
+ *             RLC_Config_t  *rlcConfig
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildRlcConfig(struct RLC_Config *rlcConfig)
+uint8_t BuildRlcConfigAm(AmBearerCfg *amCfg, struct RLC_Config *rlcConfig)
 {
-
-   rlcConfig->present = RLC_Config_PR_am;
-
    rlcConfig->choice.am = NULLP;
    DU_ALLOC(rlcConfig->choice.am, sizeof(struct RLC_Config__am));
    if(!rlcConfig->choice.am)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfig");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfigAm");
       return RFAILED;
    }
 
-   /* UL */
+   /* Fill AM UL configuration */
    rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength = NULLP;
    DU_ALLOC(rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength, sizeof(SN_FieldLengthAM_t));
    if(!rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfig");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfigAm");
       return RFAILED;
    }
-   *(rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength) = SN_FIELD_LEN;
-   rlcConfig->choice.am->ul_AM_RLC.t_PollRetransmit  = T_POLL_RETRANSMIT;
-   rlcConfig->choice.am->ul_AM_RLC.pollPDU           = POLL_PDU;
-   rlcConfig->choice.am->ul_AM_RLC.pollByte          = POLL_BYTE;
-   rlcConfig->choice.am->ul_AM_RLC.maxRetxThreshold  = MAX_RETX_THRESHOLD;
 
-   /* DL */
+   /* Fill default AM UL configuration if input pointer to DU database is NULL */
+   if(amCfg == NULLP)
+   {
+      *(rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength) = SN_FIELD_LEN;
+      rlcConfig->choice.am->ul_AM_RLC.t_PollRetransmit  = T_POLL_RETRANSMIT;
+      rlcConfig->choice.am->ul_AM_RLC.pollPDU           = POLL_PDU;
+      rlcConfig->choice.am->ul_AM_RLC.pollByte          = POLL_BYTE;
+      rlcConfig->choice.am->ul_AM_RLC.maxRetxThreshold  = MAX_RETX_THRESHOLD;
+   }
+   else
+   {
+      *(rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength) = covertAmSnLenFromIntEnumToRrcEnum(amCfg->dlAmCfg.snLenDl);
+      rlcConfig->choice.am->ul_AM_RLC.t_PollRetransmit  = covertPollRetxTmrValueToEnum(amCfg->dlAmCfg.pollRetxTmr);
+      rlcConfig->choice.am->ul_AM_RLC.pollPDU           = covertPollPduValueToEnum(amCfg->dlAmCfg.pollPdu);
+      rlcConfig->choice.am->ul_AM_RLC.pollByte          = covertPollByteValueToEnum(amCfg->dlAmCfg.pollByte);
+      rlcConfig->choice.am->ul_AM_RLC.maxRetxThreshold  = covertMaxRetxValueToEnum(amCfg->dlAmCfg.maxRetxTh);
+   }
+
+   /* Fill AM DL configuraion */
    rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength = NULLP;
    DU_ALLOC(rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength, sizeof(SN_FieldLengthAM_t)); 
    if(!rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfig");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfigAm");
       return RFAILED;
    }
-   *(rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength) = SN_FIELD_LEN;
-   rlcConfig->choice.am->dl_AM_RLC.t_Reassembly      = T_REASSEMBLY;
-   rlcConfig->choice.am->dl_AM_RLC.t_StatusProhibit  = T_STATUS_PROHIBHIT;
 
+   /* Fill default AM DL configuration if input pointer to DU database is NULL */
+   if(amCfg == NULLP)
+   {
+      *(rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength) = SN_FIELD_LEN;
+      rlcConfig->choice.am->dl_AM_RLC.t_Reassembly      = T_REASSEMBLY;
+      rlcConfig->choice.am->dl_AM_RLC.t_StatusProhibit  = T_STATUS_PROHIBHIT;
+   }
+   else /* Fill AM configuration from DU database */
+   {
+      *(rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength) = covertAmSnLenFromIntEnumToRrcEnum(amCfg->ulAmCfg.snLenUl);
+      rlcConfig->choice.am->dl_AM_RLC.t_Reassembly      = convertReasmblTmrValueToEnum(amCfg->ulAmCfg.reAssemTmr);
+      rlcConfig->choice.am->dl_AM_RLC.t_StatusProhibit  = convertProhibitTmrValueToEnum(amCfg->ulAmCfg.statProhTmr);
+   }
    return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Builds MAC LC Config
+ * @brief Builds RLC Config for UM Bidirection
  *
  * @details
  *
- *    Function : BuildMacLCConfig 
+ *    Function : BuildRlcConfig UmBiDir
  *
- *    Functionality: Builds MAC LC Config in BuildRlcBearerToAddModList 
+ *    Functionality: 
+ *       Builds RLC Config for UM Bidirection in BuildRlcBearerToAddModList 
  *
- * @params[in] struct LogicalChannelConfig macLcConfig
+ * @params[in] UmBiDirBearerCfg *umBiDirCfg
+ *             RLC_Config_t *rlcConfig
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildMacLCConfig(struct LogicalChannelConfig *macLcConfig)
+uint8_t BuildRlcConfigUmBiDir(UmBiDirBearerCfg *umBiDirCfg, struct RLC_Config *rlcConfig)
 {
-
-   macLcConfig->ul_SpecificParameters = NULLP;
-   DU_ALLOC(macLcConfig->ul_SpecificParameters, sizeof(struct LogicalChannelConfig__ul_SpecificParameters));
-   if(!macLcConfig->ul_SpecificParameters)
+   rlcConfig->choice.um_Bi_Directional = NULLP;
+   DU_ALLOC(rlcConfig->choice.um_Bi_Directional, sizeof(struct RLC_Config__um_Bi_Directional));
+   if(rlcConfig->choice.um_Bi_Directional == NULLP)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacLCConfig");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfigUmBiDir");
       return RFAILED;
    }
 
-   macLcConfig->ul_SpecificParameters->priority = MAC_LC_PRIORITY;
-   macLcConfig->ul_SpecificParameters->prioritisedBitRate =    PRIORTISIED_BIT_RATE;
-   macLcConfig->ul_SpecificParameters->bucketSizeDuration =    BUCKET_SIZE_DURATION;
-   macLcConfig->ul_SpecificParameters->allowedServingCells = NULLP;
-   macLcConfig->ul_SpecificParameters->allowedSCS_List = NULLP;
-   macLcConfig->ul_SpecificParameters->maxPUSCH_Duration = NULLP;
-   macLcConfig->ul_SpecificParameters->configuredGrantType1Allowed = NULLP;
-
-   macLcConfig->ul_SpecificParameters->logicalChannelGroup = NULLP;
-   DU_ALLOC(macLcConfig->ul_SpecificParameters->logicalChannelGroup,   sizeof(long));
-   if(!macLcConfig->ul_SpecificParameters->logicalChannelGroup)
+   /* Fill UM Bidirectional UL configuration */
+   rlcConfig->choice.um_Bi_Directional->ul_UM_RLC.sn_FieldLength = NULLP;
+   DU_ALLOC(rlcConfig->choice.um_Bi_Directional->ul_UM_RLC.sn_FieldLength, sizeof(SN_FieldLengthUM_t));
+   if(rlcConfig->choice.um_Bi_Directional->ul_UM_RLC.sn_FieldLength == NULLP)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacLCConfig");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfigUmBiDir");
       return RFAILED;
    }
-   *(macLcConfig->ul_SpecificParameters->logicalChannelGroup) = LC_GRP;
 
-   macLcConfig->ul_SpecificParameters->schedulingRequestID = NULLP;
-   DU_ALLOC(macLcConfig->ul_SpecificParameters->schedulingRequestID,   sizeof(SchedulingRequestId_t));
-   if(!macLcConfig->ul_SpecificParameters->schedulingRequestID)
+   if(umBiDirCfg != NULLP)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacLCConfig");
+      *(rlcConfig->choice.um_Bi_Directional->ul_UM_RLC.sn_FieldLength) = covertUmSnLenFromIntEnumToRrcEnum(umBiDirCfg->dlUmCfg.snLenDlUm);     
+   }
+
+   /* Fill UM Bidirectional DL configuration */
+   rlcConfig->choice.um_Bi_Directional->dl_UM_RLC.sn_FieldLength = NULLP;
+   DU_ALLOC(rlcConfig->choice.um_Bi_Directional->dl_UM_RLC.sn_FieldLength, sizeof(SN_FieldLengthUM_t));
+   if(rlcConfig->choice.um_Bi_Directional->dl_UM_RLC.sn_FieldLength == NULLP)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfigUmBiDir");
       return RFAILED;
    }
-   *(macLcConfig->ul_SpecificParameters->schedulingRequestID) = SCH_REQ_ID;
 
-   macLcConfig->ul_SpecificParameters->logicalChannelSR_Mask = false;
-   macLcConfig->ul_SpecificParameters->logicalChannelSR_DelayTimerApplied = false;
-   macLcConfig->ul_SpecificParameters->bitRateQueryProhibitTimer = NULLP;
+   if(umBiDirCfg != NULLP)
+   {
+      *(rlcConfig->choice.um_Bi_Directional->dl_UM_RLC.sn_FieldLength) = covertUmSnLenFromIntEnumToRrcEnum(umBiDirCfg->ulUmCfg.snLenUlUm);     
+      rlcConfig->choice.um_Bi_Directional->dl_UM_RLC.t_Reassembly = convertReasmblTmrValueToEnum(umBiDirCfg->ulUmCfg.reAssemTmr);
+   }
 
    return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Builds RLC Bearer to Add/Mod list
+ * @brief Builds RLC Config for UM Uni directional UL
  *
  * @details
  *
- *    Function :BuildRlcBearerToAddModList 
+ *    Function : BuildRlcConfigUmUniDirUl
  *
- *    Functionality: Builds RLC Bearer to Add/Mod list in DuToCuRrcContainer
+ *    Functionality: 
+ *       Builds RLC Config for UM Unidirection UL in BuildRlcBearerToAddModList 
  *
- * @params[in] rlc_BearerToAddModList
+ * @params[in] UmUniDirDlBearerCfg *umUniDirDlCfg
+ *             RLC_Config_t *rlcConfig
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildRlcBearerToAddModList(struct CellGroupConfigRrc__rlc_BearerToAddModList *rlcBearerList)
+uint8_t BuildRlcConfigUmUniDirUl(UmUniDirDlBearerCfg *umUniDirDlCfg, RLC_Config_t *rlcConfig)
 {
-   uint8_t                     idx, elementCnt;
-
-   elementCnt = 1;
-   rlcBearerList->list.count = elementCnt;
-   rlcBearerList->list.size  = elementCnt * sizeof(struct RLC_BearerConfig *);
-
-   rlcBearerList->list.array = NULLP;
-   DU_ALLOC(rlcBearerList->list.array, rlcBearerList->list.size);
-   if(!rlcBearerList->list.array)
+   rlcConfig->choice.um_Uni_Directional_UL = NULLP;
+   DU_ALLOC(rlcConfig->choice.um_Uni_Directional_UL , sizeof(struct RLC_Config__um_Uni_Directional_UL));
+   if(rlcConfig->choice.um_Uni_Directional_UL == NULLP)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfigUmUniDirUl");
       return RFAILED;
    }
 
-   for(idx=0; idx<rlcBearerList->list.count; idx++)
-   {
-      rlcBearerList->list.array[idx] = NULLP;
-      DU_ALLOC(rlcBearerList->list.array[idx], sizeof(struct RLC_BearerConfig));
-      if(!rlcBearerList->list.array[idx])
-      {
-        DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
-        return RFAILED;
-      }
-   }
-
-   idx = 0;
-   rlcBearerList->list.array[idx]->logicalChannelIdentity = SRB1_LCID;
-
-   DU_ALLOC(rlcBearerList->list.array[idx]->servedRadioBearer, \
-      sizeof(struct RLC_BearerConfig__servedRadioBearer));
-   if(!rlcBearerList->list.array[idx]->servedRadioBearer)
+   rlcConfig->choice.um_Uni_Directional_UL->ul_UM_RLC.sn_FieldLength = NULLP;
+   DU_ALLOC(rlcConfig->choice.um_Uni_Directional_UL->ul_UM_RLC.sn_FieldLength, sizeof(SN_FieldLengthUM_t));
+   if(rlcConfig->choice.um_Uni_Directional_UL->ul_UM_RLC.sn_FieldLength == NULLP)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfigUmUniDirUl");
       return RFAILED;
    }
 
-   rlcBearerList->list.array[idx]->servedRadioBearer->present = \
-      RLC_BearerConfig__servedRadioBearer_PR_srb_Identity;
-   rlcBearerList->list.array[idx]->servedRadioBearer->choice.srb_Identity = \
-      SRB1_LCID;
-
-   rlcBearerList->list.array[idx]->reestablishRLC = NULLP;
-   rlcBearerList->list.array[idx]->rlc_Config = NULLP;
-   DU_ALLOC(rlcBearerList->list.array[idx]->rlc_Config, sizeof(struct RLC_Config));
-   if(!rlcBearerList->list.array[idx]->rlc_Config)
+   if(umUniDirDlCfg != NULLP)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
-      return RFAILED;
+      *(rlcConfig->choice.um_Uni_Directional_UL->ul_UM_RLC.sn_FieldLength) = covertUmSnLenFromIntEnumToRrcEnum(umUniDirDlCfg->dlUmCfg.snLenDlUm);
    }
 
-   if(BuildRlcConfig(rlcBearerList->list.array[idx]->rlc_Config) != ROK)
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds RLC Config for UM Uni directional DL
+ *
+ * @details
+ *
+ *    Function : BuildRlcConfigUmUniDirDl
+ *
+ *    Functionality: 
+ *       Builds RLC Config for UM Unidirection DL in BuildRlcBearerToAddModList 
+ *
+ * @params[in] UmUniDirUlBearerCfg *umUniDirUlCfg
+ *             RLC_Config_t *rlcConfig
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildRlcConfigUmUniDirDl(UmUniDirUlBearerCfg *umUniDirUlCfg, RLC_Config_t *rlcConfig)
+{
+   rlcConfig->choice.um_Uni_Directional_DL = NULLP;
+   DU_ALLOC(rlcConfig->choice.um_Uni_Directional_DL , sizeof(struct RLC_Config__um_Uni_Directional_DL));
+   if(rlcConfig->choice.um_Uni_Directional_DL == NULLP)
    {
-      DU_LOG("\nERROR  -->  F1AP : BuildRlcConfig failed");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfigUmUniDirDl");
       return RFAILED;
    }
 
-   rlcBearerList->list.array[idx]->mac_LogicalChannelConfig = NULLP;
-   DU_ALLOC(rlcBearerList->list.array[idx]->mac_LogicalChannelConfig, \
-      sizeof(struct LogicalChannelConfig));
-   if(!rlcBearerList->list.array[idx]->mac_LogicalChannelConfig)
+   rlcConfig->choice.um_Uni_Directional_DL->dl_UM_RLC.sn_FieldLength = NULLP;
+   DU_ALLOC(rlcConfig->choice.um_Uni_Directional_DL->dl_UM_RLC.sn_FieldLength, sizeof(SN_FieldLengthUM_t));
+   if(rlcConfig->choice.um_Uni_Directional_DL->dl_UM_RLC.sn_FieldLength == NULLP)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfigUmUniDirDl");
       return RFAILED;
    }
 
-   if(BuildMacLCConfig(rlcBearerList->list.array[idx]->mac_LogicalChannelConfig) != ROK)
+   if(umUniDirUlCfg != NULLP)
    {
-      DU_LOG("\nERROR  -->  F1AP : BuildMacLCConfig failed");
-      return RFAILED;
+      *(rlcConfig->choice.um_Uni_Directional_DL->dl_UM_RLC.sn_FieldLength) = covertUmSnLenFromIntEnumToRrcEnum(umUniDirUlCfg->ulUmCfg.snLenUlUm);
+      rlcConfig->choice.um_Uni_Directional_DL->dl_UM_RLC.t_Reassembly = convertReasmblTmrValueToEnum(umUniDirUlCfg->ulUmCfg.reAssemTmr);
    }
 
    return ROK;
@@ -3124,407 +3179,744 @@ uint8_t BuildRlcBearerToAddModList(struct CellGroupConfigRrc__rlc_BearerToAddMod
 
 /*******************************************************************
  *
- * @brief Build Control resource set to add/modify list 
+ * @brief Builds RLC Config
  *
  * @details
  *
- *    Function : BuildControlRSetToAddModList
+ *    Function : BuildRlcConfig
  *
- *    Functionality: Build Control resource set to add/modify list
+ *    Functionality: Builds RLC Config in BuildRlcBearerToAddModList 
  *
- * @params[in] 
- * struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList
+ * @params[in] RLC_Config_t *rlcConfig
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-   uint8_t BuildControlRSetToAddModList
-(
- struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList
- )
+uint8_t BuildRlcConfig(RlcBearerCfg *rbCfg, struct RLC_Config *rlcConfig)
 {
-   uint8_t idx;
-   uint8_t elementCnt;
-   uint8_t numBytes, bitsUnused;
-   struct ControlResourceSet *controlRSet;
-   uint8_t freqDomainResource[FREQ_DOM_RSRC_SIZE] = {0};
-   uint8_t coreset0EndPrb, coreset1StartPrb, coreset1NumPrb;
-
-
-   elementCnt = 1;
-   controlRSetList->list.count = elementCnt;
-   controlRSetList->list.size = \
-                               elementCnt * sizeof(struct ControlResourceSet *);
-
-   controlRSetList->list.array = NULLP;
-   DU_ALLOC(controlRSetList->list.array, controlRSetList->list.size);
-   if(!controlRSetList->list.array)
+   
+   /* Fill default values if rbCfg is NULL */
+   if(rbCfg == NULLP)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
-      return RFAILED;
+      rlcConfig->present = RLC_Config_PR_am;
+      BuildRlcConfigAm(NULLP, rlcConfig);
    }
-
-   for(idx = 0; idx < elementCnt; idx++)
+   /* If RbCfg is present, fill RLC configurations from DU Database */
+   else
    {
-      controlRSetList->list.array[idx] = NULLP;
-      DU_ALLOC(controlRSetList->list.array[idx], sizeof(struct ControlResourceSet));
-      if(!controlRSetList->list.array[idx])
+      rlcConfig->present = covertRlcModeFromIntEnumToRrcEnum(rbCfg->rlcMode);
+      switch(rlcConfig->present)
       {
-        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
-        return RFAILED;
+         case RLC_Config_PR_am:
+            BuildRlcConfigAm(rbCfg->u.amCfg, rlcConfig);
+            break;
+         case RLC_Config_PR_um_Bi_Directional:
+            BuildRlcConfigUmBiDir(rbCfg->u.umBiDirCfg, rlcConfig);
+            break;
+         case RLC_Config_PR_um_Uni_Directional_UL:
+            BuildRlcConfigUmUniDirUl(rbCfg->u.umUniDirDlCfg, rlcConfig);
+            break;
+         case RLC_Config_PR_um_Uni_Directional_DL:
+            BuildRlcConfigUmUniDirDl(rbCfg->u.umUniDirUlCfg, rlcConfig);
+            break;
+         case RLC_Config_PR_NOTHING:
+         default:
+            break;
       }
    }
 
-   idx=0;
-   controlRSet = controlRSetList->list.array[idx];
-
-   controlRSet->controlResourceSetId = PDCCH_CTRL_RSRC_SET_ONE_ID;
-
-   /* size 6 bytes
-    * 3 LSBs unsued
-    * Bit string stored ff0000000000
-    */
-   numBytes = 6;
-   bitsUnused = 3;
-   controlRSet->frequencyDomainResources.size = numBytes * sizeof(uint8_t);
+   return ROK;
+}
 
-   controlRSet->frequencyDomainResources.buf = NULLP;
-   DU_ALLOC(controlRSet->frequencyDomainResources.buf, \
-        controlRSet->frequencyDomainResources.size);
-   if(!controlRSet->frequencyDomainResources.buf)
+/*******************************************************************
+ *
+ * @brief Builds MAC LC Config
+ *
+ * @details
+ *
+ *    Function : BuildMacLCConfig 
+ *
+ *    Functionality: Builds MAC LC Config in BuildRlcBearerToAddModList 
+ *
+ * @params[in] struct LogicalChannelConfig macLcConfig
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildMacLCConfig(LcCfg *lcCfgDb, struct LogicalChannelConfig *macLcConfig)
+{
+   macLcConfig->ul_SpecificParameters = NULLP;
+   DU_ALLOC(macLcConfig->ul_SpecificParameters, sizeof(struct LogicalChannelConfig__ul_SpecificParameters));
+   if(!macLcConfig->ul_SpecificParameters)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacLCConfig");
       return RFAILED;
    }
 
-   memset(controlRSet->frequencyDomainResources.buf, 0, FREQ_DOM_RSRC_SIZE);
-   coreset0EndPrb = CORESET0_END_PRB;
-   coreset1StartPrb = coreset0EndPrb + 6;
-   coreset1NumPrb = CORESET1_NUM_PRB;
-   /* calculate the PRBs */
-   freqDomRscAllocType0(((coreset1StartPrb)/6), (coreset1NumPrb/6), freqDomainResource);
-   memcpy(controlRSet->frequencyDomainResources.buf, freqDomainResource, FREQ_DOM_RSRC_SIZE);
-   controlRSet->frequencyDomainResources.bits_unused = bitsUnused;
-
-   controlRSet->duration = PDCCH_CTRL_RSRC_SET_ONE_DURATION;
-   controlRSet->cce_REG_MappingType.present = \
-                                             ControlResourceSet__cce_REG_MappingType_PR_nonInterleaved;
-
-   controlRSet->precoderGranularity = PDCCH_CTRL_RSRC_SET_ONE_PRECOD_GRANULARITY;
-   controlRSet->tci_StatesPDCCH_ToAddList = NULLP;
-   controlRSet->tci_StatesPDCCH_ToReleaseList = NULLP;
-   controlRSet->tci_PresentInDCI = NULLP;
-#if 0
-   uint8_t tciStateIdx;
-
-   DU_ALLOC(controlRset->tci_StatesPDCCH_ToAddList, \
-        sizeof(struct ControlResourceSet__tci_StatesPDCCH_ToAddList));
-   if(!controlRset->tci_StatesPDCCH_ToAddList)
+   if(lcCfgDb == NULLP)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
-      return RFAILED;
+      macLcConfig->ul_SpecificParameters->priority = MAC_LC_PRIORITY;
+      macLcConfig->ul_SpecificParameters->prioritisedBitRate = PRIORTISIED_BIT_RATE;
+      macLcConfig->ul_SpecificParameters->bucketSizeDuration = BUCKET_SIZE_DURATION;
    }
-
-   elementCnt = 1;
-   controlRset->tci_StatesPDCCH_ToAddList->list.count = elementCnt;
-   controlRset->tci_StatesPDCCH_ToAddList->list.size = elementCnt * sizeof(TCI_StateId_t *);
-   DU_ALLOC(controlRset->tci_StatesPDCCH_ToAddList->list.array, \
-        controlRset->tci_StatesPDCCH_ToAddList->list.size)
-      if(!controlRset->tci_StatesPDCCH_ToAddList->list.array)
-      {
-        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
-        return RFAILED;
-      }
-
-   for(tciStateIdx = 0; tciStateIdx <elementCntl; tciStateIdx++)
+   else
    {
-      DU_ALLOC(controlRset->tci_StatesPDCCH_ToAddList->list.array[tciStateIdx], sizeof(TCI_StateId_t));
-      if(!controlRset->tci_StatesPDCCH_ToAddList->list.array[tciStateIdx])
-      {
-        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
-        return RFAILED;
-      }
+      macLcConfig->ul_SpecificParameters->priority = lcCfgDb->ulLcCfg.priority;
+      macLcConfig->ul_SpecificParameters->prioritisedBitRate = lcCfgDb->ulLcCfg.pbr;
+      macLcConfig->ul_SpecificParameters->bucketSizeDuration = lcCfgDb->ulLcCfg.bsd;
    }
 
-   tciStateIdx = 0;
-   /* TODO */
-   *(controlRset->tci_StatesPDCCH_ToAddList->list.array[tciStateIdx]);
+   macLcConfig->ul_SpecificParameters->allowedServingCells = NULLP;
+   macLcConfig->ul_SpecificParameters->allowedSCS_List = NULLP;
+   macLcConfig->ul_SpecificParameters->maxPUSCH_Duration = NULLP;
+   macLcConfig->ul_SpecificParameters->configuredGrantType1Allowed = NULLP;
 
-   DU_ALLOC(controlRset->tci_PresentInDCI, sizeof(long));
-   if(!controlRset->tci_PresentInDCI)
+   macLcConfig->ul_SpecificParameters->logicalChannelGroup = NULLP;
+   DU_ALLOC(macLcConfig->ul_SpecificParameters->logicalChannelGroup,   sizeof(long));
+   if(!macLcConfig->ul_SpecificParameters->logicalChannelGroup)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacLCConfig");
       return RFAILED;
    }
-   /* TODO */
-   *(controlRset->tci_PresentInDCI);
-#endif
 
-   controlRSet->pdcch_DMRS_ScramblingID = NULLP;
-   DU_ALLOC(controlRSet->pdcch_DMRS_ScramblingID, sizeof(long));
-   if(!controlRSet->pdcch_DMRS_ScramblingID)
+   if(lcCfgDb == NULLP)
+      *(macLcConfig->ul_SpecificParameters->logicalChannelGroup) = LC_GRP;
+   else
+      *(macLcConfig->ul_SpecificParameters->logicalChannelGroup) = lcCfgDb->ulLcCfg.lcGroup;
+
+   macLcConfig->ul_SpecificParameters->schedulingRequestID = NULLP;
+   DU_ALLOC(macLcConfig->ul_SpecificParameters->schedulingRequestID,   sizeof(SchedulingRequestId_t));
+   if(!macLcConfig->ul_SpecificParameters->schedulingRequestID)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacLCConfig");
       return RFAILED;
    }
-   *(controlRSet->pdcch_DMRS_ScramblingID) = SCRAMBLING_ID;
+
+   if(lcCfgDb == NULLP)
+      *(macLcConfig->ul_SpecificParameters->schedulingRequestID) = SCH_REQ_ID;
+   else
+      *(macLcConfig->ul_SpecificParameters->schedulingRequestID) = lcCfgDb->ulLcCfg.schReqId;
+
+   macLcConfig->ul_SpecificParameters->logicalChannelSR_Mask = false;
+   macLcConfig->ul_SpecificParameters->logicalChannelSR_DelayTimerApplied = false;
+   macLcConfig->ul_SpecificParameters->bitRateQueryProhibitTimer = NULLP;
 
    return ROK;
-} /* End BuildControlRSetToAddModList */
+}
 
 /*******************************************************************
  *
- * @brief Build search space to add/modify list
+ * @brief Builds RLC Bearer to Add/Mod list
  *
  * @details
  *
- *    Function : BuildSearchSpcToAddModList
+ *    Function :BuildRlcBearerToAddModList 
  *
- *    Functionality: Build search space to add/modify list
+ *    Functionality: Builds RLC Bearer to Add/Mod list in DuToCuRrcContainer
+ *
+ * @params[in] rlc_BearerToAddModList
  *
- * @params[in] 
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-   uint8_t BuildSearchSpcToAddModList
-(
- struct PDCCH_Config__searchSpacesToAddModList *searchSpcList
- )
+uint8_t BuildRlcBearerToAddModList(DuUeCb *ueCb, struct CellGroupConfigRrc__rlc_BearerToAddModList *rlcBearerList)
 {
-   uint8_t idx;
-   uint8_t numBytes;
-   uint8_t byteIdx;
-   uint8_t bitsUnused;
-   uint8_t elementCnt;
-   struct SearchSpace *searchSpc;
-
-   elementCnt = 1;
-   searchSpcList->list.count = elementCnt;
-   searchSpcList->list.size = elementCnt * sizeof(struct SearchSpace *);
-
-   searchSpcList->list.array = NULLP;
-   DU_ALLOC(searchSpcList->list.array, searchSpcList->list.size);
-   if(!searchSpcList->list.array)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
-      return RFAILED;
-   }
+   uint8_t  idx = 0, lcIdx=0, macLcIdx = 0, elementCnt = 0;
 
-   for(idx = 0; idx < elementCnt; idx++)
+   if(ueCb == NULLP)
+      elementCnt = 1;
+   else if(ueCb->f1UeDb->actionType == UE_CTXT_CFG_QUERY)
+      elementCnt = ueCb->rlcUeCfg.numLcs;
+   else
    {
-      searchSpcList->list.array[idx] = NULLP;
-      DU_ALLOC(searchSpcList->list.array[idx], sizeof(struct SearchSpace));
-      if(!searchSpcList->list.array[idx])
+      for(lcIdx = 0; lcIdx<ueCb->rlcUeCfg.numLcs; lcIdx++)
       {
-        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
-        return RFAILED;
+         if(ueCb->rlcUeCfg.rlcLcCfg[lcIdx].isLcAddModRspSent == false)
+            elementCnt++;
       }
    }
+   rlcBearerList->list.count = elementCnt;
+   rlcBearerList->list.size  = elementCnt * sizeof(struct RLC_BearerConfig *);
 
-   idx = 0;
-   searchSpc = searchSpcList->list.array[idx];
-
-   searchSpc->searchSpaceId = PDCCH_SRCH_SPC_TWO_ID;
-
-   searchSpc->controlResourceSetId = NULLP;
-   DU_ALLOC(searchSpc->controlResourceSetId, sizeof(ControlResourceSetId_t));
-   if(!searchSpc->controlResourceSetId)
+   rlcBearerList->list.array = NULLP;
+   DU_ALLOC(rlcBearerList->list.array, rlcBearerList->list.size);
+   if(!rlcBearerList->list.array)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
       return RFAILED;
    }
-   *(searchSpc->controlResourceSetId) = PDCCH_CTRL_RSRC_SET_ONE_ID;
 
-   searchSpc->monitoringSlotPeriodicityAndOffset = NULLP;
-   DU_ALLOC(searchSpc->monitoringSlotPeriodicityAndOffset, \
-        sizeof(struct SearchSpace__monitoringSlotPeriodicityAndOffset));
-   if(!searchSpc->monitoringSlotPeriodicityAndOffset)
+   for(idx=0; idx<rlcBearerList->list.count; idx++)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
-      return RFAILED;
+      rlcBearerList->list.array[idx] = NULLP;
+      DU_ALLOC(rlcBearerList->list.array[idx], sizeof(struct RLC_BearerConfig));
+      if(!rlcBearerList->list.array[idx])
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
+         return RFAILED;
+      }
    }
-   searchSpc->monitoringSlotPeriodicityAndOffset->present = \
-                                                           SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1;
 
-   searchSpc->duration = NULLP;
-   searchSpc->monitoringSymbolsWithinSlot = NULLP;
-   DU_ALLOC(searchSpc->monitoringSymbolsWithinSlot, sizeof(BIT_STRING_t));
-   if(!searchSpc->monitoringSymbolsWithinSlot)
+   if(ueCb == NULLP)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
-      return RFAILED;
-   }
+      idx=0;
+      rlcBearerList->list.array[idx]->logicalChannelIdentity = SRB1_LCID;
+      DU_ALLOC(rlcBearerList->list.array[idx]->servedRadioBearer, sizeof(struct RLC_BearerConfig__servedRadioBearer));
+      if(!rlcBearerList->list.array[idx]->servedRadioBearer)
+      {     
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
+         return RFAILED;
+      }     
+      rlcBearerList->list.array[idx]->servedRadioBearer->present = RLC_BearerConfig__servedRadioBearer_PR_srb_Identity;
+      rlcBearerList->list.array[idx]->servedRadioBearer->choice.srb_Identity = SRB1_LCID;
+      rlcBearerList->list.array[idx]->reestablishRLC = NULLP;
 
-   /* Values taken from reference logs :
-    * size 2 bytes
-    * 2 LSBs unsued
-    * Bit string stores 8000
-    */
-   numBytes = 2;
-   bitsUnused = 2;
+      /* Fill RLC related Configurations for this Radio Bearer */
+      rlcBearerList->list.array[idx]->rlc_Config = NULLP;
+      DU_ALLOC(rlcBearerList->list.array[idx]->rlc_Config, sizeof(struct RLC_Config));
+      if(!rlcBearerList->list.array[idx]->rlc_Config)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
+         return RFAILED;
+      }
+      if(BuildRlcConfig(NULLP, rlcBearerList->list.array[idx]->rlc_Config) != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildRlcConfig failed");
+         return RFAILED;
+      }
 
-   searchSpc->monitoringSymbolsWithinSlot->size = numBytes * sizeof(uint8_t);
-   searchSpc->monitoringSymbolsWithinSlot->buf = NULLP;
-   DU_ALLOC(searchSpc->monitoringSymbolsWithinSlot->buf, \
-        searchSpc->monitoringSymbolsWithinSlot->size);
-   if(!searchSpc->monitoringSymbolsWithinSlot->buf)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
-      return RFAILED;
+      /* Fill MAC related configurations for this Radio Bearer */
+      rlcBearerList->list.array[idx]->mac_LogicalChannelConfig = NULLP;
+      DU_ALLOC(rlcBearerList->list.array[idx]->mac_LogicalChannelConfig, sizeof(struct LogicalChannelConfig));
+      if(!rlcBearerList->list.array[idx]->mac_LogicalChannelConfig)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
+         return RFAILED;
+      }
+      if(BuildMacLCConfig(NULLP, rlcBearerList->list.array[idx]->mac_LogicalChannelConfig) != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildMacLCConfig failed");
+         return RFAILED;
+      }
    }
-
-   byteIdx = 0;
-   searchSpc->monitoringSymbolsWithinSlot->buf[byteIdx++] = \
-                                                           PDCCH_SYMBOL_WITHIN_SLOT /* setting MSB to 128 i.e. 0x80 */;
-   searchSpc->monitoringSymbolsWithinSlot->buf[byteIdx++] = 0;
-   searchSpc->monitoringSymbolsWithinSlot->bits_unused = bitsUnused;
-
-   searchSpc->nrofCandidates = NULLP;
-   DU_ALLOC(searchSpc->nrofCandidates, sizeof(struct SearchSpace__nrofCandidates));
-   if(!searchSpc->nrofCandidates)
+   else
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
-      return RFAILED;
-   }
+      idx=0;
+      for(lcIdx=0; lcIdx<ueCb->rlcUeCfg.numLcs; lcIdx++)
+      {
+         if((ueCb->f1UeDb->actionType != UE_CTXT_CFG_QUERY) && (ueCb->rlcUeCfg.rlcLcCfg[lcIdx].isLcAddModRspSent == true))
+            continue;
 
-   searchSpc->nrofCandidates->aggregationLevel1 = \
-                                                 PDCCH_SRCH_SPC_TWO_AGG_LVL1_CANDIDATE;
-   searchSpc->nrofCandidates->aggregationLevel2 = \
-                                                 PDCCH_SRCH_SPC_TWO_AGG_LVL2_CANDIDATE;
-   searchSpc->nrofCandidates->aggregationLevel4 = \
-                                                 PDCCH_SRCH_SPC_TWO_AGG_LVL4_CANDIDATE;
-   searchSpc->nrofCandidates->aggregationLevel8 = \
-                                                 PDCCH_SRCH_SPC_TWO_AGG_LVL8_CANDIDATE;
-   searchSpc->nrofCandidates->aggregationLevel16 = \
-                                                  PDCCH_SRCH_SPC_TWO_AGG_LVL16_CANDIDATE;
+         /* Fill Logical channel identity */
+         rlcBearerList->list.array[idx]->logicalChannelIdentity = ueCb->rlcUeCfg.rlcLcCfg[lcIdx].lcId;
 
-   searchSpc->searchSpaceType = NULLP;
-   DU_ALLOC(searchSpc->searchSpaceType, sizeof(struct SearchSpace__searchSpaceType));
-   if(!searchSpc->searchSpaceType)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
-      return RFAILED;
-   }
+         /* Fill Radio Bearer Id and type (DRB/SRB) for this logical channel */
+         DU_ALLOC(rlcBearerList->list.array[idx]->servedRadioBearer, sizeof(struct RLC_BearerConfig__servedRadioBearer));
+         if(!rlcBearerList->list.array[idx]->servedRadioBearer)
+         {
+            DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
+            return RFAILED;
+         }
+         rlcBearerList->list.array[idx]->servedRadioBearer->present = \
+                                                                      covertRbTypeFromIntEnumToRrcEnum(ueCb->rlcUeCfg.rlcLcCfg[lcIdx].rbType);
+         switch(rlcBearerList->list.array[idx]->servedRadioBearer->present)
+         {
+            case RLC_BearerConfig__servedRadioBearer_PR_srb_Identity: 
+               rlcBearerList->list.array[idx]->servedRadioBearer->choice.srb_Identity = ueCb->rlcUeCfg.rlcLcCfg[lcIdx].rbId;
+               break;
+            case RLC_BearerConfig__servedRadioBearer_PR_drb_Identity:
+               rlcBearerList->list.array[idx]->servedRadioBearer->choice.drb_Identity = ueCb->rlcUeCfg.rlcLcCfg[lcIdx].rbId;
+               break;
+            case RLC_BearerConfig__servedRadioBearer_PR_NOTHING:
+            default:
+               break;
+         }
+         ueCb->rlcUeCfg.rlcLcCfg[lcIdx].isLcAddModRspSent = true;
 
-   searchSpc->searchSpaceType->present = SearchSpace__searchSpaceType_PR_ue_Specific;
+         rlcBearerList->list.array[idx]->reestablishRLC = NULLP;
 
-   searchSpc->searchSpaceType->choice.ue_Specific = NULLP;
-   DU_ALLOC(searchSpc->searchSpaceType->choice.ue_Specific, \
-        sizeof(struct SearchSpace__searchSpaceType__ue_Specific));
-   if(!searchSpc->searchSpaceType->choice.ue_Specific)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
-      return RFAILED;
-   }  
-   searchSpc->searchSpaceType->choice.ue_Specific->dci_Formats = \
-                                                                PDCCH_SRCH_SPC_TWO_UE_SPEC_DCI_FORMAT;
+         /* Fill RLC related Configurations for this Radio Bearer */
+         rlcBearerList->list.array[idx]->rlc_Config = NULLP;
+         DU_ALLOC(rlcBearerList->list.array[idx]->rlc_Config, sizeof(struct RLC_Config));
+         if(!rlcBearerList->list.array[idx]->rlc_Config)
+         {
+            DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
+            return RFAILED;
+         }
+         if(BuildRlcConfig(&ueCb->rlcUeCfg.rlcLcCfg[lcIdx], rlcBearerList->list.array[idx]->rlc_Config) != ROK)
+         {
+            DU_LOG("\nERROR  -->  F1AP : BuildRlcConfig failed");
+            return RFAILED;
+         }
 
+         /* Fill MAC related configurations for this Radio Bearer */
+         rlcBearerList->list.array[idx]->mac_LogicalChannelConfig = NULLP;
+         DU_ALLOC(rlcBearerList->list.array[idx]->mac_LogicalChannelConfig, sizeof(struct LogicalChannelConfig));
+         if(!rlcBearerList->list.array[idx]->mac_LogicalChannelConfig)
+         {
+            DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
+            return RFAILED;
+         }
+         for(macLcIdx = 0; macLcIdx < ueCb->macUeCfg.numLcs; macLcIdx++)
+         {
+            if(ueCb->macUeCfg.lcCfgList[macLcIdx].lcId == ueCb->rlcUeCfg.rlcLcCfg[lcIdx].lcId)
+            {
+               if(BuildMacLCConfig(&ueCb->macUeCfg.lcCfgList[macLcIdx], rlcBearerList->list.array[idx]->mac_LogicalChannelConfig) != ROK)
+               {
+                  DU_LOG("\nERROR  -->  F1AP : BuildMacLCConfig failed");
+                  return RFAILED;
+               }
+               break;
+            }
+         }
+
+         idx++;
+      }
+   }
    return ROK;
-}/* End BuildSearchSpcToAddModList */
+}
 
 /*******************************************************************
  *
- * @brief Builds BWP DL dedicated PDCCH config
+ * @brief Build Control resource set to add/modify list 
  *
  * @details
  *
- *    Function : BuildBWPDlDedPdcchCfg
+ *    Function : BuildControlRSetToAddModList
  *
- *    Functionality: Builds BWP DL dedicated PDCCH config
+ *    Functionality: Build Control resource set to add/modify list
  *
- * @params[in] struct PDCCH_Config *pdcchCfg
+ * @params[in] 
+ * struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildBWPDlDedPdcchCfg(struct PDCCH_Config *pdcchCfg)
+uint8_t BuildControlRSetToAddModList(PdcchConfig *pdcchCfg, struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList)
 {
-   pdcchCfg->controlResourceSetToAddModList = NULLP;
-   DU_ALLOC(pdcchCfg->controlResourceSetToAddModList, \
-        sizeof(struct PDCCH_Config__controlResourceSetToAddModList));
-   if(!pdcchCfg->controlResourceSetToAddModList)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPDlDedPdcchCfg");
-      return RFAILED;
-   }
+   uint8_t idx;
+   uint8_t elementCnt;
+   uint8_t numBytes, bitsUnused;
+   struct ControlResourceSet *controlRSet;
+   uint8_t freqDomainResource[FREQ_DOM_RSRC_SIZE] = {0};
+   uint8_t coreset0EndPrb, coreset1StartPrb, coreset1NumPrb;
 
-   if(BuildControlRSetToAddModList(pdcchCfg->controlResourceSetToAddModList) != ROK)
-   {
-      return RFAILED;
-   }
+   if(pdcchCfg == NULLP)
+      elementCnt = 1;
+   else
+      elementCnt = pdcchCfg->numCRsetToAddMod;
 
-   pdcchCfg->controlResourceSetToReleaseList = NULLP;
+   controlRSetList->list.count = elementCnt;
+   controlRSetList->list.size = elementCnt * sizeof(struct ControlResourceSet *);
 
-   pdcchCfg->searchSpacesToAddModList = NULLP;
-   DU_ALLOC(pdcchCfg->searchSpacesToAddModList, \
-        sizeof(struct PDCCH_Config__searchSpacesToAddModList));
-   if(!pdcchCfg->searchSpacesToAddModList)
+   controlRSetList->list.array = NULLP;
+   DU_ALLOC(controlRSetList->list.array, controlRSetList->list.size);
+   if(!controlRSetList->list.array)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPDlDedPdcchCfg");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
       return RFAILED;
    }
 
-   if(BuildSearchSpcToAddModList(pdcchCfg->searchSpacesToAddModList) != ROK)
+   for(idx = 0; idx < elementCnt; idx++)
    {
-      return RFAILED;
+      controlRSetList->list.array[idx] = NULLP;
+      DU_ALLOC(controlRSetList->list.array[idx], sizeof(struct ControlResourceSet));
+      if(!controlRSetList->list.array[idx])
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+         return RFAILED;
+      }
    }
 
-   pdcchCfg->searchSpacesToReleaseList = NULLP;
-   pdcchCfg->downlinkPreemption = NULLP;
-   pdcchCfg->tpc_PUSCH = NULLP;
-   pdcchCfg->tpc_PUCCH = NULLP;
-   pdcchCfg->tpc_SRS = NULLP;
+   for(idx = 0; idx < elementCnt; idx++)
+   {
+      controlRSet = controlRSetList->list.array[idx];
+
+      if(pdcchCfg == NULLP)
+         controlRSet->controlResourceSetId = PDCCH_CTRL_RSRC_SET_ONE_ID;
+      else
+         controlRSet->controlResourceSetId = pdcchCfg->cRSetToAddModList[idx].cRSetId;
+
+      /* size 6 bytes
+       * 3 LSBs unsued
+       * Bit string stored ff0000000000
+       */
+      numBytes = 6;
+      bitsUnused = 3;
+      controlRSet->frequencyDomainResources.size = numBytes * sizeof(uint8_t);
+
+      controlRSet->frequencyDomainResources.buf = NULLP;
+      DU_ALLOC(controlRSet->frequencyDomainResources.buf, controlRSet->frequencyDomainResources.size);
+      if(!controlRSet->frequencyDomainResources.buf)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+         return RFAILED;
+      }
+
+      memset(controlRSet->frequencyDomainResources.buf, 0, FREQ_DOM_RSRC_SIZE);
+
+      if(pdcchCfg == NULLP)
+      {
+         coreset0EndPrb = CORESET0_END_PRB;
+         coreset1StartPrb = coreset0EndPrb + 6;
+         coreset1NumPrb = CORESET1_NUM_PRB;
+         /* calculate the PRBs */
+         fillCoresetFeqDomAllocMap(((coreset1StartPrb)/6), (coreset1NumPrb/6), freqDomainResource);
+         memcpy(controlRSet->frequencyDomainResources.buf, freqDomainResource, FREQ_DOM_RSRC_SIZE);
+         controlRSet->frequencyDomainResources.bits_unused = bitsUnused;
+
+         controlRSet->duration = PDCCH_CTRL_RSRC_SET_ONE_DURATION;
+         controlRSet->cce_REG_MappingType.present = ControlResourceSet__cce_REG_MappingType_PR_nonInterleaved;
+         controlRSet->precoderGranularity = PDCCH_CTRL_RSRC_SET_ONE_PRECOD_GRANULARITY;
+      }
+      else
+      {
+         memcpy(controlRSet->frequencyDomainResources.buf, pdcchCfg->cRSetToAddModList[idx].freqDomainRsrc, FREQ_DOM_RSRC_SIZE);
+         controlRSet->frequencyDomainResources.bits_unused = bitsUnused;
+         controlRSet->duration = pdcchCfg->cRSetToAddModList[idx].duration;
+         controlRSet->cce_REG_MappingType.present = pdcchCfg->cRSetToAddModList[idx].cceRegMappingType;
+         controlRSet->precoderGranularity = pdcchCfg->cRSetToAddModList[idx].precoderGranularity;
+      }
+      controlRSet->tci_StatesPDCCH_ToAddList = NULLP;
+      controlRSet->tci_StatesPDCCH_ToReleaseList = NULLP;
+      controlRSet->tci_PresentInDCI = NULLP;
+
+#if 0
+      uint8_t tciStateIdx;
+
+      DU_ALLOC(controlRset->tci_StatesPDCCH_ToAddList, \
+            sizeof(struct ControlResourceSet__tci_StatesPDCCH_ToAddList));
+      if(!controlRset->tci_StatesPDCCH_ToAddList)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+         return RFAILED;
+      }
+
+      elementCnt = 1;
+      controlRset->tci_StatesPDCCH_ToAddList->list.count = elementCnt;
+      controlRset->tci_StatesPDCCH_ToAddList->list.size = elementCnt * sizeof(TCI_StateId_t *);
+      DU_ALLOC(controlRset->tci_StatesPDCCH_ToAddList->list.array, \
+            controlRset->tci_StatesPDCCH_ToAddList->list.size)
+         if(!controlRset->tci_StatesPDCCH_ToAddList->list.array)
+         {
+            DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+            return RFAILED;
+         }
+
+      for(tciStateIdx = 0; tciStateIdx <elementCntl; tciStateIdx++)
+      {
+         DU_ALLOC(controlRset->tci_StatesPDCCH_ToAddList->list.array[tciStateIdx], sizeof(TCI_StateId_t));
+         if(!controlRset->tci_StatesPDCCH_ToAddList->list.array[tciStateIdx])
+         {
+            DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+            return RFAILED;
+         }
+      }
+
+      tciStateIdx = 0;
+      /* TODO */
+      *(controlRset->tci_StatesPDCCH_ToAddList->list.array[tciStateIdx]);
 
+      DU_ALLOC(controlRset->tci_PresentInDCI, sizeof(long));
+      if(!controlRset->tci_PresentInDCI)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+         return RFAILED;
+      }
+      /* TODO */
+      *(controlRset->tci_PresentInDCI);
+#endif
+
+      controlRSet->pdcch_DMRS_ScramblingID = NULLP;
+      DU_ALLOC(controlRSet->pdcch_DMRS_ScramblingID, sizeof(long));
+      if(!controlRSet->pdcch_DMRS_ScramblingID)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+         return RFAILED;
+      }
+      if(pdcchCfg == NULLP)
+         *(controlRSet->pdcch_DMRS_ScramblingID) = SCRAMBLING_ID;
+      else
+         *(controlRSet->pdcch_DMRS_ScramblingID) = pdcchCfg->cRSetToAddModList[idx].dmrsScramblingId;
+   }
    return ROK;
-}
+} /* End BuildControlRSetToAddModList */
 
 /*******************************************************************
  *
- * @brief Builds DMRS DL PDSCH Mapping type A
+ * @brief Build search space to add/modify list
  *
  * @details
  *
- *    Function : BuildDMRSDLPdschMapTypeA
+ *    Function : BuildSearchSpcToAddModList
  *
- *    Functionality: Builds DMRS DL PDSCH Mapping type A
+ *    Functionality: Build search space to add/modify list
  *
- * @params[in]
- * struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA *dmrsDlCfg
+ * @params[in] 
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-   uint8_t BuildDMRSDLPdschMapTypeA
-(
- struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA *dmrsDlCfg
- )
+uint8_t BuildSearchSpcToAddModList(PdcchConfig *pdcchCfg, struct PDCCH_Config__searchSpacesToAddModList *searchSpcList)
 {
-   dmrsDlCfg->present = PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA_PR_setup;
-   dmrsDlCfg->choice.setup = NULLP;
-   DU_ALLOC(dmrsDlCfg->choice.setup, sizeof(struct DMRS_DownlinkConfig));
-   if(!dmrsDlCfg->choice.setup)
+   uint8_t idx;
+   uint8_t numBytes;
+   uint8_t byteIdx;
+   uint8_t bitsUnused;
+   uint8_t elementCnt;
+   struct SearchSpace *searchSpc;
+
+   if(pdcchCfg == NULLP)
+      elementCnt = 1;
+   else
+      elementCnt = pdcchCfg->numSearchSpcToAddMod;
+
+   searchSpcList->list.count = elementCnt;
+   searchSpcList->list.size = elementCnt * sizeof(struct SearchSpace *);
+
+   searchSpcList->list.array = NULLP;
+   DU_ALLOC(searchSpcList->list.array, searchSpcList->list.size);
+   if(!searchSpcList->list.array)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
       return RFAILED;
    }
 
-   dmrsDlCfg->choice.setup->dmrs_Type = NULLP;
-   dmrsDlCfg->choice.setup->dmrs_AdditionalPosition = NULLP;
-   DU_ALLOC(dmrsDlCfg->choice.setup->dmrs_AdditionalPosition, sizeof(long));
-   if(!dmrsDlCfg->choice.setup->dmrs_AdditionalPosition)
+   for(idx = 0; idx < elementCnt; idx++)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDMRSDLPdschMapTypeA");
-      return RFAILED;
+      searchSpcList->list.array[idx] = NULLP;
+      DU_ALLOC(searchSpcList->list.array[idx], sizeof(struct SearchSpace));
+      if(!searchSpcList->list.array[idx])
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+         return RFAILED;
+      }
    }
-   *(dmrsDlCfg->choice.setup->dmrs_AdditionalPosition) = DMRS_ADDITIONAL_POS;
 
-   dmrsDlCfg->choice.setup->maxLength = NULLP;
-   dmrsDlCfg->choice.setup->scramblingID0 = NULLP;
-   dmrsDlCfg->choice.setup->scramblingID1 = NULLP;
-   dmrsDlCfg->choice.setup->phaseTrackingRS = NULLP;
+   for(idx = 0; idx < elementCnt; idx++)
+   {
+      searchSpc = searchSpcList->list.array[idx];
+
+      if(pdcchCfg == NULLP)
+         searchSpc->searchSpaceId = PDCCH_SRCH_SPC_TWO_ID;
+      else
+         searchSpc->searchSpaceId = pdcchCfg->searchSpcToAddModList[idx].searchSpaceId;
+
+      searchSpc->controlResourceSetId = NULLP;
+      DU_ALLOC(searchSpc->controlResourceSetId, sizeof(ControlResourceSetId_t));
+      if(!searchSpc->controlResourceSetId)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+         return RFAILED;
+      }
+      if(pdcchCfg == NULLP)
+         *(searchSpc->controlResourceSetId) = PDCCH_CTRL_RSRC_SET_ONE_ID;
+      else
+         *(searchSpc->controlResourceSetId) = pdcchCfg->searchSpcToAddModList[idx].cRSetId;
+
+      searchSpc->monitoringSlotPeriodicityAndOffset = NULLP;
+      DU_ALLOC(searchSpc->monitoringSlotPeriodicityAndOffset, sizeof(struct SearchSpace__monitoringSlotPeriodicityAndOffset));
+      if(!searchSpc->monitoringSlotPeriodicityAndOffset)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+         return RFAILED;
+      }
+      if(pdcchCfg == NULLP)
+         searchSpc->monitoringSlotPeriodicityAndOffset->present = SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1;
+      else
+         searchSpc->monitoringSlotPeriodicityAndOffset->present = pdcchCfg->searchSpcToAddModList[idx].mSlotPeriodicityAndOffset;
+
+      searchSpc->duration = NULLP;
+      searchSpc->monitoringSymbolsWithinSlot = NULLP;
+      DU_ALLOC(searchSpc->monitoringSymbolsWithinSlot, sizeof(BIT_STRING_t));
+      if(!searchSpc->monitoringSymbolsWithinSlot)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+         return RFAILED;
+      }
+
+      /* Values taken from reference logs :
+       * size 2 bytes
+       * 2 LSBs unsued
+       * Bit string stores 8000
+       */
+      numBytes = 2;
+      bitsUnused = 2;
+      searchSpc->monitoringSymbolsWithinSlot->size = numBytes * sizeof(uint8_t);
+      searchSpc->monitoringSymbolsWithinSlot->buf = NULLP;
+      DU_ALLOC(searchSpc->monitoringSymbolsWithinSlot->buf, searchSpc->monitoringSymbolsWithinSlot->size);
+      if(!searchSpc->monitoringSymbolsWithinSlot->buf)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+         return RFAILED;
+      }
+      if(pdcchCfg == NULLP)
+      {
+         byteIdx = 0;
+         searchSpc->monitoringSymbolsWithinSlot->buf[byteIdx++] = PDCCH_SYMBOL_WITHIN_SLOT /* setting MSB to 128 i.e. 0x80 */;
+         searchSpc->monitoringSymbolsWithinSlot->buf[byteIdx++] = 0;
+      }
+      else
+         memcpy(searchSpc->monitoringSymbolsWithinSlot->buf, pdcchCfg->searchSpcToAddModList[idx].mSymbolsWithinSlot, numBytes);
+      searchSpc->monitoringSymbolsWithinSlot->bits_unused = bitsUnused;
+
+      searchSpc->nrofCandidates = NULLP;
+      DU_ALLOC(searchSpc->nrofCandidates, sizeof(struct SearchSpace__nrofCandidates));
+      if(!searchSpc->nrofCandidates)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+         return RFAILED;
+      }
+
+      if(pdcchCfg == NULLP)
+      {
+         searchSpc->nrofCandidates->aggregationLevel1 = PDCCH_SRCH_SPC_TWO_AGG_LVL1_CANDIDATE;
+         searchSpc->nrofCandidates->aggregationLevel2 = PDCCH_SRCH_SPC_TWO_AGG_LVL2_CANDIDATE;
+         searchSpc->nrofCandidates->aggregationLevel4 = PDCCH_SRCH_SPC_TWO_AGG_LVL4_CANDIDATE;
+         searchSpc->nrofCandidates->aggregationLevel8 = PDCCH_SRCH_SPC_TWO_AGG_LVL8_CANDIDATE;
+         searchSpc->nrofCandidates->aggregationLevel16 = PDCCH_SRCH_SPC_TWO_AGG_LVL16_CANDIDATE;
+      }
+      else
+      {
+         searchSpc->nrofCandidates->aggregationLevel1 = pdcchCfg->searchSpcToAddModList[idx].numCandidatesAggLevel1;
+         searchSpc->nrofCandidates->aggregationLevel2 = pdcchCfg->searchSpcToAddModList[idx].numCandidatesAggLevel2;
+         searchSpc->nrofCandidates->aggregationLevel4 = pdcchCfg->searchSpcToAddModList[idx].numCandidatesAggLevel4;
+         searchSpc->nrofCandidates->aggregationLevel8 = pdcchCfg->searchSpcToAddModList[idx].numCandidatesAggLevel8;
+         searchSpc->nrofCandidates->aggregationLevel16 = pdcchCfg->searchSpcToAddModList[idx].numCandidatesAggLevel16;
+      }
+
+      searchSpc->searchSpaceType = NULLP;
+      DU_ALLOC(searchSpc->searchSpaceType, sizeof(struct SearchSpace__searchSpaceType));
+      if(!searchSpc->searchSpaceType)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+         return RFAILED;
+      }
+      if(pdcchCfg == NULLP)
+         searchSpc->searchSpaceType->present = SearchSpace__searchSpaceType_PR_ue_Specific;
+      else
+         searchSpc->searchSpaceType->present = pdcchCfg->searchSpcToAddModList[idx].searchSpaceType;
+
+      searchSpc->searchSpaceType->choice.ue_Specific = NULLP;
+      DU_ALLOC(searchSpc->searchSpaceType->choice.ue_Specific, sizeof(struct SearchSpace__searchSpaceType__ue_Specific));
+      if(!searchSpc->searchSpaceType->choice.ue_Specific)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+         return RFAILED;
+      }  
+      if(pdcchCfg == NULLP)
+         searchSpc->searchSpaceType->choice.ue_Specific->dci_Formats = PDCCH_SRCH_SPC_TWO_UE_SPEC_DCI_FORMAT;
+      else
+         searchSpc->searchSpaceType->choice.ue_Specific->dci_Formats = pdcchCfg->searchSpcToAddModList[idx].ueSpecificDciFormat;
+   }
+   return ROK;
+}/* End BuildSearchSpcToAddModList */
+
+/*******************************************************************
+ *
+ * @brief Builds BWP DL dedicated PDCCH config
+ *
+ * @details
+ *
+ *    Function : BuildBWPDlDedPdcchCfg
+ *
+ *    Functionality: Builds BWP DL dedicated PDCCH config
+ *
+ * @params[in] struct PDCCH_Config *pdcchCfg
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildBWPDlDedPdcchCfg(PdcchConfig *pdcchCfgDb, struct PDCCH_Config *pdcchCfg)
+{
+   pdcchCfg->controlResourceSetToAddModList = NULLP;
+   DU_ALLOC(pdcchCfg->controlResourceSetToAddModList, sizeof(struct PDCCH_Config__controlResourceSetToAddModList));
+   if(!pdcchCfg->controlResourceSetToAddModList)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPDlDedPdcchCfg");
+      return RFAILED;
+   }
+
+   if(BuildControlRSetToAddModList(pdcchCfgDb, pdcchCfg->controlResourceSetToAddModList) != ROK)
+   {
+      DU_LOG("\nERROR  --> F1AP : Failed in BuildControlRSetToAddModList()");
+      return RFAILED;
+   }
+
+   pdcchCfg->controlResourceSetToReleaseList = NULLP;
+
+   pdcchCfg->searchSpacesToAddModList = NULLP;
+   DU_ALLOC(pdcchCfg->searchSpacesToAddModList, sizeof(struct PDCCH_Config__searchSpacesToAddModList));
+   if(!pdcchCfg->searchSpacesToAddModList)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPDlDedPdcchCfg");
+      return RFAILED;
+   }
+
+   if(BuildSearchSpcToAddModList(pdcchCfgDb, pdcchCfg->searchSpacesToAddModList) != ROK)
+   {
+      DU_LOG("\nERROR  --> F1AP : Failed in BuildSearchSpcToAddModList()");
+      return RFAILED;
+   }
+
+   pdcchCfg->searchSpacesToReleaseList = NULLP;
+   pdcchCfg->downlinkPreemption = NULLP;
+   pdcchCfg->tpc_PUSCH = NULLP;
+   pdcchCfg->tpc_PUCCH = NULLP;
+   pdcchCfg->tpc_SRS = NULLP;
+
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds DMRS DL PDSCH Mapping type A
+ *
+ * @details
+ *
+ *    Function : BuildDMRSDLPdschMapTypeA
+ *
+ *    Functionality: Builds DMRS DL PDSCH Mapping type A
+ *
+ * @params[in]
+ * struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA *dmrsDlCfg
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildDMRSDLPdschMapTypeA(PdschConfig *pdschCfg, struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA *dmrsDlCfg)
+{
+   dmrsDlCfg->present = PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA_PR_setup;
+   dmrsDlCfg->choice.setup = NULLP;
+   DU_ALLOC(dmrsDlCfg->choice.setup, sizeof(struct DMRS_DownlinkConfig));
+   if(!dmrsDlCfg->choice.setup)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDMRSDLPdschMapTypeA");
+      return RFAILED;
+   }
+
+   dmrsDlCfg->choice.setup->dmrs_Type = NULLP;
+   dmrsDlCfg->choice.setup->dmrs_AdditionalPosition = NULLP;
+   DU_ALLOC(dmrsDlCfg->choice.setup->dmrs_AdditionalPosition, sizeof(long));
+   if(!dmrsDlCfg->choice.setup->dmrs_AdditionalPosition)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDMRSDLPdschMapTypeA");
+      return RFAILED;
+   }
+   if(pdschCfg == NULLP)
+      *(dmrsDlCfg->choice.setup->dmrs_AdditionalPosition) = DMRS_ADDITIONAL_POS;
+   else
+      *(dmrsDlCfg->choice.setup->dmrs_AdditionalPosition) = pdschCfg->dmrsDlCfgForPdschMapTypeA.addPos;
+
+   dmrsDlCfg->choice.setup->maxLength = NULLP;
+   dmrsDlCfg->choice.setup->scramblingID0 = NULLP;
+   dmrsDlCfg->choice.setup->scramblingID1 = NULLP;
+   dmrsDlCfg->choice.setup->phaseTrackingRS = NULLP;
 
    return ROK;
 }
@@ -3568,35 +3960,31 @@ uint8_t BuildTCIStatesToAddModList(struct PDSCH_Config__tci_StatesToAddModList *
  *         RFAILED - failure
  *
  * ****************************************************************/
-   uint8_t BuildPdschTimeDomAllocList
-(
- struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList
- )
+uint8_t BuildPdschTimeDomAllocList(PdschConfig *pdschCfg, struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList)
 {
    uint8_t idx;
    uint8_t elementCnt;
    struct PDSCH_TimeDomainResourceAllocation *timeDomAlloc;
 
-   timeDomAllocList->present = \
-                              PDSCH_Config__pdsch_TimeDomainAllocationList_PR_setup;
+   timeDomAllocList->present = PDSCH_Config__pdsch_TimeDomainAllocationList_PR_setup;
 
    timeDomAllocList->choice.setup = NULLP;
-   DU_ALLOC(timeDomAllocList->choice.setup, \
-        sizeof(struct PDSCH_TimeDomainResourceAllocationList));
+   DU_ALLOC(timeDomAllocList->choice.setup, sizeof(struct PDSCH_TimeDomainResourceAllocationList));
    if(!timeDomAllocList->choice.setup)
    {
       DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
       return RFAILED;
    }
 
-   elementCnt = 1;
+if(pdschCfg == NULLP)
+   elementCnt = 2;
+else
+elementCnt = pdschCfg->numTimeDomRsrcAlloc;
    timeDomAllocList->choice.setup->list.count = elementCnt;
-   timeDomAllocList->choice.setup->list.size = \
-                                              elementCnt * sizeof(struct PDSCH_TimeDomainResourceAllocation *);
+   timeDomAllocList->choice.setup->list.size = elementCnt * sizeof(struct PDSCH_TimeDomainResourceAllocation *);
 
    timeDomAllocList->choice.setup->list.array = NULLP;
-   DU_ALLOC(timeDomAllocList->choice.setup->list.array, \
-        timeDomAllocList->choice.setup->list.size);
+   DU_ALLOC(timeDomAllocList->choice.setup->list.array, timeDomAllocList->choice.setup->list.size);
    if(!timeDomAllocList->choice.setup->list.array)
    {
       DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
@@ -3607,21 +3995,58 @@ uint8_t BuildTCIStatesToAddModList(struct PDSCH_Config__tci_StatesToAddModList *
    {
       timeDomAllocList->choice.setup->list.array[idx] = NULLP;
       DU_ALLOC(timeDomAllocList->choice.setup->list.array[idx], \
-           sizeof(struct PDSCH_TimeDomainResourceAllocation));
+            sizeof(struct PDSCH_TimeDomainResourceAllocation));
       if(!timeDomAllocList->choice.setup->list.array[idx])
       {
-        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
-        return RFAILED;
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
+         return RFAILED;
       }
    }
 
-   idx = 0;
-   timeDomAlloc = timeDomAllocList->choice.setup->list.array[idx];
+   if(pdschCfg == NULLP)
+   {
+      idx = 0;
+      timeDomAlloc = timeDomAllocList->choice.setup->list.array[idx];
+      DU_ALLOC(timeDomAlloc->k0, sizeof(long));
+      if(!timeDomAlloc->k0)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
+         return RFAILED;
+      }
+      *(timeDomAlloc->k0) = 0;
+      timeDomAlloc->mappingType = PDSCH_MAPPING_TYPE_A;
+      timeDomAlloc->startSymbolAndLength = \
+                                           calcSliv(PDSCH_START_SYMBOL, PDSCH_LENGTH_SYMBOL);
 
-   timeDomAlloc->k0 = NULLP;
-   timeDomAlloc->mappingType = PDSCH_MAPPING_TYPE_A;
-   timeDomAlloc->startSymbolAndLength = \
-                                       calcSliv(PDSCH_START_SYMBOL, PDSCH_LENGTH_SYMBOL);
+      idx++;
+      timeDomAlloc = timeDomAllocList->choice.setup->list.array[idx];
+      DU_ALLOC(timeDomAlloc->k0, sizeof(long));
+      if(!timeDomAlloc->k0)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
+         return RFAILED;
+      }
+      *(timeDomAlloc->k0) = 1;
+      timeDomAlloc->mappingType = PDSCH_MAPPING_TYPE_A;
+      timeDomAlloc->startSymbolAndLength = calcSliv(PDSCH_START_SYMBOL, PDSCH_LENGTH_SYMBOL);
+   }
+   else
+   {
+      for(idx = 0; idx < elementCnt; idx++)
+      {
+         timeDomAlloc = timeDomAllocList->choice.setup->list.array[idx];
+         DU_ALLOC(timeDomAlloc->k0, sizeof(long));
+         if(!timeDomAlloc->k0)
+         {
+            DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
+            return RFAILED;
+         }
+         if(pdschCfg->timeDomRsrcAllociList[idx].k0)
+            *(timeDomAlloc->k0) = *(pdschCfg->timeDomRsrcAllociList[idx].k0);
+         timeDomAlloc->mappingType = pdschCfg->timeDomRsrcAllociList[idx].mappingType;
+         timeDomAlloc->startSymbolAndLength = pdschCfg->timeDomRsrcAllociList[idx].startSymbolAndLength;
+      }
+   }
 
    return ROK;
 }
@@ -3643,12 +4068,12 @@ uint8_t BuildTCIStatesToAddModList(struct PDSCH_Config__tci_StatesToAddModList *
  *         RFAILED - failure
  *
  * ****************************************************************/
-   uint8_t BuildPdschPrbBundlingType
-(
- struct PDSCH_Config__prb_BundlingType *prbBndlType
- )
+uint8_t BuildPdschPrbBundlingType(PdschConfig *pdschCfg, struct PDSCH_Config__prb_BundlingType *prbBndlType)
 {
-   prbBndlType->present = PDSCH_Config__prb_BundlingType_PR_staticBundling;
+   if(pdschCfg == NULLP)
+      prbBndlType->present = PDSCH_Config__prb_BundlingType_PR_staticBundling;
+   else
+      prbBndlType->present = pdschCfg->bundlingType;
 
    prbBndlType->choice.staticBundling = NULLP;
    DU_ALLOC(prbBndlType->choice.staticBundling, \
@@ -3679,20 +4104,19 @@ uint8_t BuildTCIStatesToAddModList(struct PDSCH_Config__tci_StatesToAddModList *
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildBWPDlDedPdschCfg(struct PDSCH_Config *pdschCfg)
+uint8_t BuildBWPDlDedPdschCfg(PdschConfig *pdschCfgDb, struct PDSCH_Config *pdschCfg)
 {
    pdschCfg->dataScramblingIdentityPDSCH = NULLP;
 
    pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA = NULLP;
-   DU_ALLOC(pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA, \
-        sizeof(struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA));
+   DU_ALLOC(pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA, sizeof(struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA));
    if(!pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA)
    {
       DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
       return RFAILED;
    }
 
-   if(BuildDMRSDLPdschMapTypeA(pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA) != ROK)
+   if(BuildDMRSDLPdschMapTypeA(pdschCfgDb, pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA) != ROK)
    {
       return RFAILED;
    }
@@ -3714,18 +4138,19 @@ uint8_t BuildBWPDlDedPdschCfg(struct PDSCH_Config *pdschCfg)
    }
 #endif
 
+if(pdschCfgDb == NULLP)
    pdschCfg->resourceAllocation = RES_ALLOC_TYPE;
+else
+pdschCfg->resourceAllocation = pdschCfgDb->resourceAllocType;
 
    pdschCfg->pdsch_TimeDomainAllocationList = NULLP;
-   DU_ALLOC(pdschCfg->pdsch_TimeDomainAllocationList, \
-        sizeof(struct PDSCH_Config__pdsch_TimeDomainAllocationList));
+   DU_ALLOC(pdschCfg->pdsch_TimeDomainAllocationList, sizeof(struct PDSCH_Config__pdsch_TimeDomainAllocationList));
    if(!pdschCfg->pdsch_TimeDomainAllocationList)
    {
       DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
       return RFAILED;
    }
-
-   if(BuildPdschTimeDomAllocList(pdschCfg->pdsch_TimeDomainAllocationList) != ROK)
+   if(BuildPdschTimeDomAllocList(pdschCfgDb, pdschCfg->pdsch_TimeDomainAllocationList) != ROK)
    {
       return RFAILED;
    }
@@ -3735,7 +4160,10 @@ uint8_t BuildBWPDlDedPdschCfg(struct PDSCH_Config *pdschCfg)
    pdschCfg->rateMatchPatternToReleaseList = NULLP;
    pdschCfg->rateMatchPatternGroup1 = NULLP;
    pdschCfg->rateMatchPatternGroup2 = NULLP;
-   pdschCfg->rbg_Size = PDSCH_RBG_SIZE;
+   if(pdschCfgDb == NULLP)
+      pdschCfg->rbg_Size = PDSCH_RBG_SIZE;
+   else
+      pdschCfg->rbg_Size = pdschCfgDb->rbgSize;
    pdschCfg->mcs_Table = NULLP;
 
    pdschCfg->maxNrofCodeWordsScheduledByDCI = NULLP;
@@ -3745,9 +4173,12 @@ uint8_t BuildBWPDlDedPdschCfg(struct PDSCH_Config *pdschCfg)
       DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
       return RFAILED;
    }
-   *(pdschCfg->maxNrofCodeWordsScheduledByDCI) = PDSCH_MAX_CODEWORD_SCH_BY_DCI;
+   if(pdschCfgDb == NULLP)
+      *(pdschCfg->maxNrofCodeWordsScheduledByDCI) = PDSCH_MAX_CODEWORD_SCH_BY_DCI;
+   else
+      *(pdschCfg->maxNrofCodeWordsScheduledByDCI) = pdschCfgDb->numCodeWordsSchByDci;
 
-   if(BuildPdschPrbBundlingType(&pdschCfg->prb_BundlingType) != ROK)
+   if(BuildPdschPrbBundlingType(pdschCfgDb, &pdschCfg->prb_BundlingType) != ROK)
    {
       return RFAILED;
    }
@@ -3778,8 +4209,19 @@ uint8_t BuildBWPDlDedPdschCfg(struct PDSCH_Config *pdschCfg)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildInitialDlBWP(BWP_DownlinkDedicated_t *dlBwp)
+uint8_t BuildInitialDlBWP(InitialDlBwp *initiDlBwp, BWP_DownlinkDedicated_t *dlBwp)
 {
+   PdcchConfig *pdcchCfg = NULLP;
+   PdschConfig *pdschCfg = NULLP;
+
+   if(initiDlBwp)
+   {
+      if(initiDlBwp->pdcchPresent)
+         pdcchCfg = &initiDlBwp->pdcchCfg;
+      if(initiDlBwp->pdschPresent)
+         pdschCfg = &initiDlBwp->pdschCfg;
+   }
+
    dlBwp->pdcch_Config = NULLP;
    DU_ALLOC(dlBwp->pdcch_Config, sizeof(struct BWP_DownlinkDedicated__pdcch_Config));
    if(!dlBwp->pdcch_Config)
@@ -3796,7 +4238,7 @@ uint8_t BuildInitialDlBWP(BWP_DownlinkDedicated_t *dlBwp)
       DU_LOG("\nERROR  -->  F1AP : Memory Allocation failure in BuildInitialDlBWP");
       return RFAILED;
    }
-   if(BuildBWPDlDedPdcchCfg(dlBwp->pdcch_Config->choice.setup) != ROK)
+   if(BuildBWPDlDedPdcchCfg(pdcchCfg, dlBwp->pdcch_Config->choice.setup) != ROK)
    {
       return RFAILED;
    }
@@ -3818,7 +4260,7 @@ uint8_t BuildInitialDlBWP(BWP_DownlinkDedicated_t *dlBwp)
       return RFAILED;
    }
 
-   if(BuildBWPDlDedPdschCfg(dlBwp->pdsch_Config->choice.setup) != ROK)
+   if(BuildBWPDlDedPdschCfg(pdschCfg, dlBwp->pdsch_Config->choice.setup) != ROK)
    {
       return RFAILED;
    }
@@ -3844,10 +4286,7 @@ uint8_t BuildInitialDlBWP(BWP_DownlinkDedicated_t *dlBwp)
  *         RFAILED - failure
  *
  * ****************************************************************/
-   uint8_t BuildDMRSULPuschMapTypeA
-(
- struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA *dmrsUlCfg
- )
+uint8_t BuildDMRSULPuschMapTypeA(DmrsUlCfg *ulDmrsCfgDb, struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA *dmrsUlCfg)
 {
    dmrsUlCfg->present = PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA_PR_setup;
    dmrsUlCfg->choice.setup= NULLP;
@@ -3866,13 +4305,15 @@ uint8_t BuildInitialDlBWP(BWP_DownlinkDedicated_t *dlBwp)
       DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDMRSULPuschMapTypeA");
       return RFAILED;
    }
-   *(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition) = DMRS_ADDITIONAL_POS; 
+   if(ulDmrsCfgDb == NULLP)
+      *(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition) = DMRS_ADDITIONAL_POS; 
+   else
+      *(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition) = ulDmrsCfgDb->addPos;
 
    dmrsUlCfg->choice.setup->phaseTrackingRS = NULLP;
    dmrsUlCfg->choice.setup->maxLength = NULLP;
    dmrsUlCfg->choice.setup->transformPrecodingDisabled = NULLP;
-   DU_ALLOC(dmrsUlCfg->choice.setup->transformPrecodingDisabled, \
-        sizeof(struct DMRS_UplinkConfig__transformPrecodingDisabled));
+   DU_ALLOC(dmrsUlCfg->choice.setup->transformPrecodingDisabled, sizeof(struct DMRS_UplinkConfig__transformPrecodingDisabled));
    if(!dmrsUlCfg->choice.setup->transformPrecodingDisabled)
    {
       DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDMRSULPuschMapTypeA");
@@ -3887,7 +4328,10 @@ uint8_t BuildInitialDlBWP(BWP_DownlinkDedicated_t *dlBwp)
       DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDMRSULPuschMapTypeA");
       return RFAILED;
    }
-   *(dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0) = SCRAMBLING_ID;
+   if(ulDmrsCfgDb == NULLP)
+      *(dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0) = SCRAMBLING_ID;
+   else
+      *(dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0) = ulDmrsCfgDb->transPrecodDisabled.scramblingId0;
 
    dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID1 = NULLP;
    dmrsUlCfg->choice.setup->transformPrecodingEnabled = NULLP;
@@ -3911,10 +4355,7 @@ uint8_t BuildInitialDlBWP(BWP_DownlinkDedicated_t *dlBwp)
  *         RFAILED - failure
  *
  * ****************************************************************/
-   uint8_t BuildPuschTimeDomAllocList
-(
- struct PUSCH_Config__pusch_TimeDomainAllocationList *timeDomAllocList
- )
+uint8_t BuildPuschTimeDomAllocList(PuschCfg *puschCfgDb, struct PUSCH_Config__pusch_TimeDomainAllocationList *timeDomAllocList)
 {
    uint8_t idx;
    uint8_t elementCnt;
@@ -3922,21 +4363,22 @@ uint8_t BuildInitialDlBWP(BWP_DownlinkDedicated_t *dlBwp)
 
    timeDomAllocList->present = PUSCH_Config__pusch_TimeDomainAllocationList_PR_setup;
    timeDomAllocList->choice.setup = NULLP;
-   DU_ALLOC(timeDomAllocList->choice.setup, \
-        sizeof(struct PUSCH_TimeDomainResourceAllocationList));
+   DU_ALLOC(timeDomAllocList->choice.setup, sizeof(struct PUSCH_TimeDomainResourceAllocationList));
    if(!timeDomAllocList->choice.setup)
    {
       DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
       return RFAILED;
    }
 
-   elementCnt = 1;
+   if(puschCfgDb == NULLP)
+      elementCnt = 2;
+   else
+      elementCnt = puschCfgDb->numTimeDomRsrcAlloc;
+
    timeDomAllocList->choice.setup->list.count = elementCnt;
-   timeDomAllocList->choice.setup->list.size = \
-                                              elementCnt * sizeof(PUSCH_TimeDomainResourceAllocation_t *);
+   timeDomAllocList->choice.setup->list.size = elementCnt * sizeof(PUSCH_TimeDomainResourceAllocation_t *);
    timeDomAllocList->choice.setup->list.array = NULLP;
-   DU_ALLOC(timeDomAllocList->choice.setup->list.array, \
-        timeDomAllocList->choice.setup->list.size);
+   DU_ALLOC(timeDomAllocList->choice.setup->list.array, timeDomAllocList->choice.setup->list.size);
    if(!timeDomAllocList->choice.setup->list.array)
    {
       DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
@@ -3946,26 +4388,41 @@ uint8_t BuildInitialDlBWP(BWP_DownlinkDedicated_t *dlBwp)
    for(idx = 0; idx < elementCnt; idx++)
    {
       timeDomAllocList->choice.setup->list.array[idx] = NULLP;
-      DU_ALLOC(timeDomAllocList->choice.setup->list.array[idx],\
-           sizeof(PUSCH_TimeDomainResourceAllocation_t));
+      DU_ALLOC(timeDomAllocList->choice.setup->list.array[idx], sizeof(PUSCH_TimeDomainResourceAllocation_t));
       if(!timeDomAllocList->choice.setup->list.array[idx])
       {
-        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
-        return RFAILED;
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
+         return RFAILED;
       }
    }
 
-   idx = 0;
-   timeDomAlloc = timeDomAllocList->choice.setup->list.array[idx];
-   DU_ALLOC(timeDomAlloc->k2, sizeof(long));
-   if(!timeDomAlloc->k2)
+   for(idx = 0; idx < elementCnt; idx++)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
-      return RFAILED;
+      timeDomAlloc = timeDomAllocList->choice.setup->list.array[idx];
+      DU_ALLOC(timeDomAlloc->k2, sizeof(long));
+      if(!timeDomAlloc->k2)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
+         return RFAILED;
+      }
+      if(puschCfgDb == NULLP)
+      {
+         if(idx == 0)
+            *(timeDomAlloc->k2) = PUSCH_K2_CFG1;
+         else if(idx == 1)
+            *(timeDomAlloc->k2) = PUSCH_K2_CFG2;
+
+         timeDomAlloc->mappingType = PUSCH_MAPPING_TYPE_A;
+         timeDomAlloc->startSymbolAndLength = calcSliv(PUSCH_START_SYMBOL, PUSCH_LENGTH_SYMBOL);
+      }
+      else
+      {
+         *(timeDomAlloc->k2) = puschCfgDb->timeDomRsrcAllocList[idx].k2;
+         timeDomAlloc->mappingType = puschCfgDb->timeDomRsrcAllocList[idx].mappingType;
+         timeDomAlloc->startSymbolAndLength = puschCfgDb->timeDomRsrcAllocList[idx].startSymbolAndLength;
+      }
    }
-   *(timeDomAlloc->k2) = PUSCH_K2;
-   timeDomAlloc->mappingType = PUSCH_MAPPING_TYPE_A;
-   timeDomAlloc->startSymbolAndLength = calcSliv(PUSCH_START_SYMBOL, PUSCH_LENGTH_SYMBOL);
+
    return ROK;
 }
 
@@ -3986,8 +4443,13 @@ uint8_t BuildInitialDlBWP(BWP_DownlinkDedicated_t *dlBwp)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildBWPUlDedPuschCfg(PUSCH_Config_t *puschCfg)
+uint8_t BuildBWPUlDedPuschCfg(PuschCfg *puschCfgDb, PUSCH_Config_t *puschCfg)
 {
+   DmrsUlCfg *ulDmrsCfg = NULLP;
+   
+   if(puschCfgDb)
+      ulDmrsCfg = &puschCfgDb->dmrsUlCfgForPuschMapTypeA;
+
    puschCfg->dataScramblingIdentityPUSCH = NULLP;
    DU_ALLOC(puschCfg->dataScramblingIdentityPUSCH, sizeof(long));
    if(!puschCfg->dataScramblingIdentityPUSCH)
@@ -3995,19 +4457,21 @@ uint8_t BuildBWPUlDedPuschCfg(PUSCH_Config_t *puschCfg)
       DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPuschCfg");
       return RFAILED;
    }
-   *(puschCfg->dataScramblingIdentityPUSCH) = SCRAMBLING_ID;
+   if(puschCfgDb == NULLP)
+      *(puschCfg->dataScramblingIdentityPUSCH) = SCRAMBLING_ID;
+   else
+      *(puschCfg->dataScramblingIdentityPUSCH) = puschCfgDb->dataScramblingId;
 
    puschCfg->txConfig = NULLP;
    puschCfg->dmrs_UplinkForPUSCH_MappingTypeA = NULLP;
-   DU_ALLOC(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA, \
-        sizeof(struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA));
+   DU_ALLOC(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA, sizeof(struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA));
    if(!puschCfg->dmrs_UplinkForPUSCH_MappingTypeA)
    {
       DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPuschCfg");
       return RFAILED;
    }
 
-   if(BuildDMRSULPuschMapTypeA(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA) != ROK)
+   if(BuildDMRSULPuschMapTypeA(ulDmrsCfg, puschCfg->dmrs_UplinkForPUSCH_MappingTypeA) != ROK)
    {
       return RFAILED;
    }
@@ -4016,18 +4480,21 @@ uint8_t BuildBWPUlDedPuschCfg(PUSCH_Config_t *puschCfg)
    puschCfg->pusch_PowerControl = NULLP;
    puschCfg->frequencyHopping = NULLP;
    puschCfg->frequencyHoppingOffsetLists = NULLP;
-   puschCfg->resourceAllocation = RES_ALLOC_TYPE;
+
+   if(puschCfgDb == NULLP)
+      puschCfg->resourceAllocation = RES_ALLOC_TYPE;
+   else
+      puschCfg->resourceAllocation = puschCfgDb->resourceAllocType;
 
    puschCfg->pusch_TimeDomainAllocationList = NULLP;
-   DU_ALLOC(puschCfg->pusch_TimeDomainAllocationList, \
-        sizeof(struct PUSCH_Config__pusch_TimeDomainAllocationList));
+   DU_ALLOC(puschCfg->pusch_TimeDomainAllocationList, sizeof(struct PUSCH_Config__pusch_TimeDomainAllocationList));
    if(!puschCfg->pusch_TimeDomainAllocationList)
    {
       DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPuschCfg");
       return RFAILED;
    }
 
-   if(BuildPuschTimeDomAllocList(puschCfg->pusch_TimeDomainAllocationList) != ROK)
+   if(BuildPuschTimeDomAllocList(puschCfgDb, puschCfg->pusch_TimeDomainAllocationList) != ROK)
    {
       return RFAILED;
    }
@@ -4042,7 +4509,10 @@ uint8_t BuildBWPUlDedPuschCfg(PUSCH_Config_t *puschCfg)
       DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPuschCfg");
       return RFAILED;
    }
-   *(puschCfg->transformPrecoder) = PUSCH_TRANSFORM_PRECODER;
+   if(puschCfgDb == NULLP)
+      *(puschCfg->transformPrecoder) = PUSCH_TRANSFORM_PRECODER;
+   else
+      *(puschCfg->transformPrecoder) = puschCfgDb->transformPrecoder;
 
    puschCfg->codebookSubset = NULLP;
    puschCfg->maxRank = NULLP;
@@ -4055,2229 +4525,2308 @@ uint8_t BuildBWPUlDedPuschCfg(PUSCH_Config_t *puschCfg)
 
 /*******************************************************************
  *
- * @brief Fills SRS resource to add/modify list 
+ * @brief Builds PUCCH resource set add/modify list
  *
  * @details
  *
- *    Function : BuildSrsRsrcAddModList
+ *    Function : BuildPucchRsrcSetAddModList
  *
- *    Functionality: Fills SRS resource to add/modify list
+ *    Functionality:
+ *      Builds PUCCH resource set add/modify list
+ *
+ * @params[in] : PucchResrcSetCfg *rsrcSetCfgDb
+ *               struct PUCCH_Config__resourceSetToAddModList *rsrcSetAddModList
  *
- * @params[in] 
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildSrsRsrcAddModList(struct SRS_Config__srs_ResourceToAddModList *resourceList)
+uint8_t BuildPucchRsrcSetAddModList(PucchResrcSetCfg *rsrcSetCfgDb, \
+   struct PUCCH_Config__resourceSetToAddModList *resourceSetToAddModList)
 {
-   uint8_t   elementCnt;
-   uint8_t   rsrcIdx;
+   uint8_t elementCnt = 0, rsrcSetIdx = 0, rsrcIdx = 0;
+   PUCCH_ResourceSet_t *rsrcSet = NULLP;
 
-   elementCnt = 1;
-   resourceList->list.count = elementCnt;
-   resourceList->list.size = elementCnt * sizeof(SRS_Resource_t *);
-   resourceList->list.array = NULLP;
-   DU_ALLOC(resourceList->list.array, resourceList->list.size);
-   if(!resourceList->list.array)
+   if(rsrcSetCfgDb == NULLP)
+      elementCnt = 1;
+   else
+      elementCnt = rsrcSetCfgDb->resrcSetToAddModListCount;
+
+   resourceSetToAddModList->list.count = elementCnt;
+   resourceSetToAddModList->list.size = elementCnt * sizeof(PUCCH_ResourceSet_t *);
+   DU_ALLOC(resourceSetToAddModList->list.array, resourceSetToAddModList->list.size);
+   if(resourceSetToAddModList->list.array == NULLP)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSrsRsrcAddModList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPucchRsrcSetAddModList");
       return RFAILED;
    }
-
-   for(rsrcIdx = 0; rsrcIdx < resourceList->list.count; rsrcIdx++)
+   for(rsrcSetIdx=0; rsrcSetIdx < resourceSetToAddModList->list.count; rsrcSetIdx++)
    {
-      DU_ALLOC(resourceList->list.array[rsrcIdx], sizeof(SRS_Resource_t));
-      if(!resourceList->list.array[rsrcIdx])
+      DU_ALLOC(resourceSetToAddModList->list.array[rsrcSetIdx], sizeof(PUCCH_ResourceSet_t));
+      if(resourceSetToAddModList->list.array[rsrcSetIdx] == NULLP)
       {
-        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSrsRsrcAddModList");
-        return RFAILED;
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPucchRsrcSetAddModList");
+         return RFAILED;
       }
    }
 
-   rsrcIdx = 0;
-   resourceList->list.array[rsrcIdx]->srs_ResourceId = SRS_RSRC_ID;
-   resourceList->list.array[rsrcIdx]->nrofSRS_Ports = SRS_Resource__nrofSRS_Ports_port1;
-   resourceList->list.array[rsrcIdx]->transmissionComb.present = SRS_Resource__transmissionComb_PR_n2;
-
-   resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2 = NULLP;
-   DU_ALLOC(resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2, \
-        sizeof(struct SRS_Resource__transmissionComb__n2));
-   if(!resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2)
+   for(rsrcSetIdx=0; rsrcSetIdx < resourceSetToAddModList->list.count; rsrcSetIdx++)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSrsRsrcAddModList");
-      return RFAILED;
-   }
-   resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2->combOffset_n2\
-      = SRS_COMB_OFFSET_N2;
-   resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2->cyclicShift_n2\
-      = SRS_CYCLIC_SHIFT_N2;
+      rsrcSet = resourceSetToAddModList->list.array[rsrcSetIdx];
 
-   resourceList->list.array[rsrcIdx]->resourceMapping.startPosition = \
-                                                                     PUSCH_START_SYMBOL;
-   resourceList->list.array[rsrcIdx]->resourceMapping.nrofSymbols =  \
-                                                                    SRS_Resource__resourceMapping__nrofSymbols_n1;
-   resourceList->list.array[rsrcIdx]->resourceMapping.repetitionFactor = \
-                                                                        SRS_Resource__resourceMapping__repetitionFactor_n1;
+      /* Resource set Id */
+      if(rsrcSetCfgDb == NULLP)
+         rsrcSet->pucch_ResourceSetId = 1;
+      else
+         rsrcSet->pucch_ResourceSetId = rsrcSetCfgDb->resrcSetToAddModList[rsrcSetIdx].resrcSetId;
+      /* Resource list of a resource set */
+      if(rsrcSetCfgDb == NULLP)
+         elementCnt = 1;
+      else
+         elementCnt = rsrcSetCfgDb->resrcSetToAddModList[rsrcSetIdx].resrcListCount;
+      rsrcSet->resourceList.list.count = elementCnt;
+      rsrcSet->resourceList.list.size = elementCnt * sizeof(PUCCH_ResourceId_t *);
+      DU_ALLOC(rsrcSet->resourceList.list.array, rsrcSet->resourceList.list.size);
+      if(rsrcSet->resourceList.list.array == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPucchRsrcSetAddModList");
+         return RFAILED;
+      }
 
-   resourceList->list.array[rsrcIdx]->freqDomainPosition = SRS_FREQ_DOM_POS;
-   resourceList->list.array[rsrcIdx]->freqDomainShift = SRS_FREQ_DOM_SHIFT;
-   resourceList->list.array[rsrcIdx]->freqHopping.c_SRS = C_SRS;
-   resourceList->list.array[rsrcIdx]->freqHopping.b_SRS = B_SRS;
-   resourceList->list.array[rsrcIdx]->freqHopping.b_hop = B_HOP;
-   resourceList->list.array[rsrcIdx]->groupOrSequenceHopping = \
-                                                              SRS_Resource__groupOrSequenceHopping_neither;
+      for(rsrcIdx=0; rsrcIdx < rsrcSet->resourceList.list.count; rsrcIdx++)
+      {
+         DU_ALLOC(rsrcSet->resourceList.list.array[rsrcIdx], sizeof(PUCCH_ResourceId_t));
+         if(rsrcSet->resourceList.list.array[rsrcIdx] == NULLP)
+         {
+            DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPucchRsrcSetAddModList");
+            return RFAILED;
+         }
+      }
+      for(rsrcIdx=0; rsrcIdx < rsrcSet->resourceList.list.count; rsrcIdx++)
+      {
+         if(rsrcSetCfgDb == NULLP)
+            *(rsrcSet->resourceList.list.array[rsrcIdx]) = 1;
+         else
+            *(rsrcSet->resourceList.list.array[rsrcIdx]) = rsrcSetCfgDb->resrcSetToAddModList[rsrcSetIdx].resrcList[rsrcIdx];
+      }
 
-   /* Setting resource type to aperiodic for intergration purposes */
-   resourceList->list.array[rsrcIdx]->resourceType.present = \
-                                                            SRS_Resource__resourceType_PR_aperiodic;
-   resourceList->list.array[rsrcIdx]->resourceType.choice.aperiodic = NULLP;
-   DU_ALLOC(resourceList->list.array[rsrcIdx]->resourceType.choice.aperiodic,
-        sizeof(struct SRS_Resource__resourceType__aperiodic));
-   if(!resourceList->list.array[rsrcIdx]->resourceType.choice.aperiodic)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSrsRsrcAddModList");
-      return RFAILED;
+      /* Max payload size (minus 1) in a Resource set */
+      rsrcSet->maxPayloadMinus1 = NULLP;
+      if(rsrcSetCfgDb && rsrcSetCfgDb->resrcSetToAddModList[rsrcSetIdx].maxPayLoadSize)
+      {
+         DU_ALLOC(rsrcSet->maxPayloadMinus1, sizeof(long));
+         if(rsrcSet->maxPayloadMinus1 == NULLP)
+         {
+            DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPucchRsrcSetAddModList");
+            return RFAILED;
+         }
+         *(rsrcSet->maxPayloadMinus1) = rsrcSetCfgDb->resrcSetToAddModList[rsrcSetIdx].maxPayLoadSize;
+      }
    }
-   resourceList->list.array[rsrcIdx]->sequenceId = SRS_SEQ_ID;
-
    return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Build SRS resource set Add/mod list
+ * @brief Builds PUCCH resource add/modify list
  *
  * @details
  *
- *    Function : BuildSrsRsrcSetAddModList
+ *    Function : BuildPucchRsrcAdddModList
  *
- *    Functionality: Build SRS resource set Add/mod list
+ *    Functionality:
+ *      Builds PUCCH resource add/modify list
+ *
+ * @params[in] : PucchResrcCfg *rsrcSetCfgDb
+ *               struct PUCCH_Config__resourceSetToAddModList *rsrcSetAddModList
  *
- * @params[in] 
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-   uint8_t BuildSrsRsrcSetAddModList
-(
- struct SRS_Config__srs_ResourceSetToAddModList *rsrcSetList
- )
+uint8_t BuildPucchRsrcAddModList(PucchResrcCfg *rsrcCfgDb, struct PUCCH_Config__resourceToAddModList  *resourceToAddModList)
 {
-   uint8_t  elementCnt;
-   uint8_t  rSetIdx;
-   uint8_t  rsrcIdx;
-   struct SRS_ResourceSet__srs_ResourceIdList *rsrcIdList;
+   uint8_t elementCnt = 0, rsrcIdx = 0;
+   PUCCH_Resource_t *rsrc = NULLP;
 
-   elementCnt = 1;
-   rsrcSetList->list.count = elementCnt;
-   rsrcSetList->list.size = elementCnt * sizeof(SRS_ResourceSet_t *);
-   rsrcSetList->list.array = NULLP;
-   DU_ALLOC(rsrcSetList->list.array, rsrcSetList->list.size);
-   if(!rsrcSetList->list.array)
+   if(rsrcCfgDb == NULLP)
+      elementCnt = 1;
+   else
+      elementCnt = rsrcCfgDb->resrcToAddModListCount;
+   resourceToAddModList->list.count = elementCnt;
+   resourceToAddModList->list.size = elementCnt * sizeof(PUCCH_Resource_t *);
+   DU_ALLOC(resourceToAddModList->list.array, resourceToAddModList->list.size);
+   if(resourceToAddModList->list.array == NULLP)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSrsRsrcSetAddModList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPucchRsrcAddModList");
       return RFAILED;
    }
-
-   for(rSetIdx = 0; rSetIdx < rsrcSetList->list.count; rSetIdx++)
+   for(rsrcIdx=0; rsrcIdx < resourceToAddModList->list.count; rsrcIdx++)
    {
-      DU_ALLOC(rsrcSetList->list.array[rSetIdx], sizeof(SRS_ResourceSet_t));
-      if(!rsrcSetList->list.array[rSetIdx])
+      DU_ALLOC(resourceToAddModList->list.array[rsrcIdx], sizeof(PUCCH_Resource_t));
+      if(resourceToAddModList->list.array[rsrcIdx] == NULLP)
       {
-        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSrsRsrcSetAddModList");
-        return RFAILED;
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPucchRsrcAddModList");
+         return RFAILED;
       }
    }
 
-   rSetIdx = 0;
-   rsrcSetList->list.array[rSetIdx]->srs_ResourceSetId = SRS_RSET_ID;
-
-   /* Fill Resource Id list in resource set */
-   rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList = NULLP;
-   DU_ALLOC(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList,\
-        sizeof(struct SRS_ResourceSet__srs_ResourceIdList));
-   if(!rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSrsRsrcSetAddModList");
-      return RFAILED;
-   }
-
-   elementCnt = 1;
-   rsrcIdList = rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList;
-   rsrcIdList->list.count = elementCnt;
-   rsrcIdList->list.size = elementCnt * sizeof(SRS_ResourceId_t *);
-   rsrcIdList->list.array = NULLP;
-   DU_ALLOC(rsrcIdList->list.array, rsrcIdList->list.size);
-   if(!rsrcIdList->list.array)
+   for(rsrcIdx=0; rsrcIdx < resourceToAddModList->list.count; rsrcIdx++)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSrsRsrcSetAddModList");
-      return RFAILED;
-   }
+      rsrc = resourceToAddModList->list.array[rsrcIdx];
 
-   for(rsrcIdx = 0; rsrcIdx < rsrcIdList->list.count; rsrcIdx++)
-   {
-      DU_ALLOC(rsrcIdList->list.array[rsrcIdx], sizeof(SRS_ResourceId_t));
-      if(!rsrcIdList->list.array[rsrcIdx])
+      if(rsrcCfgDb == NULLP)
       {
-        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSrsRsrcSetAddModList");
-        return RFAILED;
+         rsrc->pucch_ResourceId = 1;
+         rsrc->startingPRB = 0;
+         rsrc->format.present = PUCCH_Resource__format_PR_format1; 
+         DU_ALLOC(rsrc->format.choice.format1, sizeof(PUCCH_format1_t));
+         if(rsrc->format.choice.format1 == NULLP)
+         {
+            DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPucchRsrcAddModList");
+            return RFAILED;
+         }  
+         rsrc->format.choice.format1->initialCyclicShift = 0;
+         rsrc->format.choice.format1->nrofSymbols = 4;
+         rsrc->format.choice.format1->startingSymbolIndex = 0;
+         rsrc->format.choice.format1->timeDomainOCC = 0;
       }
-   }
-
-   rsrcIdx = 0;
-   *rsrcIdList->list.array[rsrcIdx] = SRS_RSRC_ID;
+      else
+      {
+         rsrc->pucch_ResourceId = rsrcCfgDb->resrcToAddModList[rsrcIdx].resrcId;
+         rsrc->startingPRB = rsrcCfgDb->resrcToAddModList[rsrcIdx].startPrb;
+         if(rsrcCfgDb->resrcToAddModList[rsrcIdx].intraFreqHop)
+         {
+            DU_ALLOC(rsrc->intraSlotFrequencyHopping, sizeof(long));
+            if(rsrc->intraSlotFrequencyHopping == NULLP)
+            {
+               DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPucchRsrcAddModList");
+               return RFAILED;
+            }
+            *(rsrc->intraSlotFrequencyHopping) = rsrcCfgDb->resrcToAddModList[rsrcIdx].intraFreqHop;
+         }
+         else
+            rsrc->intraSlotFrequencyHopping = NULLP;
 
-   /* Fill resource type */
-   rsrcSetList->list.array[rSetIdx]->resourceType.present = \
-                                                           SRS_ResourceSet__resourceType_PR_aperiodic;
+         if(rsrcCfgDb->resrcToAddModList[rsrcIdx].secondPrbHop)
+         {
+            DU_ALLOC(rsrc->secondHopPRB, sizeof(PRB_Id_t));
+            if(rsrc->secondHopPRB == NULLP)
+            {
+               DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPucchRsrcAddModList");
+               return RFAILED;
+            }
+            *(rsrc->secondHopPRB) = rsrcCfgDb->resrcToAddModList[rsrcIdx].secondPrbHop;
+         }
+         else
+            rsrc->secondHopPRB = NULLP;
+         rsrc->format.present = covertPucchFormatIntEnumToRrcEnum(rsrcCfgDb->resrcToAddModList[rsrcIdx].pucchFormat); 
 
-   rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic = NULLP;
-   DU_ALLOC(rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic, \
-        sizeof(struct SRS_ResourceSet__resourceType__aperiodic));
-   if(!rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSrsRsrcSetAddModList");
-      return RFAILED;
-   }
-   rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic->aperiodicSRS_ResourceTrigger \
-      = APERIODIC_SRS_RESRC_TRIGGER;
+         switch(rsrc->format.present)
+         {
+            case PUCCH_Resource__format_PR_NOTHING:
+               break;
+            case PUCCH_Resource__format_PR_format0:
+               {
+                  DU_ALLOC(rsrc->format.choice.format0, sizeof(PUCCH_format0_t));
+                  if(rsrc->format.choice.format0 == NULLP)
+                  {
+                     DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPucchRsrcAddModList");
+                     return RFAILED;
+                  }
+                  rsrc->format.choice.format0->initialCyclicShift = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format0->initialCyclicShift;
+                  rsrc->format.choice.format0->nrofSymbols = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format0->numSymbols;
+                  rsrc->format.choice.format0->startingSymbolIndex = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format0->startSymbolIdx;
+                  break;
+               }
 
-   /* TODO : Fill values for below IEs as expected by Viavi */
-   rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic->csi_RS = NULLP;
-   rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic->slotOffset = NULLP;
+            case PUCCH_Resource__format_PR_format1:
+               {
+                  DU_ALLOC(rsrc->format.choice.format1, sizeof(PUCCH_format1_t));
+                  if(rsrc->format.choice.format1 == NULLP)
+                  {
+                     DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPucchRsrcAddModList");
+                     return RFAILED;
+                  }  
+                  rsrc->format.choice.format1->initialCyclicShift = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format1->initialCyclicShift;
+                  rsrc->format.choice.format1->nrofSymbols = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format1->numSymbols;
+                  rsrc->format.choice.format1->startingSymbolIndex = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format1->startSymbolIdx;
+                  rsrc->format.choice.format1->timeDomainOCC = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format1->timeDomOCC;
+                  break;
+               }
 
+            case PUCCH_Resource__format_PR_format2:
+               {
+                  DU_ALLOC(rsrc->format.choice.format2, sizeof(PUCCH_format2_t));
+                  if(rsrc->format.choice.format2 == NULLP)
+                  {
+                     DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPucchRsrcAddModList");
+                     return RFAILED;
+                  } 
+                  rsrc->format.choice.format2->nrofPRBs = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format2->numPrbs;
+                  rsrc->format.choice.format2->nrofSymbols = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format2->numSymbols;
+                  rsrc->format.choice.format2->startingSymbolIndex = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format2->startSymbolIdx;
+                  break;
+               }
 
-   rsrcSetList->list.array[rSetIdx]->usage = SRS_ResourceSet__usage_codebook;
-   rsrcSetList->list.array[rSetIdx]->alpha = NULLP;
-   rsrcSetList->list.array[rSetIdx]->p0 = NULLP;
-   rsrcSetList->list.array[rSetIdx]->pathlossReferenceRS = NULLP;
-   rsrcSetList->list.array[rSetIdx]->srs_PowerControlAdjustmentStates = NULLP;
+            case PUCCH_Resource__format_PR_format3:
+               {
+                  DU_ALLOC(rsrc->format.choice.format3, sizeof(PUCCH_format3_t));
+                  if(rsrc->format.choice.format3 == NULLP)
+                  {
+                     DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPucchRsrcAddModList");
+                     return RFAILED;
+                  }
+                  rsrc->format.choice.format3->nrofPRBs = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format3->numPrbs;
+                  rsrc->format.choice.format3->nrofSymbols = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format3->numSymbols;
+                  rsrc->format.choice.format3->startingSymbolIndex = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format3->startSymbolIdx;
+                  break;
+               }
 
+            case PUCCH_Resource__format_PR_format4:
+               {
+                  DU_ALLOC(rsrc->format.choice.format4, sizeof(PUCCH_format4_t));
+                  if(rsrc->format.choice.format4 == NULLP)
+                  {
+                     DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPucchRsrcAddModList");
+                     return RFAILED;
+                  }
+                  rsrc->format.choice.format4->nrofSymbols = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format4->numSymbols;
+                  rsrc->format.choice.format4->occ_Length = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format4->occLen;
+                  rsrc->format.choice.format4->occ_Index = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format4->occIdx;
+                  rsrc->format.choice.format4->startingSymbolIndex = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format4->startSymbolIdx;
+                  break;
+               }
+         }
+      }
+   }
    return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Builds BWP UL dedicated SRS Config
+ * @brief Builds PUCCH format  config
  *
  * @details
  *
- *    Function : BuildBWPUlDedSrsCfg
+ *    Function : BuildPucchFormat
  *
- *    Functionality: Builds BWP UL dedicated SRS Config
+ *    Functionality: Builds PUCCH format  config
+ *
+ * @params[in] : PucchFormatCfg *formatDb
+ *               PUCCH_FormatConfig_t *format
  *
- * @params[in] SRS Config 
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildBWPUlDedSrsCfg(SRS_Config_t *srsCfg)
+uint8_t BuildPucchFormat(PucchFormatCfg *formatDb, PUCCH_FormatConfig_t *format)
 {
-   srsCfg->srs_ResourceSetToReleaseList = NULLP;
-   srsCfg->srs_ResourceSetToAddModList = NULLP;
-   DU_ALLOC(srsCfg->srs_ResourceSetToAddModList, \
-        sizeof(struct SRS_Config__srs_ResourceSetToAddModList));
-   if(!srsCfg->srs_ResourceSetToAddModList)
+   /* Inter Slot Fequency hopping */
+   format->interslotFrequencyHopping = NULLP;
+   if((formatDb != NULLP) && (formatDb->interSlotFreqHop == true))
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedSrsCfg");
-      return RFAILED;
+      DU_ALLOC(format->interslotFrequencyHopping, sizeof(long));
+      if(format->interslotFrequencyHopping)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPucchFormat");
+         return RFAILED;
+      }
+      *(format->interslotFrequencyHopping) = PUCCH_FormatConfig__interslotFrequencyHopping_enabled;
    }
-   if(BuildSrsRsrcSetAddModList(srsCfg->srs_ResourceSetToAddModList) != ROK)
+
+   /* Additional DMRS */
+   format->additionalDMRS = NULLP;
+   if((formatDb != NULLP) && (formatDb->addDmrs == true))
    {
-      return RFAILED;
+      DU_ALLOC(format->additionalDMRS, sizeof(long));
+      if(format->additionalDMRS)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPucchFormat");
+         return RFAILED;
+      }
+      *(format->additionalDMRS) = PUCCH_FormatConfig__additionalDMRS_true;
    }
 
-   srsCfg->srs_ResourceToReleaseList = NULLP;
-
-   /* Resource to Add/Modify list */
-   srsCfg->srs_ResourceToAddModList = NULLP;
-   DU_ALLOC(srsCfg->srs_ResourceToAddModList, \
-        sizeof(struct SRS_Config__srs_ResourceToAddModList));
-   if(!srsCfg->srs_ResourceToAddModList)
+    /* Maximum code rate */
+   format->maxCodeRate = NULLP;
+   if((formatDb != NULLP) && (formatDb->maxCodeRate != 0))
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedSrsCfg");
-      return RFAILED;
+      DU_ALLOC(format->maxCodeRate, sizeof(long));
+      if(format->maxCodeRate)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPucchFormat");
+         return RFAILED;
+      }  
+      *(format->maxCodeRate) = formatDb->maxCodeRate;
+   }
+   /* Number of slots */
+   format->nrofSlots = NULLP;
+   if((formatDb == NULLP) || ((formatDb != NULLP) && (formatDb->numSlots != 0)))
+   {
+      DU_ALLOC(format->nrofSlots, sizeof(long));
+      if(format->nrofSlots == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPucchFormat");
+         return RFAILED;
+      }
+      if(formatDb == NULLP)
+         *(format->nrofSlots) = PUCCH_FormatConfig__nrofSlots_n4;
+      else
+         *(format->nrofSlots) = formatDb->numSlots;
    }
 
-   if(BuildSrsRsrcAddModList(srsCfg->srs_ResourceToAddModList) != ROK)
+   /* Pi2BPSK*/
+   format->pi2BPSK = NULLP;
+   if((formatDb != NULLP) && (formatDb->pi2BPSK == true))
    {
-      return RFAILED;
+      DU_ALLOC(format->pi2BPSK, sizeof(long));
+      if(format->pi2BPSK)
+      {     
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPucchFormat");
+         return RFAILED;
+      }     
+      *(format->pi2BPSK) = PUCCH_FormatConfig__pi2BPSK_enabled;
    }
 
-   srsCfg->tpc_Accumulation = NULLP;
+   /* Simultaneous HARQ ACK and CSI */
+   format->simultaneousHARQ_ACK_CSI = NULLP;
+   if((formatDb != NULLP) && (formatDb->harqAckCSI == true))
+   {
+      DU_ALLOC(format->simultaneousHARQ_ACK_CSI, sizeof(long));
+      if(format->simultaneousHARQ_ACK_CSI)
+      {     
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPucchFormat");
+         return RFAILED;
+      }     
+      *(format->simultaneousHARQ_ACK_CSI) = PUCCH_FormatConfig__simultaneousHARQ_ACK_CSI_true;
+   }
 
    return ROK;
 }
 
 
-
 /*******************************************************************
  *
- * @brief Builds Pusch Serving cell Config
+ * @brief Builds PUCCH scheduling request list
  *
  * @details
  *
- *    Function : BuildPuschSrvCellCfg
+ *    Function : BuildPucchSchReqAddModList
  *
- *    Functionality: Builds Pusch Serving cell Config
+ *    Functionality:
+ *      Builds PUCCH scheduling request list
  *
- * @params[in] struct UplinkConfig__pusch_ServingCellConfig *puschCfg
+ * @params[in] : PucchSchedReqCfg *schReqDb
+ *               struct PUCCH_Config__schedulingRequestResourceToAddModList *schReqRsrcToAddModList
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildPuschSrvCellCfg(struct UplinkConfig__pusch_ServingCellConfig *puschCfg)
+uint8_t BuildPucchSchReqAddModList(PucchSchedReqCfg *schReqDb, \
+   struct PUCCH_Config__schedulingRequestResourceToAddModList *schReqRsrcToAddModList)
 {
-   puschCfg->present = UplinkConfig__pusch_ServingCellConfig_PR_setup;
-   puschCfg->choice.setup = NULLP;
-   DU_ALLOC(puschCfg->choice.setup, sizeof(struct PUSCH_ServingCellConfig));
-   if(!puschCfg->choice.setup)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschSrvCellCfg");
-      return RFAILED;
-   }
+   uint8_t elementCnt = 0, schReqIdx = 0;
+   SchedulingRequestResourceConfig_t *schReqRsrc;
 
-   puschCfg->choice.setup->codeBlockGroupTransmission = NULLP;
-   puschCfg->choice.setup->rateMatching = NULLP;
-   puschCfg->choice.setup->xOverhead = NULLP;
-   puschCfg->choice.setup->ext1 = NULLP;
-   DU_ALLOC(puschCfg->choice.setup->ext1, sizeof(struct PUSCH_ServingCellConfig__ext1));
-   if(!puschCfg->choice.setup->ext1)
+   elementCnt = schReqDb->schedAddModListCount;
+   schReqRsrcToAddModList->list.count = elementCnt;
+   schReqRsrcToAddModList->list.size = elementCnt *sizeof(struct SchedulingRequestResourceConfig *);
+
+   schReqRsrcToAddModList->list.array = NULLP;
+   DU_ALLOC(schReqRsrcToAddModList->list.array, schReqRsrcToAddModList->list.size);
+   if(schReqRsrcToAddModList->list.array == NULLP)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschSrvCellCfg");
+      DU_LOG("\nERROR  --> DU APP: Memory allocation failed in BuildPucchSchReqAddModList");
       return RFAILED;
    }
 
-   puschCfg->choice.setup->ext1->maxMIMO_Layers = NULLP;
-   DU_ALLOC(puschCfg->choice.setup->ext1->maxMIMO_Layers, sizeof(long));
-   if(!puschCfg->choice.setup->ext1->maxMIMO_Layers)
+   for(schReqIdx = 0; schReqIdx < schReqRsrcToAddModList->list.count; schReqIdx++)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschSrvCellCfg");
-      return RFAILED;
+      DU_ALLOC(schReqRsrcToAddModList->list.array[schReqIdx], schReqRsrcToAddModList->list.size);
+      if(schReqRsrcToAddModList->list.array[schReqIdx] == NULLP)
+      {
+         DU_LOG("\nERROR  --> DU APP: Memory allocation failed in BuildPucchSchReqAddModList");
+         return RFAILED;
+      }
    }
-   *(puschCfg->choice.setup->ext1->maxMIMO_Layers) = PUSCH_MAX_MIMO_LAYERS;
 
-   puschCfg->choice.setup->ext1->processingType2Enabled= NULLP;
-   DU_ALLOC(puschCfg->choice.setup->ext1->processingType2Enabled,sizeof(BOOLEAN_t));
-   if(!puschCfg->choice.setup->ext1->processingType2Enabled)
+   for(schReqIdx = 0; schReqIdx < schReqRsrcToAddModList->list.count; schReqIdx++)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschSrvCellCfg");
-      return RFAILED;
-   }
-   *(puschCfg->choice.setup->ext1->processingType2Enabled) = PUSCH_PROCESS_TYPE2_ENABLED;
-   return ROK;
-}
+      schReqRsrc = schReqRsrcToAddModList->list.array[schReqIdx];
+      schReqRsrc->schedulingRequestResourceId = schReqDb->schedAddModList[schReqIdx].resrcId;
+      schReqRsrc->schedulingRequestID = schReqDb->schedAddModList[schReqIdx].requestId;
 
-/*******************************************************************
- *
- * @brief Builds inital UL BWP
- *
- * @details
- *
- *    Function : BuildInitialUlBWP
- *
- *    Functionality: Builds initial UL BWP
- *
- * @params[in] BWP_UplinkDedicated_t *ulBwp
- * @return ROK     - success
- *         RFAILED - failure
- *
- * ****************************************************************/
-uint8_t BuildInitialUlBWP(BWP_UplinkDedicated_t *ulBwp)
-{
-   ulBwp->pucch_Config = NULLP;
-
-   /* Fill BWP UL dedicated PUSCH config */
-   ulBwp->pusch_Config = NULLP;
-   DU_ALLOC(ulBwp->pusch_Config, sizeof(struct BWP_UplinkDedicated__pusch_Config));
-   if(!ulBwp->pusch_Config)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildInitialUlBWP");
-      return RFAILED;
-   }
-
-   ulBwp->pusch_Config->present = BWP_UplinkDedicated__pusch_Config_PR_setup;
-   ulBwp->pusch_Config->choice.setup = NULLP;
-   DU_ALLOC(ulBwp->pusch_Config->choice.setup, sizeof(PUSCH_Config_t));
-   if(!ulBwp->pusch_Config->choice.setup)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildInitialUlBWP");
-      return RFAILED;
-   }
-
-   if(BuildBWPUlDedPuschCfg(ulBwp->pusch_Config->choice.setup) != ROK)
-   {
-      return RFAILED;
-   }
-
-   ulBwp->configuredGrantConfig = NULLP;
+      if(schReqDb->schedAddModList[schReqIdx].periodicity)
+      {
+         schReqRsrc->periodicityAndOffset = NULLP;
+         DU_ALLOC(schReqRsrc->periodicityAndOffset, sizeof(struct SchedulingRequestResourceConfig__periodicityAndOffset));
+         if(schReqRsrc->periodicityAndOffset == NULLP)
+         {
+            DU_LOG("\nERROR  --> DU APP: Memory allocation failed in BuildPucchSchReqAddModList");
+            return RFAILED;
+         }
 
-   /* Fill BPW UL dedicated SRS config */
-   ulBwp->srs_Config = NULLP;
-   DU_ALLOC(ulBwp->srs_Config, sizeof(struct BWP_UplinkDedicated__srs_Config));
-   if(!ulBwp->srs_Config)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildInitialUlBWP");
-      return RFAILED;
-   }
+         schReqRsrc->periodicityAndOffset->present = schReqDb->schedAddModList[schReqIdx].periodicity;
+         switch(schReqRsrc->periodicityAndOffset->present)
+         {
+            case SchedulingRequestResourceConfig__periodicityAndOffset_PR_NOTHING:
+               break;
+            case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sym2:
+               schReqRsrc->periodicityAndOffset->choice.sym2 = schReqDb->schedAddModList[schReqIdx].offset;
+               break;
+            case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sym6or7:
+               schReqRsrc->periodicityAndOffset->choice.sym6or7 = schReqDb->schedAddModList[schReqIdx].offset;
+               break;
+            case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl1:
+               schReqRsrc->periodicityAndOffset->choice.sl1 = schReqDb->schedAddModList[schReqIdx].offset;
+               break;
+            case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl2:
+               schReqRsrc->periodicityAndOffset->choice.sl2 = schReqDb->schedAddModList[schReqIdx].offset;
+               break;
+            case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl4:
+               schReqRsrc->periodicityAndOffset->choice.sl4 = schReqDb->schedAddModList[schReqIdx].offset;
+               break;
+            case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl5:
+               schReqRsrc->periodicityAndOffset->choice.sl5 = schReqDb->schedAddModList[schReqIdx].offset;
+               break;
+            case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl8:
+               schReqRsrc->periodicityAndOffset->choice.sl8 = schReqDb->schedAddModList[schReqIdx].offset;
+               break;
+            case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl10:
+               schReqRsrc->periodicityAndOffset->choice.sl10 = schReqDb->schedAddModList[schReqIdx].offset;
+               break;
+            case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl16:
+               schReqRsrc->periodicityAndOffset->choice.sl16 = schReqDb->schedAddModList[schReqIdx].offset;
+               break;
+            case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl20:
+               schReqRsrc->periodicityAndOffset->choice.sl20 = schReqDb->schedAddModList[schReqIdx].offset;
+               break;
+            case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl40:
+               schReqRsrc->periodicityAndOffset->choice.sl40 = schReqDb->schedAddModList[schReqIdx].offset;
+               break;
+            case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl80:
+               schReqRsrc->periodicityAndOffset->choice.sl80 = schReqDb->schedAddModList[schReqIdx].offset;
+               break;
+            case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl160:
+               schReqRsrc->periodicityAndOffset->choice.sl160 = schReqDb->schedAddModList[schReqIdx].offset;
+               break;
+            case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl320:
+               schReqRsrc->periodicityAndOffset->choice.sl320 = schReqDb->schedAddModList[schReqIdx].offset;
+               break;
+            case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl640:
+               schReqRsrc->periodicityAndOffset->choice.sl640 = schReqDb->schedAddModList[schReqIdx].offset;
+               break;
+         }
+      }
 
-   ulBwp->srs_Config->present = BWP_UplinkDedicated__srs_Config_PR_setup;
-   ulBwp->srs_Config->choice.setup = NULLP;
-   DU_ALLOC(ulBwp->srs_Config->choice.setup, sizeof(SRS_Config_t));
-   if(!ulBwp->srs_Config->choice.setup)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildInitialUlBWP");
-      return RFAILED;
-   }
+      if(schReqDb->schedAddModList[schReqIdx].resrc)
+      {
+         schReqRsrc->resource = NULLP;
+         DU_ALLOC(schReqRsrc->resource, sizeof(PUCCH_ResourceId_t));
+         if(schReqRsrc->resource == NULLP)
+         {
+            DU_LOG("\nERROR  --> DU APP: Memory allocation failed in BuildPucchSchReqAddModList");
+            return RFAILED;
+         }
+         *(schReqRsrc->resource) = schReqDb->schedAddModList[schReqIdx].resrc;
 
-   if(BuildBWPUlDedSrsCfg(ulBwp->srs_Config->choice.setup) != ROK)
-   {
-      return RFAILED;   
+      }
    }
-
-   ulBwp->beamFailureRecoveryConfig = NULLP;
-
    return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Builds UL config
+ * @brief Builds PUCCH multi csi resource list
+ *
  * @details
  *
- *    Function : BuildUlCfg 
+ *    Function : BuildPucchMultiCsiRsrcList
  *
- *    Functionality: Builds UL config in spCellCfgDed
+ *    Functionality:
+ *      Builds PUCCH multi csi resource list
  *
- * @params[in] UplinkConfig_t *ulCfg
+ * @params[in] : PucchMultiCsiCfg *multiCsiDb
+ *               struct PUCCH_Config__multi_CSI_PUCCH_ResourceList  *multiCsiRsrcList
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildUlCfg(UplinkConfig_t *ulCfg)
+uint8_t BuildPucchMultiCsiRsrcList(PucchMultiCsiCfg *multiCsiDb, struct PUCCH_Config__multi_CSI_PUCCH_ResourceList  *multiCsiRsrcList)
 {
-   ulCfg->initialUplinkBWP = NULLP;
-   DU_ALLOC(ulCfg->initialUplinkBWP, sizeof(BWP_UplinkDedicated_t));
-   if(!ulCfg->initialUplinkBWP)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory Allocation failed in BuildUlCfg");
-      return RFAILED;
-   }
+   uint8_t elementCnt = 0, rsrcIdx = 0;
 
-   if(BuildInitialUlBWP(ulCfg->initialUplinkBWP) != ROK)
+   elementCnt = multiCsiDb->multiCsiResrcListCount;
+   multiCsiRsrcList->list.count = elementCnt;
+   multiCsiRsrcList->list.size = elementCnt * sizeof(PUCCH_ResourceId_t *);
+   multiCsiRsrcList->list.array = NULLP;
+   DU_ALLOC(multiCsiRsrcList->list.array, multiCsiRsrcList->list.size);
+   if(multiCsiRsrcList->list.array == NULLP)
    {
+      DU_LOG("\nERROR  --> DU APP: Memory allocation failed in BuildPucchMultiCsiRsrcList");
       return RFAILED;
    }
 
-   ulCfg->uplinkBWP_ToReleaseList = NULLP;
-   ulCfg->uplinkBWP_ToAddModList = NULLP;
-   ulCfg->firstActiveUplinkBWP_Id = NULLP;
-   DU_ALLOC(ulCfg->firstActiveUplinkBWP_Id, sizeof(BWP_Id_t));
-   if(!ulCfg->firstActiveUplinkBWP_Id)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory Allocation failed in BuildUlCfg");
-      return RFAILED;
-   }
-   *(ulCfg->firstActiveUplinkBWP_Id) = ACTIVE_UL_BWP_ID;
-
-   ulCfg->pusch_ServingCellConfig = NULLP;
-   DU_ALLOC(ulCfg->pusch_ServingCellConfig, \
-        sizeof(struct UplinkConfig__pusch_ServingCellConfig));
-   if(!ulCfg->pusch_ServingCellConfig)
+   for(rsrcIdx = 0; rsrcIdx<multiCsiRsrcList->list.count; rsrcIdx++)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory Allocation failed in BuildUlCfg");
-      return RFAILED;
+      DU_ALLOC(multiCsiRsrcList->list.array[rsrcIdx], sizeof(PUCCH_ResourceId_t));
+      if(multiCsiRsrcList->list.array[rsrcIdx] == NULLP)
+      {
+         DU_LOG("\nERROR  --> DU APP: Memory allocation failed in BuildPucchMultiCsiRsrcList");
+         return RFAILED;
+      }
    }
 
-   if(BuildPuschSrvCellCfg(ulCfg->pusch_ServingCellConfig) != ROK)
+   for(rsrcIdx = 0; rsrcIdx<multiCsiRsrcList->list.count; rsrcIdx++)
    {
-      return RFAILED;
+      *(multiCsiRsrcList->list.array[rsrcIdx]) = multiCsiDb->multiCsiResrcList[rsrcIdx];
    }
-
-   ulCfg->carrierSwitching = NULLP;
-   ulCfg->ext1 = NULLP;
    return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Builds PDSCH serving cell config
+ * @brief Builds DL data -to- Ul Ack list
+ *
  * @details
  *
- *    Function : BuildPdschSrvCellCfg
+ *    Function : BuildDlDataToUlAckList
  *
- *    Functionality: Builds PDSCH serving cell config in spCellCfgDed
+ *    Functionality: Builds DL data -to- Ul Ack list
  *
- * @params[in] struct ServingCellConfig__pdsch_ServingCellConfig *pdschCfg 
+ * @params[in] : PucchDlDataToUlAck *dlDataToUlAckDb
+ *               struct PUCCH_Config__dl_DataToUL_ACK * dlDataToUlACKList
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildPdschSrvCellCfg(struct ServingCellConfig__pdsch_ServingCellConfig *pdschCfg)
+uint8_t BuildDlDataToUlAckList(PucchDlDataToUlAck *dlDataToUlAckDb, struct PUCCH_Config__dl_DataToUL_ACK * dlDataToUlACKList)
 {
-   pdschCfg->present =  ServingCellConfig__pdsch_ServingCellConfig_PR_setup;
-   pdschCfg->choice.setup = NULLP;
-   DU_ALLOC(pdschCfg->choice.setup, sizeof( struct PDSCH_ServingCellConfig));
-   if(!pdschCfg->choice.setup)
+   uint8_t elementCnt = 0, arrIdx = 0;
+
+   if(dlDataToUlAckDb == NULLP)
+      elementCnt = 2;
+   else
+      elementCnt = dlDataToUlAckDb->dlDataToUlAckListCount;
+
+   dlDataToUlACKList->list.count = elementCnt;
+   dlDataToUlACKList->list.size = elementCnt * sizeof(long *);
+   DU_ALLOC(dlDataToUlACKList->list.array, dlDataToUlACKList->list.size);
+   if(dlDataToUlACKList->list.array == NULLP)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschSrvCellCfg");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDlDataToUlAckList");
       return RFAILED;
-   }
+   }   
 
-   pdschCfg->choice.setup->codeBlockGroupTransmission = NULLP;
-   pdschCfg->choice.setup->xOverhead = NULLP;
-   pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH = NULLP;
-   DU_ALLOC(pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH, sizeof(long));
-   if(!pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH)
+   for(arrIdx = 0; arrIdx <  dlDataToUlACKList->list.count; arrIdx++)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschSrvCellCfg");
-      return RFAILED;
+      DU_ALLOC(dlDataToUlACKList->list.array[arrIdx], sizeof(long));
+      if(dlDataToUlACKList->list.array[arrIdx] == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDlDataToUlAckList");
+         return RFAILED;
+      }   
    }
-   *(pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH)= PDSCH_NUM_HARQ_PROC;
-   pdschCfg->choice.setup->pucch_Cell = NULLP;
-   pdschCfg->choice.setup->ext1 = NULLP;
 
+   if(dlDataToUlAckDb == NULLP)
+   {
+      arrIdx = 0;
+      *(dlDataToUlACKList->list.array[arrIdx++]) = 1;
+      *(dlDataToUlACKList->list.array[arrIdx]) = 2;
+   }
+   else
+   {
+      for(arrIdx = 0; arrIdx <  dlDataToUlACKList->list.count; arrIdx++)
+      {
+         *(dlDataToUlACKList->list.array[arrIdx]) = dlDataToUlAckDb->dlDataToUlAckList[arrIdx];
+      }
+   }
    return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Builds CSI Meas config
- * @details
- *
- *    Function : BuildCsiMeasCfg 
- *
- *    Functionality: Builds CSI Meas config in spCellCfgDed
- *
- * @params[in] struct ServingCellConfig__csi_MeasConfig *csiMeasCfg
- *
- * @return ROK     - success
- *         RFAILED - failure
- *
- * ****************************************************************/
-uint8_t BuildCsiMeasCfg(struct ServingCellConfig__csi_MeasConfig *csiMeasCfg)
-{
-
-   return ROK;
-}
-
-/*******************************************************************
+ * @brief Builds BWP UL dedicated PUCCH Config
  *
- * @brief Builds Spcell config dedicated
  * @details
  *
- *    Function : BuildSpCellCfgDed
+ *    Function : BuildBWPUlDedPucchCfg
  *
- *    Functionality: Builds sp cell config dedicated in spCellCfg
+ *    Functionality:
+ *      Builds BWP UL dedicated PUCCH Config
  *
- * @params[in] ServingCellConfig_t srvCellCfg
+ * @params[in] : PUCCH_Config_t *pucchCfg
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildSpCellCfgDed(ServingCellConfig_t *srvCellCfg)
+uint8_t BuildBWPUlDedPucchCfg(PucchCfg *pucchCfgDb, PUCCH_Config_t *pucchCfg)
 {
-   srvCellCfg->tdd_UL_DL_ConfigurationDedicated = NULLP;
-   DU_ALLOC(srvCellCfg->tdd_UL_DL_ConfigurationDedicated, sizeof(TDD_UL_DL_ConfigDedicated_t));
-   if(!srvCellCfg->tdd_UL_DL_ConfigurationDedicated)
+   PucchResrcSetCfg *rsrcSetCfgDb = NULLP;
+   PucchResrcCfg *rsrcCfgDb = NULLP;
+   PucchFormatCfg *format1Db = NULLP;
+   PucchFormatCfg *format2Db = NULLP;
+   PucchFormatCfg *format3Db = NULLP;
+   PucchFormatCfg *format4Db = NULLP;
+   PucchSchedReqCfg *schReqDb = NULLP;   
+   PucchMultiCsiCfg  *multiCsiDb = NULLP;
+   PucchDlDataToUlAck *dlDataToUlAckDb = NULLP;
+
+   if(pucchCfgDb)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
-      return RFAILED;
+      rsrcSetCfgDb = pucchCfgDb->resrcSet;
+      rsrcCfgDb = pucchCfgDb->resrc;
+      format1Db = pucchCfgDb->format1;
+      format2Db = pucchCfgDb->format2;
+      format3Db = pucchCfgDb->format3;
+      format4Db = pucchCfgDb->format4;
+      schReqDb = pucchCfgDb->schedReq;
+      multiCsiDb = pucchCfgDb->multiCsiCfg;
+      dlDataToUlAckDb = pucchCfgDb->dlDataToUlAck;
    }
 
-   srvCellCfg->initialDownlinkBWP = NULLP;
-   DU_ALLOC(srvCellCfg->initialDownlinkBWP, sizeof(BWP_DownlinkDedicated_t));
-   if(!srvCellCfg->initialDownlinkBWP)
+   /* RESOURCE SET */
+   DU_ALLOC(pucchCfg->resourceSetToAddModList, sizeof(struct PUCCH_Config__resourceSetToAddModList));
+   if(pucchCfg->resourceSetToAddModList == NULL)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
       return RFAILED;
    }
 
-   if(BuildInitialDlBWP(srvCellCfg->initialDownlinkBWP) != ROK)
+   if(BuildPucchRsrcSetAddModList(rsrcSetCfgDb, pucchCfg->resourceSetToAddModList) != ROK)
    {
-      DU_LOG("\nERROR  -->  F1AP : BuildInitialDlBWP failed");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
       return RFAILED;
    }
-   srvCellCfg->downlinkBWP_ToReleaseList = NULLP;
-   srvCellCfg->downlinkBWP_ToAddModList = NULLP;
 
-   srvCellCfg->firstActiveDownlinkBWP_Id = NULLP;
-   DU_ALLOC(srvCellCfg->firstActiveDownlinkBWP_Id, sizeof(long));
-   if(!srvCellCfg->firstActiveDownlinkBWP_Id)
+   /* PUCCH RESOURCE */
+   DU_ALLOC(pucchCfg->resourceToAddModList, sizeof(struct PUCCH_Config__resourceToAddModList));
+   if(pucchCfg->resourceToAddModList == NULLP)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
       return RFAILED;
    }
-   *(srvCellCfg->firstActiveDownlinkBWP_Id) = ACTIVE_DL_BWP_ID;
-
-   srvCellCfg->bwp_InactivityTimer = NULLP;
 
-   srvCellCfg->defaultDownlinkBWP_Id = NULLP;
-   DU_ALLOC(srvCellCfg->defaultDownlinkBWP_Id, sizeof(long));
-   if(!srvCellCfg->defaultDownlinkBWP_Id)
+   if(BuildPucchRsrcAddModList(rsrcCfgDb, pucchCfg->resourceToAddModList) != ROK)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
       return RFAILED;
    }
-   *(srvCellCfg->defaultDownlinkBWP_Id) = ACTIVE_DL_BWP_ID;
 
-   srvCellCfg->uplinkConfig = NULLP;
-   DU_ALLOC(srvCellCfg->uplinkConfig, sizeof(UplinkConfig_t));
-   if(!srvCellCfg->uplinkConfig)
+   /* PUCCH Format 1 */
+   DU_ALLOC(pucchCfg->format1, sizeof(struct PUCCH_Config__format1));
+   if(pucchCfg->format1 == NULLP)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
       return RFAILED;
    }
-
-   if(BuildUlCfg(srvCellCfg->uplinkConfig) != ROK)
+   
+   pucchCfg->format1->present = PUCCH_Config__format1_PR_setup;
+   DU_ALLOC(pucchCfg->format1->choice.setup, sizeof(PUCCH_FormatConfig_t));
+   if(pucchCfg->format1->choice.setup == NULLP)
    {
-      DU_LOG("\nERROR  -->  F1AP : BuildUlCfg failed");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
       return RFAILED;
    }
-   srvCellCfg->supplementaryUplink = NULLP;
-   srvCellCfg->pdcch_ServingCellConfig = NULLP;
 
-   srvCellCfg->pdsch_ServingCellConfig = NULLP;
-   DU_ALLOC(srvCellCfg->pdsch_ServingCellConfig, sizeof(struct ServingCellConfig__pdsch_ServingCellConfig));
-   if(!srvCellCfg->pdsch_ServingCellConfig)
+   if(BuildPucchFormat(format1Db, pucchCfg->format1->choice.setup) != ROK)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
       return RFAILED;
    }
 
-   if(BuildPdschSrvCellCfg(srvCellCfg->pdsch_ServingCellConfig) != ROK)
+   /* PUCCH Format 2 */
+   if(format2Db)
    {
-      DU_LOG("\nERROR  -->  F1AP : BuildPdschSrvCellCfg failed");
-      return RFAILED;
-   }
+      DU_ALLOC(pucchCfg->format2, sizeof(struct PUCCH_Config__format2));
+      if(pucchCfg->format2 == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+         return RFAILED;
+      }
 
-   srvCellCfg->csi_MeasConfig = NULLP;
-#if 0
-   DU_ALLOC(srvCellCfg->csi_MeasConfig, sizeof(struct  ServingCellConfig__csi_MeasConfig))
-      if(!srvCellCfg->csi_MeasConfig)
+      pucchCfg->format2->present = PUCCH_Config__format2_PR_setup;
+      DU_ALLOC(pucchCfg->format2->choice.setup, sizeof(PUCCH_FormatConfig_t));
+      if(pucchCfg->format2->choice.setup == NULLP)
       {
-        DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
-        return RFAILED;
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+         return RFAILED;
       }
 
-   if(BuildCsiMeasCfg(srvCellCfg->csi_MeasConfig) != ROK)
+      if(BuildPucchFormat(format2Db, pucchCfg->format2->choice.setup) != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+         return RFAILED;
+      }
+   }
+
+   /* PUCCH Format 3 */
+   if(format3Db)
    {
-      DU_LOG("\nF1AP : BuildCsiMeasCfg failed");
-      return RFAILED;
+      DU_ALLOC(pucchCfg->format3, sizeof(struct PUCCH_Config__format3));
+      if(pucchCfg->format3 == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+         return RFAILED;
+      }
+
+      pucchCfg->format3->present = PUCCH_Config__format3_PR_setup;
+      DU_ALLOC(pucchCfg->format3->choice.setup, sizeof(PUCCH_FormatConfig_t));
+      if(pucchCfg->format3->choice.setup == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+         return RFAILED;
+      }
+
+      if(BuildPucchFormat(format3Db, pucchCfg->format3->choice.setup) != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+         return RFAILED;
+      }
    }
-#endif
-   srvCellCfg->sCellDeactivationTimer = NULLP;
-   srvCellCfg->crossCarrierSchedulingConfig = NULLP;
-   srvCellCfg->tag_Id = TAG_ID;
-   srvCellCfg->dummy = NULLP;
-   srvCellCfg->pathlossReferenceLinking = NULLP;
-   srvCellCfg->servingCellMO = NULLP;
-   srvCellCfg->ext1 = NULLP;
 
-   return ROK;
-}
-/*******************************************************************
- *
- * @brief Builds Spcell config 
- *
- * @details
- *
- *    Function : BuildSpCellCfg 
- *
- *    Functionality: Builds sp cell config in DuToCuRrcContainer
- *
- * @params[in] SpCellConfig_t spCellCfg
- *
- * @return ROK     - success
- *         RFAILED - failure
- *
- * ****************************************************************/
-uint8_t BuildSpCellCfg(SpCellConfig_t *spCellCfg)
-{
+   /* PUCCH Format 4 */
+   if(format4Db)
+   {
+      DU_ALLOC(pucchCfg->format4, sizeof(struct PUCCH_Config__format4));
+      if(pucchCfg->format4 == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+         return RFAILED;
+      }
 
-   spCellCfg->servCellIndex = NULLP;
-   DU_ALLOC(spCellCfg->servCellIndex, sizeof(long));
-   if(!spCellCfg->servCellIndex)
+      pucchCfg->format4->present = PUCCH_Config__format4_PR_setup;
+      DU_ALLOC(pucchCfg->format4->choice.setup, sizeof(PUCCH_FormatConfig_t));
+      if(pucchCfg->format4->choice.setup == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+         return RFAILED;
+      }
+
+      if(BuildPucchFormat(format4Db, pucchCfg->format4->choice.setup) != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+         return RFAILED;
+      }
+   }
+
+   /* Scheduling Request */
+   if(schReqDb && (schReqDb->schedAddModListCount != 0))
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfg");
-      return RFAILED;
+      pucchCfg->schedulingRequestResourceToAddModList = NULLP;
+      DU_ALLOC(pucchCfg->schedulingRequestResourceToAddModList, sizeof(struct PUCCH_Config__schedulingRequestResourceToAddModList));
+      if(pucchCfg->schedulingRequestResourceToAddModList == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+         return RFAILED;
+      }
+
+      if(BuildPucchSchReqAddModList(schReqDb, pucchCfg->schedulingRequestResourceToAddModList) != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+         return RFAILED;
+      }
    }
-   *(spCellCfg->servCellIndex) = SERV_CELL_IDX;
 
-   spCellCfg->reconfigurationWithSync = NULLP;
-   spCellCfg->rlf_TimersAndConstants = NULLP;
-   spCellCfg->rlmInSyncOutOfSyncThreshold = NULLP;
-   DU_ALLOC(spCellCfg->rlmInSyncOutOfSyncThreshold, sizeof(long));
-   if(!spCellCfg->rlmInSyncOutOfSyncThreshold)
+   /* Multi CSI */
+   if(multiCsiDb && (multiCsiDb->multiCsiResrcListCount != 0))
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfg");
-      return RFAILED;
+      pucchCfg->multi_CSI_PUCCH_ResourceList == NULLP;
+      DU_ALLOC(pucchCfg->multi_CSI_PUCCH_ResourceList, sizeof(struct PUCCH_Config__multi_CSI_PUCCH_ResourceList));
+      if(pucchCfg->multi_CSI_PUCCH_ResourceList == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+         return RFAILED;
+      }
+
+      if(BuildPucchMultiCsiRsrcList(multiCsiDb, pucchCfg->multi_CSI_PUCCH_ResourceList) != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+         return RFAILED;
+      }
    }
-   *(spCellCfg->rlmInSyncOutOfSyncThreshold) = RLM_SYNC_OUT_SYNC_THRESHOLD;
 
-   spCellCfg->spCellConfigDedicated = NULLP;
-   DU_ALLOC(spCellCfg->spCellConfigDedicated, sizeof(ServingCellConfig_t));
-   if(!spCellCfg->spCellConfigDedicated)
+   /* DL DATA TO UL ACK */
+   DU_ALLOC(pucchCfg->dl_DataToUL_ACK, sizeof(struct PUCCH_Config__dl_DataToUL_ACK));
+   if(pucchCfg->dl_DataToUL_ACK == NULLP)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfg");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
       return RFAILED;
    }
-   if(BuildSpCellCfgDed(spCellCfg->spCellConfigDedicated) != ROK)
+
+   if(BuildDlDataToUlAckList(dlDataToUlAckDb, pucchCfg->dl_DataToUL_ACK) != ROK)
    {
-      DU_LOG("\nERROR  -->  F1AP : BuildSpCellCfgDed failed");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
       return RFAILED;
    }
+   
+   /* TODO : spatial relation info add/mod list and power control*/
+
    return ROK;
 }
+
 /*******************************************************************
  *
- * @brief Builds Phy cell group config 
+ * @brief Fills SRS resource to add/modify list 
  *
  * @details
  *
- *    Function : BuildPhyCellGrpCfg 
- *
- *    Functionality: Builds Phy cell group config in DuToCuRrcContainer
+ *    Function : BuildSrsRsrcAddModList
  *
- * @params[in] PhysicalCellGroupConfig_t *phyCellGrpCfg 
+ *    Functionality: Fills SRS resource to add/modify list
  *
+ * @params[in] 
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildPhyCellGrpCfg(PhysicalCellGroupConfig_t *phyCellGrpCfg)
+uint8_t BuildSrsRsrcAddModList(struct SRS_Config__srs_ResourceToAddModList *resourceList)
 {
-   phyCellGrpCfg->harq_ACK_SpatialBundlingPUCCH = NULLP;
-   phyCellGrpCfg->harq_ACK_SpatialBundlingPUSCH = NULLP;
+   uint8_t   elementCnt;
+   uint8_t   rsrcIdx;
 
-   phyCellGrpCfg->p_NR_FR1 = NULLP;
-   DU_ALLOC(phyCellGrpCfg->p_NR_FR1, sizeof(long));
-   if(!phyCellGrpCfg->p_NR_FR1)
+   elementCnt = 1;
+   resourceList->list.count = elementCnt;
+   resourceList->list.size = elementCnt * sizeof(SRS_Resource_t *);
+   resourceList->list.array = NULLP;
+   DU_ALLOC(resourceList->list.array, resourceList->list.size);
+   if(!resourceList->list.array)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildPhyCellGrpCfg");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSrsRsrcAddModList");
       return RFAILED;
    }
-   *(phyCellGrpCfg->p_NR_FR1)             = P_NR_FR1;
-   phyCellGrpCfg->pdsch_HARQ_ACK_Codebook = PDSCH_HARQ_ACK_CODEBOOK;
-   phyCellGrpCfg->tpc_SRS_RNTI = NULLP;
-   phyCellGrpCfg->tpc_PUCCH_RNTI = NULLP;
-   phyCellGrpCfg->tpc_PUSCH_RNTI = NULLP;
-   phyCellGrpCfg->sp_CSI_RNTI = NULLP;
-   phyCellGrpCfg->cs_RNTI = NULLP;
-   phyCellGrpCfg->ext1 = NULLP;
-   phyCellGrpCfg->ext2 = NULLP;
+
+   for(rsrcIdx = 0; rsrcIdx < resourceList->list.count; rsrcIdx++)
+   {
+      DU_ALLOC(resourceList->list.array[rsrcIdx], sizeof(SRS_Resource_t));
+      if(!resourceList->list.array[rsrcIdx])
+      {
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSrsRsrcAddModList");
+        return RFAILED;
+      }
+   }
+
+   rsrcIdx = 0;
+   resourceList->list.array[rsrcIdx]->srs_ResourceId = SRS_RSRC_ID;
+   resourceList->list.array[rsrcIdx]->nrofSRS_Ports = SRS_Resource__nrofSRS_Ports_port1;
+   resourceList->list.array[rsrcIdx]->transmissionComb.present = SRS_Resource__transmissionComb_PR_n2;
+
+   resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2 = NULLP;
+   DU_ALLOC(resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2, \
+        sizeof(struct SRS_Resource__transmissionComb__n2));
+   if(!resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSrsRsrcAddModList");
+      return RFAILED;
+   }
+   resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2->combOffset_n2\
+      = SRS_COMB_OFFSET_N2;
+   resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2->cyclicShift_n2\
+      = SRS_CYCLIC_SHIFT_N2;
+
+   resourceList->list.array[rsrcIdx]->resourceMapping.startPosition = \
+                                                                     PUSCH_START_SYMBOL;
+   resourceList->list.array[rsrcIdx]->resourceMapping.nrofSymbols =  \
+                                                                    SRS_Resource__resourceMapping__nrofSymbols_n1;
+   resourceList->list.array[rsrcIdx]->resourceMapping.repetitionFactor = \
+                                                                        SRS_Resource__resourceMapping__repetitionFactor_n1;
+
+   resourceList->list.array[rsrcIdx]->freqDomainPosition = SRS_FREQ_DOM_POS;
+   resourceList->list.array[rsrcIdx]->freqDomainShift = SRS_FREQ_DOM_SHIFT;
+   resourceList->list.array[rsrcIdx]->freqHopping.c_SRS = C_SRS;
+   resourceList->list.array[rsrcIdx]->freqHopping.b_SRS = B_SRS;
+   resourceList->list.array[rsrcIdx]->freqHopping.b_hop = B_HOP;
+   resourceList->list.array[rsrcIdx]->groupOrSequenceHopping = \
+                                                              SRS_Resource__groupOrSequenceHopping_neither;
+
+   /* Setting resource type to aperiodic for intergration purposes */
+   resourceList->list.array[rsrcIdx]->resourceType.present = \
+                                                            SRS_Resource__resourceType_PR_aperiodic;
+   resourceList->list.array[rsrcIdx]->resourceType.choice.aperiodic = NULLP;
+   DU_ALLOC(resourceList->list.array[rsrcIdx]->resourceType.choice.aperiodic,
+        sizeof(struct SRS_Resource__resourceType__aperiodic));
+   if(!resourceList->list.array[rsrcIdx]->resourceType.choice.aperiodic)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSrsRsrcAddModList");
+      return RFAILED;
+   }
+   resourceList->list.array[rsrcIdx]->sequenceId = SRS_SEQ_ID;
 
    return ROK;
 }
+
 /*******************************************************************
  *
- * @brief Builds Mac cell group config 
+ * @brief Build SRS resource set Add/mod list
  *
  * @details
  *
- *    Function : BuildMacCellGrpCfg 
- *
- *    Functionality: Builds Mac cell group config in DuToCuRrcContainer
+ *    Function : BuildSrsRsrcSetAddModList
  *
- * @params[in] MAC_CellGroupConfig_t *macCellGrpCfg
+ *    Functionality: Build SRS resource set Add/mod list
  *
+ * @params[in] 
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildMacCellGrpCfg(MAC_CellGroupConfig_t *macCellGrpCfg)
+   uint8_t BuildSrsRsrcSetAddModList
+(
+ struct SRS_Config__srs_ResourceSetToAddModList *rsrcSetList
+ )
 {
-   macCellGrpCfg->drx_Config = NULLP;
-   macCellGrpCfg->schedulingRequestConfig = NULLP;
-   DU_ALLOC(macCellGrpCfg->schedulingRequestConfig, sizeof(struct SchedulingRequestConfig));
-   if(!macCellGrpCfg->schedulingRequestConfig)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacCellGrpCfg");
-      return RFAILED;
-   }
+   uint8_t  elementCnt;
+   uint8_t  rSetIdx;
+   uint8_t  rsrcIdx;
+   struct SRS_ResourceSet__srs_ResourceIdList *rsrcIdList;
 
-   if(BuildSchedulingReqConfig(macCellGrpCfg->schedulingRequestConfig) != ROK)
+   elementCnt = 1;
+   rsrcSetList->list.count = elementCnt;
+   rsrcSetList->list.size = elementCnt * sizeof(SRS_ResourceSet_t *);
+   rsrcSetList->list.array = NULLP;
+   DU_ALLOC(rsrcSetList->list.array, rsrcSetList->list.size);
+   if(!rsrcSetList->list.array)
    {
-      DU_LOG("\nERROR  -->  F1AP : BuildSchedulingReqConfig failed");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSrsRsrcSetAddModList");
       return RFAILED;
    }
 
-   macCellGrpCfg->bsr_Config = NULLP;
-   DU_ALLOC(macCellGrpCfg->bsr_Config, sizeof(struct BSR_Config));
-   if(!macCellGrpCfg->bsr_Config)
+   for(rSetIdx = 0; rSetIdx < rsrcSetList->list.count; rSetIdx++)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacCellGrpCfg");
-      return RFAILED;
+      DU_ALLOC(rsrcSetList->list.array[rSetIdx], sizeof(SRS_ResourceSet_t));
+      if(!rsrcSetList->list.array[rSetIdx])
+      {
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSrsRsrcSetAddModList");
+        return RFAILED;
+      }
    }
 
-   if(BuildBsrConfig(macCellGrpCfg->bsr_Config) != ROK)
-   {
-      DU_LOG("\nERROR  -->  F1AP : BuildBsrConfig failed");
-      return RFAILED;
-   }
+   rSetIdx = 0;
+   rsrcSetList->list.array[rSetIdx]->srs_ResourceSetId = SRS_RSET_ID;
 
-   macCellGrpCfg->tag_Config = NULLP;
-   DU_ALLOC(macCellGrpCfg->tag_Config, sizeof(struct TAG_Config));
-   if(!macCellGrpCfg->tag_Config)
+   /* Fill Resource Id list in resource set */
+   rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList = NULLP;
+   DU_ALLOC(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList,\
+        sizeof(struct SRS_ResourceSet__srs_ResourceIdList));
+   if(!rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacCellGrpCfg");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSrsRsrcSetAddModList");
       return RFAILED;
    }
 
-   if(BuildTagConfig(macCellGrpCfg->tag_Config) != ROK)
+   elementCnt = 1;
+   rsrcIdList = rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList;
+   rsrcIdList->list.count = elementCnt;
+   rsrcIdList->list.size = elementCnt * sizeof(SRS_ResourceId_t *);
+   rsrcIdList->list.array = NULLP;
+   DU_ALLOC(rsrcIdList->list.array, rsrcIdList->list.size);
+   if(!rsrcIdList->list.array)
    {
-      DU_LOG("\nERROR  -->  F1AP : BuildTagConfig failed");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSrsRsrcSetAddModList");
       return RFAILED;
    }
 
-   macCellGrpCfg->phr_Config = NULLP;
-   DU_ALLOC(macCellGrpCfg->phr_Config, sizeof(struct MAC_CellGroupConfig__phr_Config));
-   if(!macCellGrpCfg->phr_Config)
+   for(rsrcIdx = 0; rsrcIdx < rsrcIdList->list.count; rsrcIdx++)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacCellGrpCfg");
-      return RFAILED;
+      DU_ALLOC(rsrcIdList->list.array[rsrcIdx], sizeof(SRS_ResourceId_t));
+      if(!rsrcIdList->list.array[rsrcIdx])
+      {
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSrsRsrcSetAddModList");
+        return RFAILED;
+      }
    }
 
-   if(BuildPhrConfig(macCellGrpCfg->phr_Config) != ROK)
+   rsrcIdx = 0;
+   *rsrcIdList->list.array[rsrcIdx] = SRS_RSRC_ID;
+
+   /* Fill resource type */
+   rsrcSetList->list.array[rSetIdx]->resourceType.present = \
+                                                           SRS_ResourceSet__resourceType_PR_aperiodic;
+
+   rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic = NULLP;
+   DU_ALLOC(rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic, \
+        sizeof(struct SRS_ResourceSet__resourceType__aperiodic));
+   if(!rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic)
    {
-      DU_LOG("\nERROR  -->  F1AP : BuildPhrConfig failed");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSrsRsrcSetAddModList");
       return RFAILED;
    }
+   rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic->aperiodicSRS_ResourceTrigger \
+      = APERIODIC_SRS_RESRC_TRIGGER;
 
-   macCellGrpCfg->skipUplinkTxDynamic = false;
-   macCellGrpCfg->ext1 = NULLP;
+   /* TODO : Fill values for below IEs as expected by Viavi */
+   rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic->csi_RS = NULLP;
+   rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic->slotOffset = NULLP;
 
-   return ROK;
+
+   rsrcSetList->list.array[rSetIdx]->usage = SRS_ResourceSet__usage_codebook;
+   rsrcSetList->list.array[rSetIdx]->alpha = NULLP;
+   rsrcSetList->list.array[rSetIdx]->p0 = NULLP;
+   rsrcSetList->list.array[rSetIdx]->pathlossReferenceRS = NULLP;
+   rsrcSetList->list.array[rSetIdx]->srs_PowerControlAdjustmentStates = NULLP;
+
+   return ROK;
 }
+
 /*******************************************************************
  *
- * @brief Frees memeory allocated for SearchSpcToAddModList
+ * @brief Builds BWP UL dedicated SRS Config
  *
  * @details
  *
- *    Function : FreeSearchSpcToAddModList
- *
- *    Functionality: Deallocating memory of SearchSpcToAddModList
+ *    Function : BuildBWPUlDedSrsCfg
  *
- * @params[in] struct PDCCH_Config__searchSpacesToAddModList *searchSpcList
+ *    Functionality: Builds BWP UL dedicated SRS Config
  *
- * @return void
+ * @params[in] SRS Config 
+ * @return ROK     - success
+ *         RFAILED - failure
  *
4221 * ****************************************************************/
-void FreeSearchSpcToAddModList(struct PDCCH_Config__searchSpacesToAddModList *searchSpcList)
+ * ****************************************************************/
+uint8_t BuildBWPUlDedSrsCfg(SRS_Config_t *srsCfg)
 {
-   uint8_t idx1=0;
-   uint8_t idx2=0;
-   struct  SearchSpace *searchSpc=NULLP;
+   srsCfg->srs_ResourceSetToReleaseList = NULLP;
+   srsCfg->srs_ResourceSetToAddModList = NULLP;
+   DU_ALLOC(srsCfg->srs_ResourceSetToAddModList, \
+        sizeof(struct SRS_Config__srs_ResourceSetToAddModList));
+   if(!srsCfg->srs_ResourceSetToAddModList)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedSrsCfg");
+      return RFAILED;
+   }
+   if(BuildSrsRsrcSetAddModList(srsCfg->srs_ResourceSetToAddModList) != ROK)
+   {
+      return RFAILED;
+   }
 
-   if(searchSpcList->list.array)
+   srsCfg->srs_ResourceToReleaseList = NULLP;
+
+   /* Resource to Add/Modify list */
+   srsCfg->srs_ResourceToAddModList = NULLP;
+   DU_ALLOC(srsCfg->srs_ResourceToAddModList, \
+        sizeof(struct SRS_Config__srs_ResourceToAddModList));
+   if(!srsCfg->srs_ResourceToAddModList)
    {
-      if(searchSpcList->list.array[idx2])
-      {
-        searchSpc = searchSpcList->list.array[idx2];
-        if(searchSpc->controlResourceSetId)
-        {
-           if(searchSpc->monitoringSlotPeriodicityAndOffset)
-           {
-              if(searchSpc->monitoringSymbolsWithinSlot)
-              {
-                 if(searchSpc->monitoringSymbolsWithinSlot->buf)
-                 {
-                    if(searchSpc->nrofCandidates)
-                    {
-                       if(searchSpc->searchSpaceType)
-                       {
-                          DU_FREE(searchSpc->searchSpaceType->choice.ue_Specific,\
-                                sizeof(struct SearchSpace__searchSpaceType__ue_Specific));
-                          DU_FREE(searchSpc->searchSpaceType, sizeof(struct
-                                   SearchSpace__searchSpaceType));
-                       }
-                       DU_FREE(searchSpc->nrofCandidates,
-                             sizeof(struct SearchSpace__nrofCandidates));
-                    }
-                    DU_FREE(searchSpc->monitoringSymbolsWithinSlot->buf, \
-                          searchSpc->monitoringSymbolsWithinSlot->size);
-                 }
-                 DU_FREE(searchSpc->monitoringSymbolsWithinSlot,
-                       sizeof(BIT_STRING_t));
-              }
-              DU_FREE(searchSpc->monitoringSlotPeriodicityAndOffset, \
-                    sizeof(struct SearchSpace__monitoringSlotPeriodicityAndOffset));
-           }
-           DU_FREE(searchSpc->controlResourceSetId,
-                 sizeof(ControlResourceSetId_t));
-        }
-      }
-      for(idx1 = 0; idx1 < searchSpcList->list.count; idx1++)
-      {
-        DU_FREE(searchSpcList->list.array[idx1],
-              sizeof(struct SearchSpace));
-      }
-      DU_FREE(searchSpcList->list.array,searchSpcList->list.size);
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedSrsCfg");
+      return RFAILED;
    }
-}
-/*******************************************************************
- *
- * @brief Frees memory allocated for PdschTimeDomAllocList
- *
- * @details
- *
- *    Function : FreePdschTimeDomAllocList
- *
- *    Functionality: Deallocating memory of PdschTimeDomAllocList
- *
- * @params[in] struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList
- *
- * @return void
- *
- 4221 * ****************************************************************/
-void FreePdschTimeDomAllocList( struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList)
-{
-   uint8_t idx1=0;
 
-   if(timeDomAllocList->choice.setup)
+   if(BuildSrsRsrcAddModList(srsCfg->srs_ResourceToAddModList) != ROK)
    {
-      if(timeDomAllocList->choice.setup->list.array)
-      {
-        for(idx1 = 0; idx1 <timeDomAllocList->choice.setup->list.count ; idx1++)
-        {
-           DU_FREE(timeDomAllocList->choice.setup->list.array[idx1],
-                 sizeof(struct PDSCH_TimeDomainResourceAllocation));
-        }
-        DU_FREE(timeDomAllocList->choice.setup->list.array, \
-              timeDomAllocList->choice.setup->list.size);
-      }
-      DU_FREE(timeDomAllocList->choice.setup,\
-           sizeof(struct PDSCH_TimeDomainResourceAllocationList));
+      return RFAILED;
    }
+
+   srsCfg->tpc_Accumulation = NULLP;
+
+   return ROK;
 }
+
+
+
 /*******************************************************************
  *
- * @brief Frees memory allocated for PuschTimeDomAllocList
+ * @brief Builds Pusch Serving cell Config
  *
- *@details
+ * @details
  *
- *    Function : FreePuschTimeDomAllocList
+ *    Function : BuildPuschSrvCellCfg
  *
- *    Functionality: Deallocating memory of PuschTimeDomAllocList
+ *    Functionality: Builds Pusch Serving cell Config
  *
- * @params[in] PUSCH_Config_t *puschCfg
+ * @params[in] struct UplinkConfig__pusch_ServingCellConfig *puschCfg
  *
- * @return void
+ * @return ROK     - success
+ *         RFAILED - failure
  *
  * ****************************************************************/
-void FreePuschTimeDomAllocList(PUSCH_Config_t *puschCfg)
+uint8_t BuildPuschSrvCellCfg(struct UplinkConfig__pusch_ServingCellConfig *puschCfg)
 {
-   uint8_t idx1=0;
-   uint8_t idx2=0;
-   struct PUSCH_Config__pusch_TimeDomainAllocationList *timeDomAllocList_t=NULLP;
+   puschCfg->present = UplinkConfig__pusch_ServingCellConfig_PR_setup;
+   puschCfg->choice.setup = NULLP;
+   DU_ALLOC(puschCfg->choice.setup, sizeof(struct PUSCH_ServingCellConfig));
+   if(!puschCfg->choice.setup)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschSrvCellCfg");
+      return RFAILED;
+   }
 
-   if(puschCfg->pusch_TimeDomainAllocationList)
+   puschCfg->choice.setup->codeBlockGroupTransmission = NULLP;
+   puschCfg->choice.setup->rateMatching = NULLP;
+   puschCfg->choice.setup->xOverhead = NULLP;
+   puschCfg->choice.setup->ext1 = NULLP;
+   DU_ALLOC(puschCfg->choice.setup->ext1, sizeof(struct PUSCH_ServingCellConfig__ext1));
+   if(!puschCfg->choice.setup->ext1)
    {
-      timeDomAllocList_t=puschCfg->pusch_TimeDomainAllocationList;
-      if(timeDomAllocList_t->choice.setup)
-      {
-        if(timeDomAllocList_t->choice.setup->list.array)
-        {
-           DU_FREE(timeDomAllocList_t->choice.setup->list.array[idx2]->k2, sizeof(long));
-           for(idx1 = 0; idx1<timeDomAllocList_t->choice.setup->list.count; idx1++)
-           {
-              DU_FREE(timeDomAllocList_t->choice.setup->list.array[idx1],\
-                    sizeof(PUSCH_TimeDomainResourceAllocation_t));
-           }
-           DU_FREE(timeDomAllocList_t->choice.setup->list.array, \
-                 timeDomAllocList_t->choice.setup->list.size);
-        }
-        DU_FREE(timeDomAllocList_t->choice.setup, \
-              sizeof(struct PUSCH_TimeDomainResourceAllocationList));
-      }
-      DU_FREE(puschCfg->transformPrecoder, sizeof(long));
-      DU_FREE(puschCfg->pusch_TimeDomainAllocationList, \
-           sizeof(struct PUSCH_Config__pusch_TimeDomainAllocationList));
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschSrvCellCfg");
+      return RFAILED;
+   }
+
+   puschCfg->choice.setup->ext1->maxMIMO_Layers = NULLP;
+   DU_ALLOC(puschCfg->choice.setup->ext1->maxMIMO_Layers, sizeof(long));
+   if(!puschCfg->choice.setup->ext1->maxMIMO_Layers)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschSrvCellCfg");
+      return RFAILED;
    }
+   *(puschCfg->choice.setup->ext1->maxMIMO_Layers) = PUSCH_MAX_MIMO_LAYERS;
 
+   puschCfg->choice.setup->ext1->processingType2Enabled= NULLP;
+   DU_ALLOC(puschCfg->choice.setup->ext1->processingType2Enabled,sizeof(BOOLEAN_t));
+   if(!puschCfg->choice.setup->ext1->processingType2Enabled)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschSrvCellCfg");
+      return RFAILED;
+   }
+   *(puschCfg->choice.setup->ext1->processingType2Enabled) = PUSCH_PROCESS_TYPE2_ENABLED;
+   return ROK;
 }
+
 /*******************************************************************
  *
- * @brief Frees memory allocated for InitialUlBWP
+ * @brief Builds inital UL BWP
  *
  * @details
  *
- *    Function : FreeInitialUlBWP
+ *    Function : BuildInitialUlBWP
  *
- *    Functionality: Deallocating memory of InitialUlBWP
+ *    Functionality: Builds initial UL BWP
  *
  * @params[in] BWP_UplinkDedicated_t *ulBwp
- *
- * @return void
+ * @return ROK     - success
+ *         RFAILED - failure
  *
  * ****************************************************************/
-void FreeInitialUlBWP(BWP_UplinkDedicated_t *ulBwp)
+uint8_t BuildInitialUlBWP(InitialUlBwp *initUlBwp, BWP_UplinkDedicated_t *ulBwp)
 {
-   uint8_t  rSetIdx, rsrcIdx;
-   SRS_Config_t   *srsCfg = NULLP;
-   PUSCH_Config_t *puschCfg = NULLP;
-   struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA *dmrsUlCfg = NULLP;
-   struct SRS_Config__srs_ResourceSetToAddModList *rsrcSetList = NULLP;
-   struct SRS_ResourceSet__srs_ResourceIdList *rsrcIdList = NULLP;
-   struct SRS_Config__srs_ResourceToAddModList *resourceList = NULLP;
+   PucchCfg *pucchCfg = NULLP;
+   PuschCfg *puschCfg = NULLP;
 
-   if(ulBwp->pusch_Config)
+   if(initUlBwp)
    {
-      if(ulBwp->pusch_Config->choice.setup)
-      {
-        puschCfg=ulBwp->pusch_Config->choice.setup;
-        if(puschCfg->dataScramblingIdentityPUSCH)
-        {
-           if(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA)
-           {
-              FreePuschTimeDomAllocList(puschCfg);
-              dmrsUlCfg=puschCfg->dmrs_UplinkForPUSCH_MappingTypeA;
-              if(dmrsUlCfg->choice.setup)
-              {
-                 if(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition)
-                 {
-                    if(dmrsUlCfg->choice.setup->transformPrecodingDisabled)
-                    {
-                       DU_FREE(dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0,\
-                             sizeof(long));
-                       DU_FREE(dmrsUlCfg->choice.setup->transformPrecodingDisabled,
-                             sizeof(struct DMRS_UplinkConfig__transformPrecodingDisabled));
-                    }
-                    DU_FREE(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition,
-                          sizeof(long));
-                 }
-                 DU_FREE(dmrsUlCfg->choice.setup,sizeof(DMRS_UplinkConfig_t));
-              }
-              DU_FREE(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA, \
-                    sizeof(struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA));
-           }
-           DU_FREE(puschCfg->dataScramblingIdentityPUSCH, sizeof(long));
-        }
-        DU_FREE(ulBwp->pusch_Config->choice.setup, sizeof(PUSCH_Config_t));
-      }
-      DU_FREE(ulBwp->pusch_Config, sizeof(struct BWP_UplinkDedicated__pusch_Config));
+      if(initUlBwp->pucchPresent)
+         pucchCfg = &initUlBwp->pucchCfg;
+      if(initUlBwp->puschPresent)
+         puschCfg = &initUlBwp->puschCfg;
+   }
 
-      /* Free SRS-Config */
-      if(ulBwp->srs_Config)
-      {
-        if(ulBwp->srs_Config->choice.setup)
-        {
-           srsCfg = ulBwp->srs_Config->choice.setup;
+   ulBwp->pucch_Config = NULLP;
+   DU_ALLOC(ulBwp->pucch_Config, sizeof(struct BWP_UplinkDedicated__pucch_Config));
+   if(!ulBwp->pucch_Config)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildInitialUlBWP");
+      return RFAILED;
+   }
 
-           /* Free Resource Set to add/mod list */
-           if(srsCfg->srs_ResourceSetToAddModList)
-           {
-              rsrcSetList = srsCfg->srs_ResourceSetToAddModList;
-              if(rsrcSetList->list.array)
-              {
-                 rSetIdx = 0;
+   ulBwp->pucch_Config->present = BWP_UplinkDedicated__pucch_Config_PR_setup;
+   ulBwp->pucch_Config->choice.setup = NULLP;
+   DU_ALLOC(ulBwp->pucch_Config->choice.setup, sizeof(PUCCH_Config_t));
+   if(!ulBwp->pucch_Config->choice.setup)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildInitialUlBWP");
+      return RFAILED;
+   }
 
-                 /* Free SRS resource Id list in this SRS resource set */
-                 if(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList)
-                 {
-                    rsrcIdList = rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList;
+   if(BuildBWPUlDedPucchCfg(pucchCfg, ulBwp->pucch_Config->choice.setup) != ROK)
+   {
+      return RFAILED;
+   }
 
-                    if(rsrcIdList->list.array)
-                    {
-                       for(rsrcIdx = 0; rsrcIdx < rsrcIdList->list.count; rsrcIdx++)
-                       {
-                          DU_FREE(rsrcIdList->list.array[rsrcIdx], sizeof(SRS_ResourceId_t));
-                       }
-                       DU_FREE(rsrcIdList->list.array, rsrcIdList->list.size);
-                    }
-                    DU_FREE(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList,\
-                          sizeof(struct SRS_ResourceSet__srs_ResourceIdList));
-                 }
+   /* Fill BWP UL dedicated PUSCH config */
+   ulBwp->pusch_Config = NULLP;
+   DU_ALLOC(ulBwp->pusch_Config, sizeof(struct BWP_UplinkDedicated__pusch_Config));
+   if(!ulBwp->pusch_Config)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildInitialUlBWP");
+      return RFAILED;
+   }
 
-                 /* Free resource type info for this SRS resource set */
-                 DU_FREE(rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic, \
-                       sizeof(struct SRS_ResourceSet__resourceType__aperiodic));
+   ulBwp->pusch_Config->present = BWP_UplinkDedicated__pusch_Config_PR_setup;
+   ulBwp->pusch_Config->choice.setup = NULLP;
+   DU_ALLOC(ulBwp->pusch_Config->choice.setup, sizeof(PUSCH_Config_t));
+   if(!ulBwp->pusch_Config->choice.setup)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildInitialUlBWP");
+      return RFAILED;
+   }
 
-                 /* Free memory for each resource set */
-                 for(rSetIdx = 0; rSetIdx < rsrcSetList->list.count; rSetIdx++)
-                 {
-                    DU_FREE(rsrcSetList->list.array[rSetIdx], sizeof(SRS_ResourceSet_t));
-                 }
-                 DU_FREE(rsrcSetList->list.array, rsrcSetList->list.size); 
-              }
-              DU_FREE(srsCfg->srs_ResourceSetToAddModList, \
-                    sizeof(struct SRS_Config__srs_ResourceSetToAddModList));
-           }
+   if(BuildBWPUlDedPuschCfg(puschCfg, ulBwp->pusch_Config->choice.setup) != ROK)
+   {
+      return RFAILED;
+   }
 
-           /* Free resource to add/modd list */
-           if(srsCfg->srs_ResourceToAddModList)
-           {
-              resourceList = srsCfg->srs_ResourceToAddModList;
-              if(resourceList->list.array)
-              {
-                 rsrcIdx = 0;
-                 DU_FREE(resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2,\
-                       sizeof(struct SRS_Resource__transmissionComb__n2));
-                 DU_FREE(resourceList->list.array[rsrcIdx]->resourceType.choice.aperiodic,\
-                       sizeof(struct SRS_Resource__resourceType__aperiodic));
+   ulBwp->configuredGrantConfig = NULLP;
 
-                 for(rsrcIdx = 0; rsrcIdx < resourceList->list.count; rsrcIdx++)
-                 {
-                    DU_FREE(resourceList->list.array[rsrcIdx], sizeof(SRS_Resource_t));
-                 }
-                 DU_FREE(resourceList->list.array, resourceList->list.size);
-              }
-              DU_FREE(srsCfg->srs_ResourceToAddModList, \
-                    sizeof(struct SRS_Config__srs_ResourceToAddModList));
-           }
+   /* Fill BPW UL dedicated SRS config */
+   ulBwp->srs_Config = NULLP;
+   DU_ALLOC(ulBwp->srs_Config, sizeof(struct BWP_UplinkDedicated__srs_Config));
+   if(!ulBwp->srs_Config)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildInitialUlBWP");
+      return RFAILED;
+   }
 
-           DU_FREE(ulBwp->srs_Config->choice.setup, sizeof(SRS_Config_t));
-        }
-        DU_FREE(ulBwp->srs_Config, sizeof(struct BWP_UplinkDedicated__srs_Config));
-      }
+   ulBwp->srs_Config->present = BWP_UplinkDedicated__srs_Config_PR_setup;
+   ulBwp->srs_Config->choice.setup = NULLP;
+   DU_ALLOC(ulBwp->srs_Config->choice.setup, sizeof(SRS_Config_t));
+   if(!ulBwp->srs_Config->choice.setup)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildInitialUlBWP");
+      return RFAILED;
    }
-}      
+
+   if(BuildBWPUlDedSrsCfg(ulBwp->srs_Config->choice.setup) != ROK)
+   {
+      return RFAILED;   
+   }
+
+   ulBwp->beamFailureRecoveryConfig = NULLP;
+
+   return ROK;
+}
+
 /*******************************************************************
  *
- * @brief Frees memory allocated for initialUplinkBWP
- *
+ * @brief Builds UL config
  * @details
  *
- *    Function : FreeinitialUplinkBWP
+ *    Function : BuildUlCfg 
  *
- *    Functionality: Deallocating memory of initialUplinkBWP
+ *    Functionality: Builds UL config in spCellCfgDed
  *
  * @params[in] UplinkConfig_t *ulCfg
  *
- * @return void
- *         
+ * @return ROK     - success
+ *         RFAILED - failure
  *
  * ****************************************************************/
-void FreeinitialUplinkBWP(UplinkConfig_t *ulCfg)
+uint8_t BuildUlCfg(ServCellCfgInfo *servCellCfg, UplinkConfig_t *ulCfg)
 {
-   BWP_UplinkDedicated_t *ulBwp=NULLP; 
-   struct UplinkConfig__pusch_ServingCellConfig *puschCfg=NULLP;
+   InitialUlBwp *initUlBwp = NULLP;
 
-   if(ulCfg->initialUplinkBWP)
+   if(servCellCfg)
    {
-      ulBwp=ulCfg->initialUplinkBWP;
-      if(ulCfg->firstActiveUplinkBWP_Id)
-      {
-        if(ulCfg->pusch_ServingCellConfig)
-        {
-           puschCfg=ulCfg->pusch_ServingCellConfig;
-           if(puschCfg->choice.setup)
-           {
-              if(puschCfg->choice.setup->ext1)
-              {
-                 DU_FREE(puschCfg->choice.setup->ext1->\
-                       processingType2Enabled,sizeof(BOOLEAN_t));
-                 DU_FREE(puschCfg->choice.setup->ext1->\
-                       maxMIMO_Layers,sizeof(long));
-                 DU_FREE(puschCfg->choice.setup->ext1, \
-                       sizeof(struct PUSCH_ServingCellConfig__ext1));
-              }
-              DU_FREE(puschCfg->choice.setup, sizeof(struct PUSCH_ServingCellConfig));
-           }
-           DU_FREE(ulCfg->pusch_ServingCellConfig, sizeof(struct UplinkConfig__pusch_ServingCellConfig));
-        }
-        DU_FREE(ulCfg->firstActiveUplinkBWP_Id, sizeof(BWP_Id_t));
-      }
-      FreeInitialUlBWP(ulBwp);
-      DU_FREE(ulCfg->initialUplinkBWP, sizeof(BWP_UplinkDedicated_t));
+      initUlBwp = &servCellCfg->initUlBwp;
+   }
+
+   ulCfg->initialUplinkBWP = NULLP;
+   DU_ALLOC(ulCfg->initialUplinkBWP, sizeof(BWP_UplinkDedicated_t));
+   if(!ulCfg->initialUplinkBWP)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory Allocation failed in BuildUlCfg");
+      return RFAILED;
    }
+
+   if(BuildInitialUlBWP(initUlBwp, ulCfg->initialUplinkBWP) != ROK)
+   {
+      return RFAILED;
+   }
+
+   ulCfg->uplinkBWP_ToReleaseList = NULLP;
+   ulCfg->uplinkBWP_ToAddModList = NULLP;
+   ulCfg->firstActiveUplinkBWP_Id = NULLP;
+   DU_ALLOC(ulCfg->firstActiveUplinkBWP_Id, sizeof(BWP_Id_t));
+   if(!ulCfg->firstActiveUplinkBWP_Id)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory Allocation failed in BuildUlCfg");
+      return RFAILED;
+   }
+   if(servCellCfg == NULLP)
+      *(ulCfg->firstActiveUplinkBWP_Id) = ACTIVE_UL_BWP_ID;
+   else
+      *(ulCfg->firstActiveUplinkBWP_Id) = servCellCfg->firstActvUlBwpId;
+
+   ulCfg->pusch_ServingCellConfig = NULLP;
+   DU_ALLOC(ulCfg->pusch_ServingCellConfig, sizeof(struct UplinkConfig__pusch_ServingCellConfig));
+   if(!ulCfg->pusch_ServingCellConfig)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory Allocation failed in BuildUlCfg");
+      return RFAILED;
+   }
+
+   if(BuildPuschSrvCellCfg(ulCfg->pusch_ServingCellConfig) != ROK)
+   {
+      return RFAILED;
+   }
+
+   ulCfg->carrierSwitching = NULLP;
+   ulCfg->ext1 = NULLP;
+   return ROK;
 }
+
 /*******************************************************************
  *
- * @brief Frees emmory allocated for BWPDlDedPdschCfg
- *
+ * @brief Builds PDSCH serving cell config
  * @details
  *
- *    Function : FreeBWPDlDedPdschCfg
- *
- *    Functionality: Deallocating memory of BWPDlDedPdschCfg
+ *    Function : BuildPdschSrvCellCfg
  *
- * @params[in] BWP_DownlinkDedicated_t *dlBwp
+ *    Functionality: Builds PDSCH serving cell config in spCellCfgDed
  *
- * @return void
+ * @params[in] struct ServingCellConfig__pdsch_ServingCellConfig *pdschCfg 
  *
+ * @return ROK     - success
+ *         RFAILED - failure
  *
  * ****************************************************************/
-void FreeBWPDlDedPdschCfg(BWP_DownlinkDedicated_t *dlBwp)
+uint8_t BuildPdschSrvCellCfg(PdschServCellCfg *pdschServCellDb, struct ServingCellConfig__pdsch_ServingCellConfig *pdschCfg)
 {
-   struct PDSCH_Config *pdschCfg=NULLP;
-   struct PDSCH_Config__prb_BundlingType *prbBndlType=NULLP;
-   struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList=NULLP;
-   struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA *dmrsDlCfg=NULLP;
+   pdschCfg->present =  ServingCellConfig__pdsch_ServingCellConfig_PR_setup;
+   pdschCfg->choice.setup = NULLP;
+   DU_ALLOC(pdschCfg->choice.setup, sizeof( struct PDSCH_ServingCellConfig));
+   if(!pdschCfg->choice.setup)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschSrvCellCfg");
+      return RFAILED;
+   }
 
-   if(dlBwp->pdsch_Config->choice.setup)
+   /* Code Block Group Transmission */
+   pdschCfg->choice.setup->codeBlockGroupTransmission = NULLP;
+   if(pdschServCellDb && (pdschServCellDb->maxCodeBlkGrpPerTb || pdschServCellDb->codeBlkGrpFlushInd))
    {
-      pdschCfg=dlBwp->pdsch_Config->choice.setup;
-      if(pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA)
+      DU_ALLOC(pdschCfg->choice.setup->codeBlockGroupTransmission, sizeof(struct PDSCH_ServingCellConfig__codeBlockGroupTransmission));
+      if(pdschCfg->choice.setup->codeBlockGroupTransmission == NULLP)
       {
-        if(pdschCfg->pdsch_TimeDomainAllocationList)
-        {
-           timeDomAllocList=pdschCfg->pdsch_TimeDomainAllocationList;
-           if(pdschCfg->maxNrofCodeWordsScheduledByDCI)
-           {
-              prbBndlType=&pdschCfg->prb_BundlingType;
-              DU_FREE(prbBndlType->choice.staticBundling,\
-                    sizeof(struct PDSCH_Config__prb_BundlingType__staticBundling));
-              DU_FREE(pdschCfg->maxNrofCodeWordsScheduledByDCI, sizeof(long));
-           }
-           FreePdschTimeDomAllocList(timeDomAllocList);
-           DU_FREE(pdschCfg->pdsch_TimeDomainAllocationList, \
-                 sizeof(struct PDSCH_Config__pdsch_TimeDomainAllocationList));
-        }
-        dmrsDlCfg=pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA;
-        if(dmrsDlCfg->choice.setup)
-        {
-           DU_FREE(dmrsDlCfg->choice.setup->dmrs_AdditionalPosition,
-                 sizeof(long));
-           DU_FREE(dmrsDlCfg->choice.setup, sizeof(struct DMRS_DownlinkConfig));
-        }
-        DU_FREE(pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA, \
-              sizeof(struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA));
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschSrvCellCfg");
+         return RFAILED;
       }
-      DU_FREE(dlBwp->pdsch_Config->choice.setup, sizeof(struct PDSCH_Config));
+
+      pdschCfg->choice.setup->codeBlockGroupTransmission->present = PDSCH_ServingCellConfig__codeBlockGroupTransmission_PR_setup;
+      pdschCfg->choice.setup->codeBlockGroupTransmission->choice.setup = NULLP;
+      DU_ALLOC(pdschCfg->choice.setup->codeBlockGroupTransmission->choice.setup, sizeof(struct PDSCH_CodeBlockGroupTransmission ));
+      if(pdschCfg->choice.setup->codeBlockGroupTransmission->choice.setup == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschSrvCellCfg");
+         return RFAILED;
+      }
+
+      pdschCfg->choice.setup->codeBlockGroupTransmission->choice.setup->maxCodeBlockGroupsPerTransportBlock = \
+         *(pdschServCellDb->maxCodeBlkGrpPerTb);
+      pdschCfg->choice.setup->codeBlockGroupTransmission->choice.setup->codeBlockGroupFlushIndicator = \
+         *(pdschServCellDb->codeBlkGrpFlushInd);
+   }
+
+   /* xOverhead */
+   pdschCfg->choice.setup->xOverhead = NULLP;
+   if(pdschServCellDb && pdschServCellDb->xOverhead)
+   {
+      DU_ALLOC(pdschCfg->choice.setup->xOverhead, sizeof(long));
+      if(pdschCfg->choice.setup->xOverhead == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschSrvCellCfg");
+         return RFAILED;
+      }
+      *(pdschCfg->choice.setup->xOverhead) = *(pdschServCellDb->xOverhead);
+   }
+
+   /* Number of HARQ processes */
+   pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH = NULLP;
+   DU_ALLOC(pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH, sizeof(long));
+   if(!pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschSrvCellCfg");
+      return RFAILED;
+   }
+
+   if(pdschServCellDb == NULLP)
+   *(pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH) = PDSCH_NUM_HARQ_PROC;
+   else
+   *(pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH) = pdschServCellDb->numHarqProcForPdsch;
+
+   pdschCfg->choice.setup->pucch_Cell = NULLP;
+
+   /* Extension */
+   pdschCfg->choice.setup->ext1 = NULLP;
+   if(pdschServCellDb && pdschServCellDb->maxMimoLayers)
+   {
+      DU_ALLOC(pdschCfg->choice.setup->ext1, sizeof(struct PDSCH_ServingCellConfig__ext1));
+      if(pdschCfg->choice.setup->ext1 == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschSrvCellCfg");
+         return RFAILED;
+      }
+
+      DU_ALLOC(pdschCfg->choice.setup->ext1->maxMIMO_Layers, sizeof(long));
+      if(pdschCfg->choice.setup->ext1->maxMIMO_Layers == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschSrvCellCfg");
+         return RFAILED;
+      }
+      *(pdschCfg->choice.setup->ext1->maxMIMO_Layers) = *(pdschServCellDb->maxMimoLayers);
    }
+
+   return ROK;
 }
+
 /*******************************************************************
  *
- * @brief Frees emmory allocated for BWPDlDedPdcchCfg
- *
+ * @brief Builds CSI Meas config
  * @details
  *
- *    Function : FreeBWPDlDedPdcchCfg
+ *    Function : BuildCsiMeasCfg 
  *
- *    Functionality: Deallocating memory of BWPDlDedPdcchCfg
+ *    Functionality: Builds CSI Meas config in spCellCfgDed
  *
- * @params[in] BWP_DownlinkDedicated_t *dlBwp
+ * @params[in] struct ServingCellConfig__csi_MeasConfig *csiMeasCfg
  *
- * @return void
- *         
+ * @return ROK     - success
+ *         RFAILED - failure
  *
  * ****************************************************************/
-void FreeBWPDlDedPdcchCfg(BWP_DownlinkDedicated_t *dlBwp)
+uint8_t BuildCsiMeasCfg(struct ServingCellConfig__csi_MeasConfig *csiMeasCfg)
 {
-   uint8_t idx1=0;
-   uint8_t idx2=0;
-   struct PDCCH_Config *pdcchCfg=NULLP;
-   struct ControlResourceSet *controlRSet=NULLP;
-   struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList=NULLP;
 
-   if(dlBwp->pdcch_Config->choice.setup)
-   {
-      pdcchCfg=dlBwp->pdcch_Config->choice.setup;
-      if(pdcchCfg->controlResourceSetToAddModList)
-      {
-        controlRSetList = pdcchCfg->controlResourceSetToAddModList;
-        if(controlRSetList->list.array)
-        {
-           controlRSet = controlRSetList->list.array[idx2];
-           if(controlRSet)
-           {
-              if(controlRSet->frequencyDomainResources.buf)
-              {
-                 if(controlRSet->pdcch_DMRS_ScramblingID)
-                 {
-                    if(pdcchCfg->searchSpacesToAddModList)
-                    {
-                       FreeSearchSpcToAddModList(pdcchCfg->searchSpacesToAddModList);
-                       DU_FREE(pdcchCfg->searchSpacesToAddModList, \
-                             sizeof(struct PDCCH_Config__searchSpacesToAddModList));
-                    }
-                    DU_FREE(controlRSet->pdcch_DMRS_ScramblingID, sizeof(long));
-                 }
-                 DU_FREE(controlRSet->frequencyDomainResources.buf, \
-                       controlRSet->frequencyDomainResources.size);
-              }
-           }
-           for(idx1 = 0; idx1 <controlRSetList->list.count; idx1++)
-           {
-              DU_FREE(controlRSetList->list.array[idx1], sizeof(struct ControlResourceSet));
-           }
-           DU_FREE(controlRSetList->list.array, controlRSetList->list.size);
-        }
-        DU_FREE(pdcchCfg->controlResourceSetToAddModList, \
-              sizeof(struct PDCCH_Config__controlResourceSetToAddModList));
-      }
-      DU_FREE(dlBwp->pdcch_Config->choice.setup, sizeof(struct PDCCH_Config));
-   }
-}      
+   return ROK;
+}
 
 /*******************************************************************
  *
- * @brief Frees emmory allocated for DUToCURRCContainer 
- *
+ * @brief Builds DL BWP to add/modify list
  * @details
  *
- *    Function : FreeMemDuToCuRrcCont
+ *    Function : BuildDlBwpToAddModList
  *
- *    Functionality: Deallocating memory of DuToCuRrcContainer
+ *    Functionality: Builds DL BWP to add/modify list
  *
- * @params[in] DuToCuRRCContainer, DuToCuRRCContainer
+ * @params[in] ServCellCfgInfo *servCellCfg, 
+ *             struct ServingCellConfig__downlinkBWP_ToAddModList *dlBwpAddModList
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
- * ****************************************************************/
-uint8_t FreeMemDuToCuRrcCont(CellGroupConfigRrc_t *cellGrpCfg)
+ * ****************************************************************/ 
+uint8_t BuildDlBwpToAddModList(ServCellCfgInfo *servCellCfg, struct ServingCellConfig__downlinkBWP_ToAddModList *dlBwpAddModList)
 {
-   uint8_t idx=0;
-   SpCellConfig_t *spCellCfg=NULLP;
-   ServingCellConfig_t *srvCellCfg=NULLP;
-   BWP_DownlinkDedicated_t *dlBwp=NULLP;
-   MAC_CellGroupConfig_t *macCellGrpCfg=NULLP;
-   PhysicalCellGroupConfig_t *phyCellGrpCfg=NULLP;
-   struct CellGroupConfigRrc__rlc_BearerToAddModList *rlcBearerList=NULLP;
-   struct RLC_Config *rlcConfig=NULLP;
-   struct LogicalChannelConfig *macLcConfig=NULLP;
-   struct SchedulingRequestConfig *schedulingRequestConfig=NULLP;
-   struct SchedulingRequestConfig__schedulingRequestToAddModList *schReqList=NULLP;
-   struct TAG_Config *tagConfig=NULLP;
-   struct TAG_Config__tag_ToAddModList *tagList=NULLP;
-   struct MAC_CellGroupConfig__phr_Config *phrConfig=NULLP;
-   struct ServingCellConfig__pdsch_ServingCellConfig *pdschCfg=NULLP;
+   uint8_t elementCnt, idx;
 
-   rlcBearerList = cellGrpCfg->rlc_BearerToAddModList;
-   if(rlcBearerList)
+   elementCnt = servCellCfg->numDlBwpToAdd;
+   dlBwpAddModList->list.count = elementCnt;
+   dlBwpAddModList->list.size = elementCnt * sizeof(struct BWP_Downlink *);
+   dlBwpAddModList->list.array = NULLP;
+   DU_ALLOC(dlBwpAddModList->list.array, dlBwpAddModList->list.size);
+   if(dlBwpAddModList->list.array == NULLP)
    {
-      if(rlcBearerList->list.array)
-      {
-        for(idx=0; idx<rlcBearerList->list.count; idx++)
-        {
-           if(rlcBearerList->list.array[idx])
-           {  
-              rlcConfig   = rlcBearerList->list.array[idx]->rlc_Config;
-              macLcConfig = rlcBearerList->list.array[idx]->mac_LogicalChannelConfig;
-              if(rlcConfig)
-              {
-                 if(rlcConfig->choice.am)
-                 {
-                    DU_FREE(rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength, sizeof(SN_FieldLengthAM_t));
-                    DU_FREE(rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength, sizeof(SN_FieldLengthAM_t)); 
-                    DU_FREE(rlcConfig->choice.am, sizeof(struct RLC_Config__am));
-                 }     
-                 DU_FREE(rlcConfig, sizeof(struct RLC_Config));
-              }
-              DU_FREE(rlcBearerList->list.array[idx]->servedRadioBearer, sizeof(struct RLC_BearerConfig__servedRadioBearer));
-              if(macLcConfig)
-              {
-                 if(macLcConfig->ul_SpecificParameters)
-                 {
-                    DU_FREE(macLcConfig->ul_SpecificParameters->schedulingRequestID,   sizeof(SchedulingRequestId_t));
-                    DU_FREE(macLcConfig->ul_SpecificParameters->logicalChannelGroup,   sizeof(long));
-                    DU_FREE(macLcConfig->ul_SpecificParameters, sizeof(struct LogicalChannelConfig__ul_SpecificParameters));
-                 }
-                 DU_FREE(rlcBearerList->list.array[idx]->mac_LogicalChannelConfig, sizeof(struct LogicalChannelConfig));
-              }
-              DU_FREE(rlcBearerList->list.array[idx], sizeof(struct RLC_BearerConfig));
-           }   
-        }
-        DU_FREE(rlcBearerList->list.array, rlcBearerList->list.size);
-      }
-      DU_FREE(cellGrpCfg->rlc_BearerToAddModList, sizeof(struct CellGroupConfigRrc__rlc_BearerToAddModList));
+      DU_LOG("\nERROR  --> DU APP: Memory allocation failure in BuildDlBwpToAddModList");
+      return RFAILED;
    }
 
-   macCellGrpCfg = cellGrpCfg->mac_CellGroupConfig;
-   if(macCellGrpCfg)
+   for(idx=0; idx<dlBwpAddModList->list.count; idx++)
    {
-      schedulingRequestConfig = macCellGrpCfg->schedulingRequestConfig; 
-      if(schedulingRequestConfig)
-      {
-        schReqList = schedulingRequestConfig->schedulingRequestToAddModList;
-        if(schReqList)
-        {
-           if(schReqList->list.array)
-           {
-              for(idx=0;idx<schReqList->list.count; idx++)
-              {
-                 if(schReqList->list.array[idx])
-                 {
-                    DU_FREE(schReqList->list.array[idx]->sr_ProhibitTimer, sizeof(long));
-                    DU_FREE(schReqList->list.array[idx], sizeof(struct SchedulingRequestToAddMod));
-                 }
-              }
-              DU_FREE(schReqList->list.array, schReqList->list.size);
-           }
-           DU_FREE(schedulingRequestConfig->schedulingRequestToAddModList,\
-                 sizeof(struct SchedulingRequestConfig__schedulingRequestToAddModList));    }
-           DU_FREE(macCellGrpCfg->schedulingRequestConfig, sizeof(struct SchedulingRequestConfig));
-      }
-      if(macCellGrpCfg->bsr_Config)
-      {
-        DU_FREE(macCellGrpCfg->bsr_Config, sizeof(struct BSR_Config));
-      }
-      tagConfig = macCellGrpCfg->tag_Config;
-      if(tagConfig)
-      {
-        tagList = tagConfig->tag_ToAddModList;
-        if(tagList)
-        {
-           if(tagList->list.array)
-           {
-              for(idx=0; idx<tagList->list.count; idx++)
-              {
-                 DU_FREE(tagList->list.array[idx], sizeof(struct TAG));
-              }
-              DU_FREE(tagList->list.array, tagList->list.size);
-           }
-           DU_FREE(tagConfig->tag_ToAddModList, sizeof(struct TAG_Config__tag_ToAddModList));
-        }
-        DU_FREE(tagConfig, sizeof(struct TAG_Config));
-      }
-
-      phrConfig = macCellGrpCfg->phr_Config;
-      if(phrConfig)
+      DU_ALLOC(dlBwpAddModList->list.array[idx], sizeof(BWP_Downlink_t));
+      if(dlBwpAddModList->list.array[idx] == NULLP)
       {
-        DU_FREE(phrConfig->choice.setup, sizeof(struct PHR_Config));
-        DU_FREE(phrConfig, sizeof(struct MAC_CellGroupConfig__phr_Config));
+         DU_LOG("\nERROR  --> DU APP: Memory allocation failure in BuildDlBwpToAddModList");
+         return RFAILED;
       }
-
-      DU_FREE(macCellGrpCfg, sizeof(MAC_CellGroupConfig_t));
    }
 
-   phyCellGrpCfg = cellGrpCfg->physicalCellGroupConfig;
-   if(phyCellGrpCfg)
-   {
-      DU_FREE(phyCellGrpCfg->p_NR_FR1, sizeof(long));
-      DU_FREE(phyCellGrpCfg, sizeof(PhysicalCellGroupConfig_t));
-   }
-
-   spCellCfg = cellGrpCfg->spCellConfig;
-   if(spCellCfg)
+   for(idx=0; idx<dlBwpAddModList->list.count; idx++)
    {
-      if(spCellCfg->servCellIndex)
-      {
-        if(spCellCfg->rlmInSyncOutOfSyncThreshold)
-        {
-           if(spCellCfg->spCellConfigDedicated)
-           {
-              srvCellCfg = spCellCfg->spCellConfigDedicated;
-              if(srvCellCfg->tdd_UL_DL_ConfigurationDedicated)
-              {
-                 if(srvCellCfg->initialDownlinkBWP)
-                 {
-                    dlBwp = srvCellCfg->initialDownlinkBWP;
-                    if(srvCellCfg->firstActiveDownlinkBWP_Id)
-                    {
-                       if(srvCellCfg->defaultDownlinkBWP_Id)
-                       {
-                          if(srvCellCfg->uplinkConfig)
-                          {
-                             if(srvCellCfg->pdsch_ServingCellConfig)
-                             {
-                                pdschCfg= srvCellCfg->pdsch_ServingCellConfig;
-                                if(pdschCfg->choice.setup)
-                                {
-                                   DU_FREE(pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH,sizeof(long));
-                                   DU_FREE(pdschCfg->choice.setup, sizeof( struct PDSCH_ServingCellConfig));
-                                }
-                                DU_FREE(srvCellCfg->pdsch_ServingCellConfig, sizeof(struct
-                                      ServingCellConfig__pdsch_ServingCellConfig));
-                             }  
-                             FreeinitialUplinkBWP(srvCellCfg->uplinkConfig);
-                             DU_FREE(srvCellCfg->uplinkConfig, sizeof(UplinkConfig_t));        
-                          }
-                          DU_FREE(srvCellCfg->defaultDownlinkBWP_Id, sizeof(long));
-                       }
-                       DU_FREE(srvCellCfg->firstActiveDownlinkBWP_Id, sizeof(long));
-                    }
-                    if(dlBwp->pdcch_Config)
-                    {
-                       if(dlBwp->pdsch_Config)
-                       {
-                          FreeBWPDlDedPdschCfg(dlBwp);
-                          DU_FREE(dlBwp->pdsch_Config, sizeof(struct BWP_DownlinkDedicated__pdsch_Config));
-                       }
-                       FreeBWPDlDedPdcchCfg(dlBwp);
-                       DU_FREE(dlBwp->pdcch_Config, sizeof(struct BWP_DownlinkDedicated__pdcch_Config));
-                   }
-                   DU_FREE(srvCellCfg->initialDownlinkBWP, sizeof(BWP_DownlinkDedicated_t));
-                 }
-                 DU_FREE(srvCellCfg->tdd_UL_DL_ConfigurationDedicated, sizeof(TDD_UL_DL_ConfigDedicated_t));
-              }
-              DU_FREE(spCellCfg->spCellConfigDedicated, sizeof(ServingCellConfig_t));
-           }
-           DU_FREE(spCellCfg->rlmInSyncOutOfSyncThreshold, sizeof(long));
-        }
-        DU_FREE(spCellCfg->servCellIndex, sizeof(long));
-      }
-      DU_FREE(spCellCfg,sizeof(SpCellConfig_t));
+      dlBwpAddModList->list.array[idx]->bwp_Id = servCellCfg->DlBwpToAddList[idx].bwpId;
+      dlBwpAddModList->list.array[idx]->bwp_Common = NULLP;
+      dlBwpAddModList->list.array[idx]->bwp_Dedicated = NULLP;
    }
    return ROK;
 }
+
 /*******************************************************************
  *
- * @brief Builds DU To CU RRC Container 
- *
+ * @brief Builds Spcell config dedicated
  * @details
  *
- *    Function : BuildDuToCuRrcContainer 
+ *    Function : BuildSpCellCfgDed
  *
- *    Functionality: Builds DuToCuRrcContainer
+ *    Functionality: Builds sp cell config dedicated in spCellCfg
  *
- * @params[in] idx, index in F1AP msg
- *             DuToCuRRCContainer, DuToCuRRCContainer
+ * @params[in] ServingCellConfig_t srvCellCfg
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildDuToCuRrcContainer(DUtoCURRCContainer_t *duToCuRrcContainer)
+uint8_t BuildSpCellCfgDed(DuUeCb *ueCb, ServingCellConfig_t *srvCellCfg)
 {
-   uint8_t  ret = ROK;
-   CellGroupConfigRrc_t  cellGrpCfg;
-   asn_enc_rval_t        encRetVal;
-   memset(&cellGrpCfg, 0, sizeof(CellGroupConfigRrc_t));
-   memset(&encRetVal, 0, sizeof(asn_enc_rval_t));
+   ServCellCfgInfo *servCellCfg = NULLP;
+   InitialDlBwp *initDlBwp = NULLP;
+   PdschServCellCfg *pdschServCellDb = NULLP;
 
-   while(true)
+   if(ueCb)
    {
-      cellGrpCfg.cellGroupId = CELL_GRP_ID;
+      servCellCfg = &ueCb->macUeCfg.spCellCfg.servCellCfg;
+      initDlBwp = &servCellCfg->initDlBwp;
+      pdschServCellDb = &servCellCfg->pdschServCellCfg;
+   }
 
-      cellGrpCfg.rlc_BearerToAddModList = NULLP;
-      DU_ALLOC(cellGrpCfg.rlc_BearerToAddModList, sizeof(struct CellGroupConfigRrc__rlc_BearerToAddModList));
-      if(!cellGrpCfg.rlc_BearerToAddModList)
-      {
-        DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildDuToCuRrcContainer");
-        ret = RFAILED;
-        break;
-      }
-      if(BuildRlcBearerToAddModList(cellGrpCfg.rlc_BearerToAddModList) != ROK)
-      {
-        DU_LOG("\nERROR  -->  F1AP : BuildRlcBearerToAddModList failed");
-        ret = RFAILED;
-        break;
-      }
+   srvCellCfg->tdd_UL_DL_ConfigurationDedicated = NULLP;
+   DU_ALLOC(srvCellCfg->tdd_UL_DL_ConfigurationDedicated, sizeof(TDD_UL_DL_ConfigDedicated_t));
+   if(!srvCellCfg->tdd_UL_DL_ConfigurationDedicated)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
+      return RFAILED;
+   }
 
-      cellGrpCfg.rlc_BearerToReleaseList = NULLP;
-      cellGrpCfg.mac_CellGroupConfig = NULLP;
-      DU_ALLOC(cellGrpCfg.mac_CellGroupConfig, sizeof(MAC_CellGroupConfig_t));
-      if(!cellGrpCfg.mac_CellGroupConfig)
-      {
-        DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildDuToCuRrcContainer");
-        ret = RFAILED;
-        break;
-      }
-      if(BuildMacCellGrpCfg(cellGrpCfg.mac_CellGroupConfig) != ROK)
-      {
-        DU_LOG("\nERROR  -->  F1AP : BuildMacCellGrpCfg failed");
-        ret = RFAILED;
-        break;
-      }
+   srvCellCfg->initialDownlinkBWP = NULLP;
+   DU_ALLOC(srvCellCfg->initialDownlinkBWP, sizeof(BWP_DownlinkDedicated_t));
+   if(!srvCellCfg->initialDownlinkBWP)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
+      return RFAILED;
+   }
 
-      cellGrpCfg.physicalCellGroupConfig = NULLP;
-      DU_ALLOC(cellGrpCfg.physicalCellGroupConfig, sizeof(PhysicalCellGroupConfig_t));
-      if(!cellGrpCfg.physicalCellGroupConfig)
-      {
-        DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildDuToCuRrcContainer");
-        ret = RFAILED;
-        break;
-      }
-      if(BuildPhyCellGrpCfg(cellGrpCfg.physicalCellGroupConfig) != ROK)
-      {
-        DU_LOG("\nERROR  -->  F1AP : BuildPhyCellGrpCfg failed");
-        ret = RFAILED;
-        break;
-      }
+   if(BuildInitialDlBWP(initDlBwp, srvCellCfg->initialDownlinkBWP) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP : BuildInitialDlBWP failed");
+      return RFAILED;
+   }
 
-      cellGrpCfg.spCellConfig = NULLP;
-      DU_ALLOC(cellGrpCfg.spCellConfig, sizeof(SpCellConfig_t));
-      if(!cellGrpCfg.spCellConfig)
+   srvCellCfg->downlinkBWP_ToReleaseList = NULLP;
+
+   srvCellCfg->downlinkBWP_ToAddModList = NULLP;
+   if(ueCb && ueCb->macUeCfg.spCellCfg.servCellCfg.numDlBwpToAdd)
+   {
+      DU_ALLOC(srvCellCfg->downlinkBWP_ToAddModList, sizeof(struct ServingCellConfig__downlinkBWP_ToAddModList));
+      if(srvCellCfg->downlinkBWP_ToAddModList == NULLP)
       {
-        DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildDuToCuRrcContainer");
-        ret = RFAILED;
-        break;
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
+         return RFAILED;
       }
-      if(BuildSpCellCfg(cellGrpCfg.spCellConfig) != ROK)
+
+      if(BuildDlBwpToAddModList(&ueCb->macUeCfg.spCellCfg.servCellCfg, srvCellCfg->downlinkBWP_ToAddModList) != ROK)
       {
-        DU_LOG("\nERROR  -->  F1AP : BuildSpCellCfg failed");
-        ret = RFAILED;
-        break;
+         DU_LOG("\nERROR  -->  F1AP : BuildInitialDlBWP failed");
+         return RFAILED;
       }
+   }
 
-      cellGrpCfg.sCellToAddModList = NULLP;
-      cellGrpCfg.sCellToReleaseList = NULLP;
-      cellGrpCfg.ext1 = NULLP;
-
-      /* encode cellGrpCfg into duToCuRrcContainer */
-      xer_fprint(stdout, &asn_DEF_CellGroupConfigRrc, &cellGrpCfg);
-      memset(encBuf, 0, ENC_BUF_MAX_LEN);
-      encBufSize = 0;
-      encRetVal = aper_encode(&asn_DEF_CellGroupConfigRrc, 0, &cellGrpCfg, PrepFinalEncBuf, encBuf);
-      /* Encode results */
-      if(encRetVal.encoded == ENCODE_FAIL)
-      {
-        DU_LOG( "\nERROR  --> F1AP : Could not encode DuToCuRrcContainer (at %s)\n",\
-              encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
-        ret = RFAILED;
-        break;
-      }
-      else
-      {
-        DU_LOG("\nDEBUG   -->  F1AP : Created APER encoded buffer for DuToCuRrcContainer\n");
-        for(int i=0; i< encBufSize; i++)
-        {
-           printf("%x",encBuf[i]);
-        }
-      }
+   srvCellCfg->firstActiveDownlinkBWP_Id = NULLP;
+   DU_ALLOC(srvCellCfg->firstActiveDownlinkBWP_Id, sizeof(long));
+   if(!srvCellCfg->firstActiveDownlinkBWP_Id)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
+      return RFAILED;
+   }
+   if(ueCb == NULLP)
+      *(srvCellCfg->firstActiveDownlinkBWP_Id) = ACTIVE_DL_BWP_ID;
+   else
+      *(srvCellCfg->firstActiveDownlinkBWP_Id) = ueCb->macUeCfg.spCellCfg.servCellCfg.firstActvDlBwpId;
 
-      duToCuRrcContainer->size = encBufSize;
-      DU_ALLOC(duToCuRrcContainer->buf, duToCuRrcContainer->size);
-      if(!duToCuRrcContainer->buf)
-      {
-        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDuToCuRrcContainer");
-        ret = RFAILED;
-        break;
-      }
-      if(ret == ROK)
+   srvCellCfg->bwp_InactivityTimer = NULLP;
+
+   srvCellCfg->defaultDownlinkBWP_Id = NULLP;
+   DU_ALLOC(srvCellCfg->defaultDownlinkBWP_Id, sizeof(long));
+   if(!srvCellCfg->defaultDownlinkBWP_Id)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
+      return RFAILED;
+   }
+   if(ueCb == NULLP)
+      *(srvCellCfg->defaultDownlinkBWP_Id) = ACTIVE_DL_BWP_ID;
+   else
+      *(srvCellCfg->defaultDownlinkBWP_Id) = ueCb->macUeCfg.spCellCfg.servCellCfg.defaultDlBwpId;
+
+   srvCellCfg->uplinkConfig = NULLP;
+   DU_ALLOC(srvCellCfg->uplinkConfig, sizeof(UplinkConfig_t));
+   if(!srvCellCfg->uplinkConfig)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
+      return RFAILED;
+   }
+
+   if(BuildUlCfg(servCellCfg, srvCellCfg->uplinkConfig) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP : BuildUlCfg failed");
+      return RFAILED;
+   }
+   srvCellCfg->supplementaryUplink = NULLP;
+   srvCellCfg->pdcch_ServingCellConfig = NULLP;
+
+   srvCellCfg->pdsch_ServingCellConfig = NULLP;
+   DU_ALLOC(srvCellCfg->pdsch_ServingCellConfig, sizeof(struct ServingCellConfig__pdsch_ServingCellConfig));
+   if(!srvCellCfg->pdsch_ServingCellConfig)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
+      return RFAILED;
+   }
+
+   if(BuildPdschSrvCellCfg(pdschServCellDb, srvCellCfg->pdsch_ServingCellConfig) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP : BuildPdschSrvCellCfg failed");
+      return RFAILED;
+   }
+
+   srvCellCfg->csi_MeasConfig = NULLP;
+#if 0
+   DU_ALLOC(srvCellCfg->csi_MeasConfig, sizeof(struct  ServingCellConfig__csi_MeasConfig))
+      if(!srvCellCfg->csi_MeasConfig)
       {
-         memcpy(duToCuRrcContainer->buf, encBuf, duToCuRrcContainer->size);
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
+        return RFAILED;
       }
-      break;
+
+   if(BuildCsiMeasCfg(srvCellCfg->csi_MeasConfig) != ROK)
+   {
+      DU_LOG("\nF1AP : BuildCsiMeasCfg failed");
+      return RFAILED;
    }
-   FreeMemDuToCuRrcCont(&cellGrpCfg);
-   return ret;
-}
+#endif
+   srvCellCfg->sCellDeactivationTimer = NULLP;
+   srvCellCfg->crossCarrierSchedulingConfig = NULLP;
+   srvCellCfg->tag_Id = TAG_ID;
+   srvCellCfg->dummy = NULLP;
+   srvCellCfg->pathlossReferenceLinking = NULLP;
+   srvCellCfg->servingCellMO = NULLP;
+   srvCellCfg->ext1 = NULLP;
 
+   return ROK;
+}
 /*******************************************************************
  *
- * @brief Free memory allocated in InitialULRRCMessage
+ * @brief Builds Spcell config 
  *
  * @details
  *
- *    Function : freeInitUlRrcMsgTransfer
+ *    Function : BuildSpCellCfg 
  *
- *    Functionality: Free memory allocated in InitialULRRCMessage
+ *    Functionality: Builds sp cell config in DuToCuRrcContainer
  *
- * @params[in]F1AP_PDU_t  *f1apMsg)
+ * @params[in] SpCellConfig_t spCellCfg
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-
-uint8_t freeInitUlRrcMsgTransfer(F1AP_PDU_t  *f1apMsg)
+uint8_t BuildSpCellCfg(DuUeCb *ueCb, SpCellConfig_t *spCellCfg)
 {
-   uint8_t ieIdx, arrIdx;
-   InitialULRRCMessageTransfer_t *initULRRCMsg=NULLP;
-
-   if(f1apMsg)
+   spCellCfg->servCellIndex = NULLP;
+   DU_ALLOC(spCellCfg->servCellIndex, sizeof(long));
+   if(!spCellCfg->servCellIndex)
    {
-      if(f1apMsg->choice.initiatingMessage)
-      {
-         initULRRCMsg = &f1apMsg->choice.initiatingMessage->value.\
-           choice.InitialULRRCMessageTransfer;
-        if(initULRRCMsg->protocolIEs.list.array)
-        {
-           for(ieIdx = 0; ieIdx < initULRRCMsg->protocolIEs.list.count; ieIdx++)
-           {
-              switch(initULRRCMsg->protocolIEs.list.array[ieIdx]->id)
-              {
-                 case ProtocolIE_ID_id_NRCGI:
-                 {
-                    if(initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.NRCGI.pLMN_Identity.buf)
-                    {
-                       if(initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.NRCGI.nRCellIdentity.buf)
-                       {
-                          DU_FREE(initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.NRCGI.nRCellIdentity.buf,\
-                          initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.NRCGI.nRCellIdentity.size);
-                       }
-                       DU_FREE(initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.NRCGI.pLMN_Identity.buf,\
-                       initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.NRCGI.pLMN_Identity.size);
-                    }
-                     break;
-                 }
-                 case ProtocolIE_ID_id_RRCContainer:
-                 {
-                    if(initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.buf)
-                    {
-                       DU_FREE(initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.buf,\
-                       initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.size);
-                    }
-                     break;
-                 }
-                 case ProtocolIE_ID_id_DUtoCURRCContainer:
-                 {
-                    if(initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.DUtoCURRCContainer.buf)
-                    {
-                       DU_FREE(initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.DUtoCURRCContainer.buf,
-                       initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.DUtoCURRCContainer.size);
-                    }
-                    break;
-                 }
-                 default:
-                    break;
-              }
-            }
-            for(arrIdx = 0; arrIdx < ieIdx; arrIdx++)
-            {
-               if(initULRRCMsg->protocolIEs.list.array[arrIdx])
-               {
-                  DU_FREE(initULRRCMsg->protocolIEs.list.array[arrIdx],\
-                     sizeof(InitialULRRCMessageTransferIEs_t));
-               }
-            }
-            DU_FREE(initULRRCMsg->protocolIEs.list.array, initULRRCMsg->protocolIEs.list.size);
-         }
-        DU_FREE(f1apMsg->choice.initiatingMessage,sizeof(InitiatingMessage_t));
-      }
-      DU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfg");
+      return RFAILED;
    }
+
+   if(ueCb == NULLP)
+      *(spCellCfg->servCellIndex) = SERV_CELL_IDX;
    else
+      *(spCellCfg->servCellIndex) = ueCb->macUeCfg.spCellCfg.servCellIdx;
+
+   spCellCfg->reconfigurationWithSync = NULLP;
+   spCellCfg->rlf_TimersAndConstants = NULLP;
+   spCellCfg->rlmInSyncOutOfSyncThreshold = NULLP;
+
+   DU_ALLOC(spCellCfg->rlmInSyncOutOfSyncThreshold, sizeof(long));
+   if(!spCellCfg->rlmInSyncOutOfSyncThreshold)
    {
-      DU_LOG("\nERROR  -->  DU_APP : Recevied F1ap Pdu is null at freeInitUlRrcMsgTransfer()");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfg");
+      return RFAILED;
+   }
+   *(spCellCfg->rlmInSyncOutOfSyncThreshold) = RLM_SYNC_OUT_SYNC_THRESHOLD;
+
+   spCellCfg->spCellConfigDedicated = NULLP;
+   DU_ALLOC(spCellCfg->spCellConfigDedicated, sizeof(ServingCellConfig_t));
+   if(!spCellCfg->spCellConfigDedicated)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfg");
       return RFAILED;
    }
+   if(BuildSpCellCfgDed(ueCb, spCellCfg->spCellConfigDedicated) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP : BuildSpCellCfgDed failed");
+      return RFAILED;
+   }
+
    return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Builds and sends the InitialULRRCMessage 
+ * @brief Builds Phy cell group config 
  *
  * @details
  *
- *    Function : BuildAndSendInitialRrcMsgTransfer 
+ *    Function : BuildPhyCellGrpCfg 
  *
- *    Functionality: Constructs the Initial UL RRC Message Transfer and sends
- *                   it to the CU through SCTP.
+ *    Functionality: Builds Phy cell group config in DuToCuRrcContainer
  *
- * @params[in] 
+ * @params[in] PhysicalCellGroupConfig_t *phyCellGrpCfg 
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildAndSendInitialRrcMsgTransfer(uint32_t gnbDuUeF1apId, uint16_t crnti,
-      uint16_t rrcContSize, uint8_t *rrcContainer)
+uint8_t BuildPhyCellGrpCfg(DuUeCb *ueCb, PhysicalCellGroupConfig_t *phyCellGrpCfg)
 {
-   uint8_t   ret;
-   uint8_t   elementCnt;
-   uint8_t   ieIdx;
-   asn_enc_rval_t  encRetVal;
-   F1AP_PDU_t  *f1apMsg = NULLP;
-   InitialULRRCMessageTransfer_t *initULRRCMsg = NULLP;
-   memset(&encRetVal, 0, sizeof(asn_enc_rval_t));
+   phyCellGrpCfg->harq_ACK_SpatialBundlingPUCCH = NULLP;
+   phyCellGrpCfg->harq_ACK_SpatialBundlingPUSCH = NULLP;
 
-   while(true)
+   phyCellGrpCfg->p_NR_FR1 = NULLP;
+   DU_ALLOC(phyCellGrpCfg->p_NR_FR1, sizeof(long));
+   if(!phyCellGrpCfg->p_NR_FR1)
    {
-      DU_LOG("\n INFO   -->  F1AP : Building RRC Setup Request\n");
-      DU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t));
-      if(f1apMsg == NULLP)
-      {
-        DU_LOG(" ERROR  -->  F1AP : Memory allocation for F1AP-PDU failed");
-        break;
-      }
-      f1apMsg->present = F1AP_PDU_PR_initiatingMessage;
-      DU_ALLOC(f1apMsg->choice.initiatingMessage,sizeof(InitiatingMessage_t));
-      if(f1apMsg->choice.initiatingMessage == NULLP)
-      {
-        DU_LOG(" ERROR  -->  F1AP : Memory allocation for  F1AP-PDU failed");
-        break;
-      }
-      f1apMsg->choice.initiatingMessage->procedureCode =\
-                                                       ProcedureCode_id_InitialULRRCMessageTransfer;
-      f1apMsg->choice.initiatingMessage->criticality = Criticality_ignore;
-      f1apMsg->choice.initiatingMessage->value.present = \
-                                                        InitiatingMessage__value_PR_InitialULRRCMessageTransfer;
-      initULRRCMsg =\
-                   &f1apMsg->choice.initiatingMessage->value.choice.InitialULRRCMessageTransfer;
-      elementCnt = 5;
-      initULRRCMsg->protocolIEs.list.count = elementCnt;
-      initULRRCMsg->protocolIEs.list.size = \
-                                           elementCnt * sizeof(InitialULRRCMessageTransferIEs_t *);
-      /* Initialize the F1Setup members */
-      DU_ALLOC(initULRRCMsg->protocolIEs.list.array,initULRRCMsg->protocolIEs.list.size);
-      if(initULRRCMsg->protocolIEs.list.array == NULLP)
-      {
-        DU_LOG(" ERROR  -->  F1AP : Memory allocation for\
-              RRCSetupRequestMessageTransferIEs failed");
-        break;
-      }
-      for(ieIdx=0; ieIdx<elementCnt; ieIdx++)
-      {
-        DU_ALLOC(initULRRCMsg->protocolIEs.list.array[ieIdx],\
-              sizeof(InitialULRRCMessageTransferIEs_t));
-        if(initULRRCMsg->protocolIEs.list.array[ieIdx] == NULLP)
-        {
-           break;
-        }
-      }
-      ieIdx = 0;
-      /*GNB DU UE F1AP ID*/
-      initULRRCMsg->protocolIEs.list.array[ieIdx]->id  = \
-                                                       ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID;
-      initULRRCMsg->protocolIEs.list.array[ieIdx]->criticality  = Criticality_reject;
-      initULRRCMsg->protocolIEs.list.array[ieIdx]->value.present = \
-                                                                 InitialULRRCMessageTransferIEs__value_PR_GNB_DU_UE_F1AP_ID;
-      initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_UE_F1AP_ID = gnbDuUeF1apId;
-
-
-      /*NRCGI*/
-      ieIdx++;
-      initULRRCMsg->protocolIEs.list.array[ieIdx]->id  = \
-                                                       ProtocolIE_ID_id_NRCGI;
-      initULRRCMsg->protocolIEs.list.array[ieIdx]->criticality  =Criticality_reject;
-      initULRRCMsg->protocolIEs.list.array[ieIdx]->value.present = \
-                                                                 InitialULRRCMessageTransferIEs__value_PR_NRCGI;
-
-      ret =\
-          BuildNrcgi(&initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.NRCGI);
-      if(ret!=ROK)
-      {
-        break;
-      }
-
-      /*CRNTI*/
-      ieIdx++;
-      initULRRCMsg->protocolIEs.list.array[ieIdx]->id  = \
-                                                       ProtocolIE_ID_id_C_RNTI;
-      initULRRCMsg->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
-      initULRRCMsg->protocolIEs.list.array[ieIdx]->value.present =\
-                                                                InitialULRRCMessageTransferIEs__value_PR_C_RNTI;
-      initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.C_RNTI = crnti;
-
-      /*RRCContainer*/
-      ieIdx++;
-      initULRRCMsg->protocolIEs.list.array[ieIdx]->id  = \
-                                                       ProtocolIE_ID_id_RRCContainer;
-      initULRRCMsg->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
-      initULRRCMsg->protocolIEs.list.array[ieIdx]->value.present =\
-                                                                InitialULRRCMessageTransferIEs__value_PR_RRCContainer;
-
-      initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.size = rrcContSize;
-      DU_ALLOC(initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.buf,
-           initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.size)
-      if(!initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.buf)
-      {
-         DU_LOG(" ERROR  -->  F1AP : Memory allocation for RRCSetupRequestMessageTransferIEs failed");
-         break;
-      
-      }
-      memcpy(initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.buf, rrcContainer,
-           initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.size);
-
-
-      /*DUtoCURRCContainer*/
-      ieIdx++;
-      initULRRCMsg->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_DUtoCURRCContainer;
-      initULRRCMsg->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
-      initULRRCMsg->protocolIEs.list.array[ieIdx]->value.present =\
-                                                                InitialULRRCMessageTransferIEs__value_PR_DUtoCURRCContainer;
-
-      ret = BuildDuToCuRrcContainer(&initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.DUtoCURRCContainer);
-      if(ret != ROK)
-      {
-        break;
-      }
-
-      xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
-
-      /* Encode the F1SetupRequest type as APER */
-      memset(encBuf, 0, ENC_BUF_MAX_LEN);
-      encBufSize = 0;
-      encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf, encBuf);
-      /* Encode results */
-      if(encRetVal.encoded == ENCODE_FAIL)
-      {
-        DU_LOG( "\nERROR  --> F1AP : Could not encode Initial UL RRC Message Transfer\
-              structure (at %s)\n",encRetVal.failed_type ? \
-              encRetVal.failed_type->name : "unknown");
-        ret = RFAILED;
-        break;
-      }
-      else
-      {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildPhyCellGrpCfg");
+      return RFAILED;
+   }
 
-        DU_LOG("\nDEBUG   -->  F1AP : Created APER encoded buffer for Initial UL RRC\
-              Message transfer\n");
-        for(int i=0; i< encBufSize; i++)
-        {
-           printf("%x",encBuf[i]);
-        }
-      }
-      /* Sending  msg  */
-      if(SendF1APMsg(DU_APP_MEM_REGION,DU_POOL) != ROK)
-      {
-        DU_LOG("\nERROR  -->  F1AP : Sending Initial UL RRC Message Transfer Failed");
-        ret = RFAILED;
-        break;
-      }
-      break;
+   if(ueCb == NULLP)
+   {
+      *(phyCellGrpCfg->p_NR_FR1)             = P_NR_FR1;
+      phyCellGrpCfg->pdsch_HARQ_ACK_Codebook = PDSCH_HARQ_ACK_CODEBOOK;
+   }
+   else
+   {
+      *(phyCellGrpCfg->p_NR_FR1) = ueCb->macUeCfg.phyCellGrpCfg.pNrFr1;
+      phyCellGrpCfg->pdsch_HARQ_ACK_Codebook = ueCb->macUeCfg.phyCellGrpCfg.pdschHarqAckCodebook;
    }
-   freeInitUlRrcMsgTransfer(f1apMsg);
-   return ret;
-}/* End of BuildAndSendInitialRrcMsgTransfer*/
 
-/*****  UE SETUP REQUEST *****/
+   phyCellGrpCfg->tpc_SRS_RNTI = NULLP;
+   phyCellGrpCfg->tpc_PUCCH_RNTI = NULLP;
+   phyCellGrpCfg->tpc_PUSCH_RNTI = NULLP;
+   phyCellGrpCfg->sp_CSI_RNTI = NULLP;
+   phyCellGrpCfg->cs_RNTI = NULLP;
+   phyCellGrpCfg->ext1 = NULLP;
+   phyCellGrpCfg->ext2 = NULLP;
+
+   return ROK;
+}
 
 /*******************************************************************
  *
- * @brief Free Qos And Snssai Drb Info
+ * @brief Builds Mac cell group config 
  *
  * @details
  *
- *    Function : freeDrbQosAndSnssaiInfo
+ *    Function : BuildMacCellGrpCfg 
  *
- *    Functionality: Free Qos And Snssai Drb Info
+ *    Functionality: Builds Mac cell group config in DuToCuRrcContainer
  *
- * @params[in] LcCfg *lcCfg,
- * @return void
+ * @params[in] MAC_CellGroupConfig_t *macCellGrpCfg
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
  *
  * ****************************************************************/
-void freeDrbQosAndSnssaiInfo(LcCfg *lcCfg)
+uint8_t BuildMacCellGrpCfg(DuUeCb *ueCb, MAC_CellGroupConfig_t *macCellGrpCfg)
 {
-   if(lcCfg->snssai)
+   macCellGrpCfg->drx_Config = NULLP;
+   macCellGrpCfg->schedulingRequestConfig = NULLP;
+   DU_ALLOC(macCellGrpCfg->schedulingRequestConfig, sizeof(struct SchedulingRequestConfig));
+   if(!macCellGrpCfg->schedulingRequestConfig)
    {
-      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->snssai, sizeof(Snssai));
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacCellGrpCfg");
+      return RFAILED;
    }
-   if(lcCfg->drbQos)
+
+   if(BuildSchedulingReqConfig(ueCb, macCellGrpCfg->schedulingRequestConfig) != ROK)
    {
-      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->drbQos, sizeof(DrbQosInfo));
+      DU_LOG("\nERROR  -->  F1AP : BuildSchedulingReqConfig failed");
+      return RFAILED;
    }
-}
 
-/******************************************************************
-*
-* @brief Function to delete the RLC Lc cfg from UE APP DB
-*
-* @details
-*
-*  Function : freeRlcLcCfg
-*
-*  Functionality: Function to delete the RLC Lc cfg from UE APP DB
-*
-*
- *****************************************************************/
+   macCellGrpCfg->bsr_Config = NULLP;
+   DU_ALLOC(macCellGrpCfg->bsr_Config, sizeof(struct BSR_Config));
+   if(!macCellGrpCfg->bsr_Config)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacCellGrpCfg");
+      return RFAILED;
+   }
 
-void freeRlcLcCfg(RlcBearerCfg *lcCfg)
-{
-   switch(lcCfg->rlcMode)
+   if(BuildBsrConfig(ueCb, macCellGrpCfg->bsr_Config) != ROK)
    {
-      case RLC_AM :
-      {
-         if(lcCfg->u.amCfg)
-        {
-            DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->u.amCfg, sizeof(AmBearerCfg));
-            lcCfg->u.amCfg = NULLP;
-        }
-         break;
-      }
-      case RLC_UM_BI_DIRECTIONAL :
-      {
-         if(lcCfg->u.umBiDirCfg)
-        {
-            DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->u.umBiDirCfg, sizeof(UmBiDirBearerCfg));
-           lcCfg->u.umBiDirCfg = NULLP;
-         }
-         break;
-      }
-      case RLC_UM_UNI_DIRECTIONAL_UL :
-      {
-         if(lcCfg->u.umUniDirUlCfg)
-        {
-            DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->u.umUniDirUlCfg, sizeof(UmUniDirUlBearerCfg));
-           lcCfg->u.umUniDirUlCfg = NULLP;
-        }
-         break;
+      DU_LOG("\nERROR  -->  F1AP : BuildBsrConfig failed");
+      return RFAILED;
+   }
 
-      }
-      case RLC_UM_UNI_DIRECTIONAL_DL :
-      {
-         if(lcCfg->u.umUniDirDlCfg)
-        {
-            DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->u.umUniDirDlCfg, sizeof(UmUniDirDlBearerCfg));
-           lcCfg->u.umUniDirDlCfg = NULLP;
-         }
-         break;
-      }
-      default:
-         DU_LOG("\nERROR  -->  DU_APP: Invalid Rlc Mode %d at freeRlcLcCfg()", lcCfg->rlcMode);
-        break;
+   macCellGrpCfg->tag_Config = NULLP;
+   DU_ALLOC(macCellGrpCfg->tag_Config, sizeof(struct TAG_Config));
+   if(!macCellGrpCfg->tag_Config)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacCellGrpCfg");
+      return RFAILED;
+   }
+
+   if(BuildTagConfig(ueCb, macCellGrpCfg->tag_Config) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP : BuildTagConfig failed");
+      return RFAILED;
+   }
+
+   macCellGrpCfg->phr_Config = NULLP;
+   DU_ALLOC(macCellGrpCfg->phr_Config, sizeof(struct MAC_CellGroupConfig__phr_Config));
+   if(!macCellGrpCfg->phr_Config)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacCellGrpCfg");
+      return RFAILED;
+   }
+
+   if(BuildPhrConfig(ueCb, macCellGrpCfg->phr_Config) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP : BuildPhrConfig failed");
+      return RFAILED;
    }
-   memset(lcCfg, 0, sizeof(LcCfg));
+
+   macCellGrpCfg->skipUplinkTxDynamic = false;
+   macCellGrpCfg->ext1 = NULLP;
+
+   return ROK;
 }
 /*******************************************************************
  *
- * @brief Function to free MacLcCfg
+ * @brief Frees memeory allocated for SearchSpcToAddModList
  *
  * @details
  *
- *    Function : freeMacLcCfg
+ *    Function : FreeSearchSpcToAddModList
  *
- *    Functionality: Function to free MacLcCfg
+ *    Functionality: Deallocating memory of SearchSpcToAddModList
+ *
+ * @params[in] struct PDCCH_Config__searchSpacesToAddModList *searchSpcList
  *
- * @params[in] LcCfg *lcCfg,
  * @return void
  *
- * ****************************************************************/
-
-void  freeMacLcCfg(LcCfg *lcCfg)
+ 4221 * ****************************************************************/
+void FreeSearchSpcToAddModList(struct PDCCH_Config__searchSpacesToAddModList *searchSpcList)
 {
-    /* Deleting DRBQOS */
-   if(lcCfg->drbQos)
+   uint8_t idx1=0;
+   uint8_t idx2=0;
+   struct  SearchSpace *searchSpc=NULLP;
+
+   if(searchSpcList->list.array)
    {
-      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->drbQos, sizeof(DrbQosInfo));
-      lcCfg->drbQos = NULLP;
+      if(searchSpcList->list.array[idx2])
+      {
+        searchSpc = searchSpcList->list.array[idx2];
+        if(searchSpc->controlResourceSetId)
+        {
+           if(searchSpc->monitoringSlotPeriodicityAndOffset)
+           {
+              if(searchSpc->monitoringSymbolsWithinSlot)
+              {
+                 if(searchSpc->monitoringSymbolsWithinSlot->buf)
+                 {
+                    if(searchSpc->nrofCandidates)
+                    {
+                       if(searchSpc->searchSpaceType)
+                       {
+                          DU_FREE(searchSpc->searchSpaceType->choice.ue_Specific,\
+                                sizeof(struct SearchSpace__searchSpaceType__ue_Specific));
+                          DU_FREE(searchSpc->searchSpaceType, sizeof(struct
+                                   SearchSpace__searchSpaceType));
+                       }
+                       DU_FREE(searchSpc->nrofCandidates,
+                             sizeof(struct SearchSpace__nrofCandidates));
+                    }
+                    DU_FREE(searchSpc->monitoringSymbolsWithinSlot->buf, \
+                          searchSpc->monitoringSymbolsWithinSlot->size);
+                 }
+                 DU_FREE(searchSpc->monitoringSymbolsWithinSlot,
+                       sizeof(BIT_STRING_t));
+              }
+              DU_FREE(searchSpc->monitoringSlotPeriodicityAndOffset, \
+                    sizeof(struct SearchSpace__monitoringSlotPeriodicityAndOffset));
+           }
+           DU_FREE(searchSpc->controlResourceSetId,
+                 sizeof(ControlResourceSetId_t));
+        }
+      }
+      for(idx1 = 0; idx1 < searchSpcList->list.count; idx1++)
+      {
+        DU_FREE(searchSpcList->list.array[idx1],
+              sizeof(struct SearchSpace));
+      }
+      DU_FREE(searchSpcList->list.array,searchSpcList->list.size);
    }
-   /* Deleting SNSSAI */
-   if(lcCfg->snssai)
+}
+/*******************************************************************
+ *
+ * @brief Frees memory allocated for PdschTimeDomAllocList
+ *
+ * @details
+ *
+ *    Function : FreePdschTimeDomAllocList
+ *
+ *    Functionality: Deallocating memory of PdschTimeDomAllocList
+ *
+ * @params[in] struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList
+ *
+ * @return void
+ *
+ * ****************************************************************/
+void FreePdschTimeDomAllocList( struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList)
+{
+   uint8_t idx1=0;
+
+   if(timeDomAllocList->choice.setup)
    {
-      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->snssai, sizeof(Snssai));
-      lcCfg->snssai = NULLP;
+      if(timeDomAllocList->choice.setup->list.array)
+      {
+         for(idx1 = 0; idx1 <timeDomAllocList->choice.setup->list.count ; idx1++)
+         {
+            DU_FREE(timeDomAllocList->choice.setup->list.array[idx1]->k0, sizeof(long));
+            DU_FREE(timeDomAllocList->choice.setup->list.array[idx1],
+                  sizeof(struct PDSCH_TimeDomainResourceAllocation));
+         }
+         DU_FREE(timeDomAllocList->choice.setup->list.array, \
+               timeDomAllocList->choice.setup->list.size);
+      }
+      DU_FREE(timeDomAllocList->choice.setup,\
+            sizeof(struct PDSCH_TimeDomainResourceAllocationList));
    }
-   memset(lcCfg, 0, sizeof(LcCfg));
 }
 /*******************************************************************
  *
- * @brief Free UE NR Capability received in UE Context setup request
+ * @brief Frees memory allocated for PuschTimeDomAllocList
  *
- * @details
+ *@details
  *
- *    Function : freeAperDecodeUeNrCapability
+ *    Function : FreePuschTimeDomAllocList
  *
- *    Functionality:  
- *       Free UE NR Capability received in UE Context setup request
+ *    Functionality: Deallocating memory of PuschTimeDomAllocList
  *
- * @params[in] 
- * @return ROK     - success
- *         RFAILED - failure
+ * @params[in] PUSCH_Config_t *puschCfg
+ *
+ * @return void
  *
  * ****************************************************************/
-void freeAperDecodeUeNrCapability(void *ueNrCapability)
+void FreePuschTimeDomAllocList(PUSCH_Config_t *puschCfg)
 {
-   uint8_t arrIdx =0;
-   FeatureSets_t *featureSets =NULLP;
-   UE_NR_Capability_t *ueNrCap = (UE_NR_Capability_t *)ueNrCapability;
+   uint8_t rsrcListIdx=0;
+   struct PUSCH_Config__pusch_TimeDomainAllocationList *timeDomAllocList_t=NULLP;
 
-   if(ueNrCap->rf_Parameters.supportedBandListNR.list.array)
+   if(puschCfg->pusch_TimeDomainAllocationList)
    {
-      for(arrIdx = 0; arrIdx < ueNrCap->rf_Parameters.supportedBandListNR.list.count; arrIdx++)
+      timeDomAllocList_t=puschCfg->pusch_TimeDomainAllocationList;
+      if(timeDomAllocList_t->choice.setup)
       {
-         if(ueNrCap->rf_Parameters.supportedBandListNR.list.array[arrIdx])
-            free(ueNrCap->rf_Parameters.supportedBandListNR.list.array[arrIdx]);
+         if(timeDomAllocList_t->choice.setup->list.array)
+         {
+            for(rsrcListIdx = 0; rsrcListIdx<timeDomAllocList_t->choice.setup->list.count; rsrcListIdx++)
+            {
+               DU_FREE(timeDomAllocList_t->choice.setup->list.array[rsrcListIdx]->k2, sizeof(long));
+               DU_FREE(timeDomAllocList_t->choice.setup->list.array[rsrcListIdx],\
+                     sizeof(PUSCH_TimeDomainResourceAllocation_t));
+            }
+            DU_FREE(timeDomAllocList_t->choice.setup->list.array, \
+                  timeDomAllocList_t->choice.setup->list.size);
+         }
+         DU_FREE(timeDomAllocList_t->choice.setup, \
+               sizeof(struct PUSCH_TimeDomainResourceAllocationList));
       }
-      free(ueNrCap->rf_Parameters.supportedBandListNR.list.array);
+      DU_FREE(puschCfg->transformPrecoder, sizeof(long));
+      DU_FREE(puschCfg->pusch_TimeDomainAllocationList, \
+            sizeof(struct PUSCH_Config__pusch_TimeDomainAllocationList));
    }
 
-   if(ueNrCap->featureSets)
+}
+
+/*******************************************************************
+ *
+ * @brief Frees memory allocated for Dedicated PUCCH config
+ *
+ * @details
+ *
+ *    Function : FreeBWPUlDedPucchCfg
+ *
+ *    Functionality: Deallocating memory of Dedicated PUCCH cfg
+ *
+ * @params[in] BWP_UplinkDedicated__pucch_Config *ulBwpPucchCfg
+ *
+ * @return void
+ *
+ * ****************************************************************/
+void FreeBWPUlDedPucchCfg(struct BWP_UplinkDedicated__pucch_Config *ulBwpPucchCfg)
+{
+   uint8_t k1Idx, rsrcIdx, rsrcSetIdx;
+   PUCCH_Config_t *pucchCfg = NULLP;
+   PUCCH_ResourceSet_t *rsrcSet = NULLP;
+   PUCCH_Resource_t *rsrc = NULLP;
+
+   if(ulBwpPucchCfg)
    {
-      featureSets = ueNrCap->featureSets;
-      if(featureSets->featureSetsDownlinkPerCC)
+      if(ulBwpPucchCfg->choice.setup)
       {
-         if(featureSets->featureSetsDownlinkPerCC->list.array)
+         pucchCfg = ulBwpPucchCfg->choice.setup;
+
+         //Free resource set list
+         if(pucchCfg->resourceSetToAddModList)
          {
-            for(arrIdx = 0; arrIdx < featureSets->featureSetsDownlinkPerCC->list.count; arrIdx++)
+            if(pucchCfg->resourceSetToAddModList->list.array)
             {
-               if(featureSets->featureSetsDownlinkPerCC->list.array[arrIdx])
+               for(rsrcSetIdx=0; rsrcSetIdx < pucchCfg->resourceSetToAddModList->list.count; rsrcSetIdx++)
                {
-                  if(featureSets->featureSetsDownlinkPerCC->list.array[arrIdx]->supportedModulationOrderDL)
-                     free(featureSets->featureSetsDownlinkPerCC->list.array[arrIdx]->supportedModulationOrderDL);
-                  free(featureSets->featureSetsDownlinkPerCC->list.array[arrIdx]);
+                  rsrcSet = pucchCfg->resourceSetToAddModList->list.array[rsrcSetIdx];
+                  if(rsrcSet->resourceList.list.array)
+                  {
+                     for(rsrcIdx=0; rsrcIdx < rsrcSet->resourceList.list.count; rsrcIdx++)
+                     {
+                        DU_FREE(rsrcSet->resourceList.list.array[rsrcIdx], sizeof(PUCCH_ResourceId_t));
+                     }
+                     DU_FREE(rsrcSet->resourceList.list.array, rsrcSet->resourceList.list.size);
+                  }
+                  DU_FREE(pucchCfg->resourceSetToAddModList->list.array[rsrcSetIdx], sizeof(PUCCH_ResourceSet_t));
                }
+               DU_FREE(pucchCfg->resourceSetToAddModList->list.array, pucchCfg->resourceSetToAddModList->list.size);
             }
-            free(featureSets->featureSetsDownlinkPerCC->list.array);
+            DU_FREE(pucchCfg->resourceSetToAddModList, sizeof(struct PUCCH_Config__resourceSetToAddModList));
          }
-         free(featureSets->featureSetsDownlinkPerCC);
-      }
-      if(featureSets->featureSetsUplinkPerCC)
-      {
-         if(featureSets->featureSetsUplinkPerCC->list.array)
+
+         //Free resource list
+         if(pucchCfg->resourceToAddModList)
          {
-            for(arrIdx = 0; arrIdx < featureSets->featureSetsUplinkPerCC->list.count; arrIdx++)
+            if(pucchCfg->resourceToAddModList->list.array)
             {
-               if(featureSets->featureSetsUplinkPerCC->list.array[arrIdx])
+               for(rsrcIdx=0; rsrcIdx < pucchCfg->resourceToAddModList->list.count; rsrcIdx++)
                {
-                  if(featureSets->featureSetsUplinkPerCC->list.array[arrIdx]->supportedModulationOrderUL)
-                     free(featureSets->featureSetsUplinkPerCC->list.array[arrIdx]->supportedModulationOrderUL);
-                  free(featureSets->featureSetsUplinkPerCC->list.array[arrIdx]);
+                  rsrc = pucchCfg->resourceToAddModList->list.array[rsrcIdx];
+                  DU_FREE(rsrc->format.choice.format1, sizeof(PUCCH_format1_t));
+                  DU_FREE(pucchCfg->resourceToAddModList->list.array[rsrcIdx], sizeof(PUCCH_Resource_t));
                }
+               DU_FREE(pucchCfg->resourceToAddModList->list.array, pucchCfg->resourceToAddModList->list.size);
             }
-            free(featureSets->featureSetsUplinkPerCC->list.array);
+            DU_FREE(pucchCfg->resourceToAddModList, sizeof(struct PUCCH_Config__resourceToAddModList));
          }
-         free(featureSets->featureSetsUplinkPerCC);
+
+         //PUCCH Format 1
+         if(pucchCfg->format1)
+         {
+            if(pucchCfg->format1->choice.setup)
+            {
+               DU_FREE(pucchCfg->format1->choice.setup->nrofSlots, sizeof(long));
+               DU_FREE(pucchCfg->format1->choice.setup, sizeof(PUCCH_FormatConfig_t));
+            }
+            DU_FREE(pucchCfg->format1, sizeof(struct PUCCH_Config__format1));
+         }
+         
+         //DL DATA TO UL ACK
+         if(pucchCfg->dl_DataToUL_ACK)
+         {
+            if(pucchCfg->dl_DataToUL_ACK->list.array)
+            {
+               for(k1Idx = 0; k1Idx <  pucchCfg->dl_DataToUL_ACK->list.count; k1Idx++)
+               {
+                  DU_FREE(pucchCfg->dl_DataToUL_ACK->list.array[k1Idx], sizeof(long));
+               }
+               DU_FREE(pucchCfg->dl_DataToUL_ACK->list.array, pucchCfg->dl_DataToUL_ACK->list.size);
+            }
+            DU_FREE(pucchCfg->dl_DataToUL_ACK, sizeof(struct PUCCH_Config__dl_DataToUL_ACK));
+         }
+
+         DU_FREE(ulBwpPucchCfg->choice.setup, sizeof(PUCCH_Config_t));
       }
-      free(ueNrCap->featureSets);
-   }   
+      DU_FREE(ulBwpPucchCfg, sizeof(struct BWP_UplinkDedicated__pucch_Config));
+   }
 }
 
 /*******************************************************************
-*
-* @brief Function to free PdcchSearchSpcToAddModList
-         where memory allocated by aper_decoder
-*
-* @details
-*
-*    Function : freeAperDecodePdcchSearchSpcToAddModList 
-*
-*    Functionality: Function to free PdcchSearchSpcToAddModList
-*
-* @params[in] struct PDCCH_Config__searchSpacesToAddModList *searchSpcList
-* @return void
-*
-* ****************************************************************/
-
-void freeAperDecodePdcchSearchSpcToAddModList(struct PDCCH_Config__searchSpacesToAddModList *searchSpcList)
+ *
+ * @brief Frees memory allocated for InitialUlBWP
+ *
+ * @details
+ *
+ *    Function : FreeInitialUlBWP
+ *
+ *    Functionality: Deallocating memory of InitialUlBWP
+ *
+ * @params[in] BWP_UplinkDedicated_t *ulBwp
+ *
+ * @return void
+ *
+ * ****************************************************************/
+void FreeInitialUlBWP(BWP_UplinkDedicated_t *ulBwp)
 {
-   uint8_t searchSpcArrIdx=0;
-   uint8_t searchSpcArrIdx1=0;
-   struct  SearchSpace *searchSpc=NULLP;
+   uint8_t  rSetIdx, rsrcIdx;
+   SRS_Config_t   *srsCfg = NULLP;
+   PUSCH_Config_t *puschCfg = NULLP;
+   struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA *dmrsUlCfg = NULLP;
+   struct SRS_Config__srs_ResourceSetToAddModList *rsrcSetList = NULLP;
+   struct SRS_ResourceSet__srs_ResourceIdList *rsrcIdList = NULLP;
+   struct SRS_Config__srs_ResourceToAddModList *resourceList = NULLP;
 
+   FreeBWPUlDedPucchCfg(ulBwp->pucch_Config);
 
-   if(searchSpcList->list.array)
+   if(ulBwp->pusch_Config)
    {
-      if(searchSpcList->list.array[searchSpcArrIdx1])
+      if(ulBwp->pusch_Config->choice.setup)
       {
-        searchSpc = searchSpcList->list.array[searchSpcArrIdx1];
-        if(searchSpc->controlResourceSetId)
-        {
-           if(searchSpc->monitoringSlotPeriodicityAndOffset)
-           {
-              if(searchSpc->monitoringSymbolsWithinSlot)
-              {
-                 if(searchSpc->monitoringSymbolsWithinSlot->buf)
-                 {
-                    if(searchSpc->nrofCandidates)
-                    {
-                       if(searchSpc->searchSpaceType)
-                       {
-                          free(searchSpc->searchSpaceType->choice.ue_Specific);
-                          free(searchSpc->searchSpaceType);
-                       }
-                       free(searchSpc->nrofCandidates);
-                    }
-                    free(searchSpc->monitoringSymbolsWithinSlot->buf);
-                 }
-                 free(searchSpc->monitoringSymbolsWithinSlot);
-              }
-              free(searchSpc->monitoringSlotPeriodicityAndOffset);
-           }
-           free(searchSpc->controlResourceSetId);
-        }
+         puschCfg=ulBwp->pusch_Config->choice.setup;
+         if(puschCfg->dataScramblingIdentityPUSCH)
+         {
+            if(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA)
+            {
+               FreePuschTimeDomAllocList(puschCfg);
+               dmrsUlCfg=puschCfg->dmrs_UplinkForPUSCH_MappingTypeA;
+               if(dmrsUlCfg->choice.setup)
+               {
+                  if(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition)
+                  {
+                     if(dmrsUlCfg->choice.setup->transformPrecodingDisabled)
+                     {
+                        DU_FREE(dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0,\
+                              sizeof(long));
+                        DU_FREE(dmrsUlCfg->choice.setup->transformPrecodingDisabled,
+                              sizeof(struct DMRS_UplinkConfig__transformPrecodingDisabled));
+                     }
+                     DU_FREE(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition,
+                           sizeof(long));
+                  }
+                  DU_FREE(dmrsUlCfg->choice.setup,sizeof(DMRS_UplinkConfig_t));
+               }
+               DU_FREE(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA, \
+                     sizeof(struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA));
+            }
+            DU_FREE(puschCfg->dataScramblingIdentityPUSCH, sizeof(long));
+         }
+         DU_FREE(ulBwp->pusch_Config->choice.setup, sizeof(PUSCH_Config_t));
       }
-      for(searchSpcArrIdx = 0; searchSpcArrIdx < searchSpcList->list.count; searchSpcArrIdx++)
+      DU_FREE(ulBwp->pusch_Config, sizeof(struct BWP_UplinkDedicated__pusch_Config));
+
+      /* Free SRS-Config */
+      if(ulBwp->srs_Config)
       {
-        free(searchSpcList->list.array[searchSpcArrIdx]);
-      }
-      free(searchSpcList->list.array);
-   }
-}
-/*******************************************************************
-*
-* @brief Function for free part for the memory allocated by aper_decoder
-* 
-* @details
-*
-*    Function : freeAperDecodeBWPDlDedPdcchConfig
-*
-*    Functionality: Function to free BWPDlDedPdcchConfig
-*
-* @params[in] 
-* @return void
-*
-* ****************************************************************/
+         if(ulBwp->srs_Config->choice.setup)
+         {
+            srsCfg = ulBwp->srs_Config->choice.setup;
 
+            /* Free Resource Set to add/mod list */
+            if(srsCfg->srs_ResourceSetToAddModList)
+            {
+               rsrcSetList = srsCfg->srs_ResourceSetToAddModList;
+               if(rsrcSetList->list.array)
+               {
+                  rSetIdx = 0;
 
-void freeAperDecodeBWPDlDedPdcchConfig(BWP_DownlinkDedicated_t *dlBwp)
-{
-   uint8_t arrIdx1=0;
-   uint8_t arrIdx2=0;
-   struct PDCCH_Config *pdcchCfg=NULLP;
-   struct ControlResourceSet *controlRSet=NULLP;
-   struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList=NULLP;
-   
-   if(dlBwp->pdcch_Config->choice.setup)
-   {
-      pdcchCfg=dlBwp->pdcch_Config->choice.setup;
-      if(pdcchCfg->controlResourceSetToAddModList)
-      {
-        controlRSetList = pdcchCfg->controlResourceSetToAddModList;
-        if(controlRSetList->list.array)
-        {
-           controlRSet = controlRSetList->list.array[arrIdx2];
-           if(controlRSet)
-           {
-              if(controlRSet->frequencyDomainResources.buf)
-              {
-                 if(controlRSet->pdcch_DMRS_ScramblingID)
-                 {
-                    if(pdcchCfg->searchSpacesToAddModList)
-                    {
-                       freeAperDecodePdcchSearchSpcToAddModList(pdcchCfg->searchSpacesToAddModList);
-                       free(pdcchCfg->searchSpacesToAddModList);
-                    }
-                    free(controlRSet->pdcch_DMRS_ScramblingID);
-                 }
-                 free(controlRSet->frequencyDomainResources.buf);
-              }
-           }
-           for(arrIdx1 = 0; arrIdx1 <controlRSetList->list.count; arrIdx1++)
-           {
-              free(controlRSetList->list.array[arrIdx1]);
-           }
-           free(controlRSetList->list.array);
-        }
-        free(pdcchCfg->controlResourceSetToAddModList);
+                  /* Free SRS resource Id list in this SRS resource set */
+                  if(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList)
+                  {
+                     rsrcIdList = rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList;
+
+                     if(rsrcIdList->list.array)
+                     {
+                        for(rsrcIdx = 0; rsrcIdx < rsrcIdList->list.count; rsrcIdx++)
+                        {
+                           DU_FREE(rsrcIdList->list.array[rsrcIdx], sizeof(SRS_ResourceId_t));
+                        }
+                        DU_FREE(rsrcIdList->list.array, rsrcIdList->list.size);
+                     }
+                     DU_FREE(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList,\
+                           sizeof(struct SRS_ResourceSet__srs_ResourceIdList));
+                  }
+
+                  /* Free resource type info for this SRS resource set */
+                  DU_FREE(rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic, \
+                        sizeof(struct SRS_ResourceSet__resourceType__aperiodic));
+
+                  /* Free memory for each resource set */
+                  for(rSetIdx = 0; rSetIdx < rsrcSetList->list.count; rSetIdx++)
+                  {
+                     DU_FREE(rsrcSetList->list.array[rSetIdx], sizeof(SRS_ResourceSet_t));
+                  }
+                  DU_FREE(rsrcSetList->list.array, rsrcSetList->list.size); 
+               }
+               DU_FREE(srsCfg->srs_ResourceSetToAddModList, \
+                     sizeof(struct SRS_Config__srs_ResourceSetToAddModList));
+            }
+
+            /* Free resource to add/modd list */
+            if(srsCfg->srs_ResourceToAddModList)
+            {
+               resourceList = srsCfg->srs_ResourceToAddModList;
+               if(resourceList->list.array)
+               {
+                  rsrcIdx = 0;
+                  DU_FREE(resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2,\
+                        sizeof(struct SRS_Resource__transmissionComb__n2));
+                  DU_FREE(resourceList->list.array[rsrcIdx]->resourceType.choice.aperiodic,\
+                        sizeof(struct SRS_Resource__resourceType__aperiodic));
+
+                  for(rsrcIdx = 0; rsrcIdx < resourceList->list.count; rsrcIdx++)
+                  {
+                     DU_FREE(resourceList->list.array[rsrcIdx], sizeof(SRS_Resource_t));
+                  }
+                  DU_FREE(resourceList->list.array, resourceList->list.size);
+               }
+               DU_FREE(srsCfg->srs_ResourceToAddModList, \
+                     sizeof(struct SRS_Config__srs_ResourceToAddModList));
+            }
+
+            DU_FREE(ulBwp->srs_Config->choice.setup, sizeof(SRS_Config_t));
+         }
+         DU_FREE(ulBwp->srs_Config, sizeof(struct BWP_UplinkDedicated__srs_Config));
       }
-      free(dlBwp->pdcch_Config->choice.setup);
    }
-}
+}      
 /*******************************************************************
-*
-* @brief Function to free PdschTimeDomAllocationList 
-*     where the memory allocated by aper_decoder
-* 
-* @details
-*
-*    Function : freeAperDecodePdschTimeDomAllocationList
-*
-*    Functionality: Function to free PdschTimeDomAllocationList
-*
-* @params[in] struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList 
-* @return void
-*
-* ****************************************************************/
-
-
-void freeAperDecodePdschTimeDomAllocationList( struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList)
+ *
+ * @brief Frees memory allocated for initialUplinkBWP
+ *
+ * @details
+ *
+ *    Function : FreeinitialUplinkBWP
+ *
+ *    Functionality: Deallocating memory of initialUplinkBWP
+ *
+ * @params[in] UplinkConfig_t *ulCfg
+ *
+ * @return void
+ *         
+ *
+ * ****************************************************************/
+void FreeinitialUplinkBWP(UplinkConfig_t *ulCfg)
 {
-   uint8_t arrIdx=0;
+   BWP_UplinkDedicated_t *ulBwp=NULLP; 
+   struct UplinkConfig__pusch_ServingCellConfig *puschCfg=NULLP;
 
-   if(timeDomAllocList->choice.setup)
+   if(ulCfg->initialUplinkBWP)
    {
-      if(timeDomAllocList->choice.setup->list.array)
+      ulBwp=ulCfg->initialUplinkBWP;
+      if(ulCfg->firstActiveUplinkBWP_Id)
       {
-        for(arrIdx = 0; arrIdx <timeDomAllocList->choice.setup->list.count ; arrIdx++)
+        if(ulCfg->pusch_ServingCellConfig)
         {
-           free(timeDomAllocList->choice.setup->list.array[arrIdx]);
+           puschCfg=ulCfg->pusch_ServingCellConfig;
+           if(puschCfg->choice.setup)
+           {
+              if(puschCfg->choice.setup->ext1)
+              {
+                 DU_FREE(puschCfg->choice.setup->ext1->\
+                       processingType2Enabled,sizeof(BOOLEAN_t));
+                 DU_FREE(puschCfg->choice.setup->ext1->\
+                       maxMIMO_Layers,sizeof(long));
+                 DU_FREE(puschCfg->choice.setup->ext1, \
+                       sizeof(struct PUSCH_ServingCellConfig__ext1));
+              }
+              DU_FREE(puschCfg->choice.setup, sizeof(struct PUSCH_ServingCellConfig));
+           }
+           DU_FREE(ulCfg->pusch_ServingCellConfig, sizeof(struct UplinkConfig__pusch_ServingCellConfig));
         }
-        free(timeDomAllocList->choice.setup->list.array);
+        DU_FREE(ulCfg->firstActiveUplinkBWP_Id, sizeof(BWP_Id_t));
       }
-      free(timeDomAllocList->choice.setup);
+      FreeInitialUlBWP(ulBwp);
+      DU_FREE(ulCfg->initialUplinkBWP, sizeof(BWP_UplinkDedicated_t));
    }
 }
-
 /*******************************************************************
-*
-* @brief Function to free BWPDlDedPdschConfig 
-*        where the memory allocated by aper_decoder
-*  
-* @details
-*
-*    Function : freeAperDecodeBWPDlDedPdschConfig 
-*
-*    Functionality: Function to free BWPDlDedPdschConfig 
-*
-* @params[in] BWP_DownlinkDedicated_t *dlBwp 
-* @return void
-*
-* ****************************************************************/
-
-
-void freeAperDecodeBWPDlDedPdschConfig(BWP_DownlinkDedicated_t *dlBwp)
+ *
+ * @brief Frees emmory allocated for BWPDlDedPdschCfg
+ *
+ * @details
+ *
+ *    Function : FreeBWPDlDedPdschCfg
+ *
+ *    Functionality: Deallocating memory of BWPDlDedPdschCfg
+ *
+ * @params[in] BWP_DownlinkDedicated_t *dlBwp
+ *
+ * @return void
+ *
+ *
+ * ****************************************************************/
+void FreeBWPDlDedPdschCfg(BWP_DownlinkDedicated_t *dlBwp)
 {
    struct PDSCH_Config *pdschCfg=NULLP;
    struct PDSCH_Config__prb_BundlingType *prbBndlType=NULLP;
@@ -6295,1117 +6844,2301 @@ void freeAperDecodeBWPDlDedPdschConfig(BWP_DownlinkDedicated_t *dlBwp)
            if(pdschCfg->maxNrofCodeWordsScheduledByDCI)
            {
               prbBndlType=&pdschCfg->prb_BundlingType;
-              free(prbBndlType->choice.staticBundling);
-              free(pdschCfg->maxNrofCodeWordsScheduledByDCI);
+              DU_FREE(prbBndlType->choice.staticBundling,\
+                    sizeof(struct PDSCH_Config__prb_BundlingType__staticBundling));
+              DU_FREE(pdschCfg->maxNrofCodeWordsScheduledByDCI, sizeof(long));
            }
-           freeAperDecodePdschTimeDomAllocationList(timeDomAllocList);
-           free(pdschCfg->pdsch_TimeDomainAllocationList);
+           FreePdschTimeDomAllocList(timeDomAllocList);
+           DU_FREE(pdschCfg->pdsch_TimeDomainAllocationList, \
+                 sizeof(struct PDSCH_Config__pdsch_TimeDomainAllocationList));
         }
         dmrsDlCfg=pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA;
         if(dmrsDlCfg->choice.setup)
         {
-           free(dmrsDlCfg->choice.setup->dmrs_AdditionalPosition);
-           free(dmrsDlCfg->choice.setup);
+           DU_FREE(dmrsDlCfg->choice.setup->dmrs_AdditionalPosition,
+                 sizeof(long));
+           DU_FREE(dmrsDlCfg->choice.setup, sizeof(struct DMRS_DownlinkConfig));
         }
-        free(pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA);
+        DU_FREE(pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA, \
+              sizeof(struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA));
       }
-      free(dlBwp->pdsch_Config->choice.setup);
+      DU_FREE(dlBwp->pdsch_Config->choice.setup, sizeof(struct PDSCH_Config));
    }
 }
 /*******************************************************************
-*
-* @brief Function to free PuschTimeDomAllocListCfg
-                 where the memory allocated by aper_decoder
-*
-* @details
-*
-*    Function : freeAperDecodePuschTimeDomAllocListCfg
-*
-*    Functionality: Function to free PuschTimeDomAllocListCfg
-*
-* @params[in] PUSCH_Config_t *puschCfg 
-* @return void
-*
-* ****************************************************************/
-
-
-void freeAperDecodePuschTimeDomAllocListCfg(PUSCH_Config_t *puschCfg)
+ *
+ * @brief Frees emmory allocated for BWPDlDedPdcchCfg
+ *
+ * @details
+ *
+ *    Function : FreeBWPDlDedPdcchCfg
+ *
+ *    Functionality: Deallocating memory of BWPDlDedPdcchCfg
+ *
+ * @params[in] BWP_DownlinkDedicated_t *dlBwp
+ *
+ * @return void
+ *         
+ *
+ * ****************************************************************/
+void FreeBWPDlDedPdcchCfg(BWP_DownlinkDedicated_t *dlBwp)
 {
-   uint8_t arrIdx=0;
-   uint8_t arrIdx1=0;
-   struct PUSCH_Config__pusch_TimeDomainAllocationList *timeDomAllocList_t=NULLP;
+   uint8_t idx1=0;
+   uint8_t idx2=0;
+   struct PDCCH_Config *pdcchCfg=NULLP;
+   struct ControlResourceSet *controlRSet=NULLP;
+   struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList=NULLP;
 
-   if(puschCfg->pusch_TimeDomainAllocationList)
+   if(dlBwp->pdcch_Config->choice.setup)
    {
-      timeDomAllocList_t=puschCfg->pusch_TimeDomainAllocationList;
-      if(timeDomAllocList_t->choice.setup)
+      pdcchCfg=dlBwp->pdcch_Config->choice.setup;
+      if(pdcchCfg->controlResourceSetToAddModList)
       {
-        if(timeDomAllocList_t->choice.setup->list.array)
+        controlRSetList = pdcchCfg->controlResourceSetToAddModList;
+        if(controlRSetList->list.array)
         {
-           free(timeDomAllocList_t->choice.setup->list.array[arrIdx1]->k2);
-           for(arrIdx = 0; arrIdx<timeDomAllocList_t->choice.setup->list.count; arrIdx++)
-           {
-              free(timeDomAllocList_t->choice.setup->list.array[arrIdx]);
-           }
-           free(timeDomAllocList_t->choice.setup->list.array);
-        }
-        free(timeDomAllocList_t->choice.setup);
-      }
-      free(puschCfg->transformPrecoder);
-      free(puschCfg->pusch_TimeDomainAllocationList);
-   }
-}
-/*******************************************************************
-*
-* @brief Function to free InitialUlBWPConfig where memory allocated by aper_decoder
-*
-* @details
-*
-*    Function : freeAperDecodeInitialUlBWPConfig 
-*
-*    Functionality: Function to free InitialUlBWPConfig
-*
-* @params[in]  BWP_UplinkDedicated_t *ulBwp
-* @return void
-*
-* ****************************************************************/
-
-
-void freeAperDecodeInitialUlBWPConfig(BWP_UplinkDedicated_t *ulBwp)
-{
-   uint8_t  rSetIdx =0;
-   uint8_t  rsrcIdx =0;
-   SRS_Config_t   *srsCfg = NULLP;
-   PUSCH_Config_t *puschCfg = NULLP;
-   struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA *dmrsUlCfg = NULLP;
-   struct SRS_Config__srs_ResourceSetToAddModList *rsrcSetList = NULLP;
-   struct SRS_ResourceSet__srs_ResourceIdList *rsrcIdList = NULLP;
-   struct SRS_Config__srs_ResourceToAddModList *resourceList = NULLP;
-
-   if(ulBwp->pusch_Config)
-   {
-      if(ulBwp->pusch_Config->choice.setup)
-      {
-        puschCfg=ulBwp->pusch_Config->choice.setup;
-        if(puschCfg->dataScramblingIdentityPUSCH)
-        {
-           if(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA)
-           {
-              freeAperDecodePuschTimeDomAllocListCfg(puschCfg);
-              dmrsUlCfg=puschCfg->dmrs_UplinkForPUSCH_MappingTypeA;
-              if(dmrsUlCfg->choice.setup)
-              {
-                 if(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition)
-                 {
-                    if(dmrsUlCfg->choice.setup->transformPrecodingDisabled)
-                    {
-                       free(dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0);
-                       free(dmrsUlCfg->choice.setup->transformPrecodingDisabled);
-                    }
-                    free(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition);
-                 }
-                 free(dmrsUlCfg->choice.setup);
-              }
-              free(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA);
-           }
-           free(puschCfg->dataScramblingIdentityPUSCH);
-        }
-        free(ulBwp->pusch_Config->choice.setup);
-      }
-      free(ulBwp->pusch_Config);
-
-      /* Free SRS-Config */
-      if(ulBwp->srs_Config)
-      {
-        if(ulBwp->srs_Config->choice.setup)
-        {
-           srsCfg = ulBwp->srs_Config->choice.setup;
-
-           /* Free Resource Set to add/mod list */
-           if(srsCfg->srs_ResourceSetToAddModList)
+           controlRSet = controlRSetList->list.array[idx2];
+           if(controlRSet)
            {
-              rsrcSetList = srsCfg->srs_ResourceSetToAddModList;
-              if(rsrcSetList->list.array)
+              if(controlRSet->frequencyDomainResources.buf)
               {
-                 rSetIdx = 0;
-
-                 /* Free SRS resource Id list in this SRS resource set */
-                 if(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList)
+                 if(controlRSet->pdcch_DMRS_ScramblingID)
                  {
-                    rsrcIdList =
-                       rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList;
-
-                    if(rsrcIdList->list.array)
+                    if(pdcchCfg->searchSpacesToAddModList)
                     {
-                       for(rsrcIdx = 0; rsrcIdx < rsrcIdList->list.count;
-                             rsrcIdx++)
-                       {
-                          free(rsrcIdList->list.array[rsrcIdx]);
-                       }
-                       free(rsrcIdList->list.array);
+                       FreeSearchSpcToAddModList(pdcchCfg->searchSpacesToAddModList);
+                       DU_FREE(pdcchCfg->searchSpacesToAddModList, \
+                             sizeof(struct PDCCH_Config__searchSpacesToAddModList));
                     }
-                    free(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList);
-                 }
-
-                 /* Free resource type info for this SRS resource set */
-
-                 free(rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic);
-
-                 /* Free memory for each resource set */
-                 for(rSetIdx = 0; rSetIdx < rsrcSetList->list.count; rSetIdx++)
-                 {
-                    free(rsrcSetList->list.array[rSetIdx]);
-                 }
-                 free(rsrcSetList->list.array);
-              }
-              free(srsCfg->srs_ResourceSetToAddModList);
-           }
-
-           /* Free resource to add/modd list */
-           if(srsCfg->srs_ResourceToAddModList)
-           {
-              resourceList = srsCfg->srs_ResourceToAddModList;
-              if(resourceList->list.array)
-              {
-                 rsrcIdx = 0;
-
-                 free(resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2);
-                 free(resourceList->list.array[rsrcIdx]->resourceType.choice.aperiodic);
-
-                 for(rsrcIdx = 0; rsrcIdx < resourceList->list.count; rsrcIdx++)
-                 {
-                    free(resourceList->list.array[rsrcIdx]);
+                    DU_FREE(controlRSet->pdcch_DMRS_ScramblingID, sizeof(long));
                  }
-                 free(resourceList->list.array);
+                 DU_FREE(controlRSet->frequencyDomainResources.buf, \
+                       controlRSet->frequencyDomainResources.size);
               }
-              free(srsCfg->srs_ResourceToAddModList);
            }
-
-           free(ulBwp->srs_Config->choice.setup);
-        }
-        free(ulBwp->srs_Config);
-      }
-   }
-}
-/*******************************************************************
-*
-* @brief Function to free initialUplinkBWPConfig where memory allocated by aper_decoder
-*
-* @details
-*
-*    Function : freeAperDecodeinitialUplinkBWPConfig
-*
-*    Functionality: Function to free initialUplinkBWPConfig
-*
-* @params[in] UplinkConfig_t *ulCfg 
-* @return void
-*
-* ****************************************************************/
-
-
-void freeAperDecodeinitialUplinkBWPConfig(UplinkConfig_t *ulCfg)
-{
-   BWP_UplinkDedicated_t *ulBwp=NULLP;
-   struct UplinkConfig__pusch_ServingCellConfig *puschCfg=NULLP;
-   
-   if(ulCfg->initialUplinkBWP)
-   {
-      ulBwp=ulCfg->initialUplinkBWP;
-      if(ulCfg->firstActiveUplinkBWP_Id)
-      {
-        if(ulCfg->pusch_ServingCellConfig)
-        {
-           puschCfg=ulCfg->pusch_ServingCellConfig;
-           if(puschCfg->choice.setup)
+           for(idx1 = 0; idx1 <controlRSetList->list.count; idx1++)
            {
-              if(puschCfg->choice.setup->ext1)
-              {
-                 free(puschCfg->choice.setup->ext1->processingType2Enabled);
-                 free(puschCfg->choice.setup->ext1->maxMIMO_Layers);
-                 free(puschCfg->choice.setup->ext1);
-              }
-              free(puschCfg->choice.setup);
+              DU_FREE(controlRSetList->list.array[idx1], sizeof(struct ControlResourceSet));
            }
-           free(ulCfg->pusch_ServingCellConfig);
+           DU_FREE(controlRSetList->list.array, controlRSetList->list.size);
         }
-        free(ulCfg->firstActiveUplinkBWP_Id);
+        DU_FREE(pdcchCfg->controlResourceSetToAddModList, \
+              sizeof(struct PDCCH_Config__controlResourceSetToAddModList));
       }
-      freeAperDecodeInitialUlBWPConfig(ulBwp);
-      free(ulCfg->initialUplinkBWP);
+      DU_FREE(dlBwp->pdcch_Config->choice.setup, sizeof(struct PDCCH_Config));
    }
-}
+}      
 
 /*******************************************************************
  *
- * @brief Function to free DuUeCfg
+ * @brief Frees emmory allocated for DUToCURRCContainer 
  *
  * @details
  *
- *    Function : freeDuUeCfg
+ *    Function : FreeMemDuToCuRrcCont
  *
- *    Functionality: Function to free DuUeCfg
+ *    Functionality: Deallocating memory of DuToCuRrcContainer
  *
- * @params[in] DuUeCfg *ueCfg
- * @return void
+ * @params[in] DuToCuRRCContainer, DuToCuRRCContainer
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
  *
  * ****************************************************************/
-void freeDuUeCfg(DuUeCfg *ueCfg)
+uint8_t FreeMemDuToCuRrcCont(CellGroupConfigRrc_t *cellGrpCfg)
 {
-   uint8_t lcIdx = 0;
-   uint8_t arrIdx = 0;
-   SpCellConfig_t *spCellCfg = NULLP;
-   ServingCellConfig_t *srvCellCfg = NULLP;
-   BWP_DownlinkDedicated_t *dlBwp = NULLP;
-   MAC_CellGroupConfig_t *macCellGrpCfg = NULLP;
-   PhysicalCellGroupConfig_t *phyCellGrpCfg = NULLP;
-   struct CellGroupConfigRrc__rlc_BearerToAddModList *rlcBearerList = NULLP;
-   struct RLC_Config *rlcConfig = NULLP;
-   struct LogicalChannelConfig *macLcConfig = NULLP;
-   struct SchedulingRequestConfig *schedulingRequestConfig = NULLP;
-   struct SchedulingRequestConfig__schedulingRequestToAddModList *schReqList = NULLP;
-   struct TAG_Config *tagConfig = NULLP;
-   struct TAG_Config__tag_ToAddModList *tagList = NULLP;
-   struct MAC_CellGroupConfig__phr_Config *phrConfig = NULLP;
-   struct ServingCellConfig__pdsch_ServingCellConfig *pdschCfg = NULLP;
-   CellGroupConfigRrc_t *cellGrpCfg = ueCfg->cellGrpCfg;
-  
-   if(ueCfg->ueNrCapability)
-   {
-      freeAperDecodeUeNrCapability(ueCfg->ueNrCapability);
-      DU_FREE(ueCfg->ueNrCapability, sizeof(UE_NR_Capability_t));
-      ueCfg->ueNrCapability = NULLP;
-   }
+   uint8_t idx=0;
+   SpCellConfig_t *spCellCfg=NULLP;
+   ServingCellConfig_t *srvCellCfg=NULLP;
+   BWP_DownlinkDedicated_t *dlBwp=NULLP;
+   MAC_CellGroupConfig_t *macCellGrpCfg=NULLP;
+   PhysicalCellGroupConfig_t *phyCellGrpCfg=NULLP;
+   struct CellGroupConfigRrc__rlc_BearerToAddModList *rlcBearerList=NULLP;
+   struct RLC_Config *rlcConfig=NULLP;
+   struct LogicalChannelConfig *macLcConfig=NULLP;
+   struct SchedulingRequestConfig *schedulingRequestConfig=NULLP;
+   struct SchedulingRequestConfig__schedulingRequestToAddModList *schReqList=NULLP;
+   struct TAG_Config *tagConfig=NULLP;
+   struct TAG_Config__tag_ToAddModList *tagList=NULLP;
+   struct MAC_CellGroupConfig__phr_Config *phrConfig=NULLP;
+   struct ServingCellConfig__pdsch_ServingCellConfig *pdschCfg=NULLP;
 
-   if(ueCfg->cellGrpCfg)
+   rlcBearerList = cellGrpCfg->rlc_BearerToAddModList;
+   if(rlcBearerList)
    {
-      
-      rlcBearerList = cellGrpCfg->rlc_BearerToAddModList;
-      if(rlcBearerList)
+      if(rlcBearerList->list.array)
       {
-        if(rlcBearerList->list.array)
-        {
-           for(arrIdx=0; arrIdx<rlcBearerList->list.count; arrIdx++)
-           {
-              if(rlcBearerList->list.array[arrIdx])
-              {
-                 rlcConfig   = rlcBearerList->list.array[arrIdx]->rlc_Config;
-                 macLcConfig = rlcBearerList->list.array[arrIdx]->mac_LogicalChannelConfig;
-                 
-                 if(rlcBearerList->list.array[arrIdx]->servedRadioBearer)
-                 {
-                    free(rlcBearerList->list.array[arrIdx]->servedRadioBearer);
-                 }
-                 if(rlcConfig)
-                 {
-                    if(rlcConfig->choice.am)
-                    {
-                       free(rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength);
-                       free(rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength);
-                       free(rlcConfig->choice.am);
-                    }
-                    free(rlcBearerList->list.array[arrIdx]->rlc_Config);
-                 }
-                 if(macLcConfig)
-                 {
-                    if(macLcConfig->ul_SpecificParameters)
-                    {
-                       free(macLcConfig->ul_SpecificParameters->schedulingRequestID);
-                       free(macLcConfig->ul_SpecificParameters->logicalChannelGroup);
-                       free(macLcConfig->ul_SpecificParameters);
-                    }
-                    free(rlcBearerList->list.array[arrIdx]->mac_LogicalChannelConfig);
-                 }
-                 free(rlcBearerList->list.array[arrIdx]); 
-              }
-           }
-           free(rlcBearerList->list.array);
-        }
-        free(cellGrpCfg->rlc_BearerToAddModList);
+         for(idx=0; idx<rlcBearerList->list.count; idx++)
+         {
+            if(rlcBearerList->list.array[idx])
+            {  
+               rlcConfig   = rlcBearerList->list.array[idx]->rlc_Config;
+               macLcConfig = rlcBearerList->list.array[idx]->mac_LogicalChannelConfig;
+               if(rlcConfig)
+               {
+                  if(rlcConfig->choice.am)
+                  {
+                     DU_FREE(rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength, sizeof(SN_FieldLengthAM_t));
+                     DU_FREE(rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength, sizeof(SN_FieldLengthAM_t)); 
+                     DU_FREE(rlcConfig->choice.am, sizeof(struct RLC_Config__am));
+                  }    
+                  DU_FREE(rlcConfig, sizeof(struct RLC_Config));
+               }
+               DU_FREE(rlcBearerList->list.array[idx]->servedRadioBearer, sizeof(struct RLC_BearerConfig__servedRadioBearer));
+               if(macLcConfig)
+               {
+                  if(macLcConfig->ul_SpecificParameters)
+                  {
+                     DU_FREE(macLcConfig->ul_SpecificParameters->schedulingRequestID,  sizeof(SchedulingRequestId_t));
+                     DU_FREE(macLcConfig->ul_SpecificParameters->logicalChannelGroup,  sizeof(long));
+                     DU_FREE(macLcConfig->ul_SpecificParameters, sizeof(struct LogicalChannelConfig__ul_SpecificParameters));
+                  }
+                  DU_FREE(rlcBearerList->list.array[idx]->mac_LogicalChannelConfig, sizeof(struct LogicalChannelConfig));
+               }
+               DU_FREE(rlcBearerList->list.array[idx], sizeof(struct RLC_BearerConfig));
+            }  
+         }
+         DU_FREE(rlcBearerList->list.array, rlcBearerList->list.size);
       }
+      DU_FREE(cellGrpCfg->rlc_BearerToAddModList, sizeof(struct CellGroupConfigRrc__rlc_BearerToAddModList));
+   }
 
-      macCellGrpCfg = cellGrpCfg->mac_CellGroupConfig;
-      if(macCellGrpCfg)
+   macCellGrpCfg = cellGrpCfg->mac_CellGroupConfig;
+   if(macCellGrpCfg)
+   {
+      schedulingRequestConfig = macCellGrpCfg->schedulingRequestConfig; 
+      if(schedulingRequestConfig)
       {
-        schedulingRequestConfig = macCellGrpCfg->schedulingRequestConfig;
-        if(schedulingRequestConfig)
-        {
-           schReqList = schedulingRequestConfig->schedulingRequestToAddModList;
-           if(schReqList)
-           {
-              if(schReqList->list.array)
-              {
-                 for(arrIdx=0;arrIdx<schReqList->list.count; arrIdx++)
-                 {
-                    if(schReqList->list.array[arrIdx])
-                    {
-                       free(schReqList->list.array[arrIdx]->sr_ProhibitTimer); 
-                       free(schReqList->list.array[arrIdx]);
-                    }
-                 }
-                 free(schReqList->list.array);
-              }
-              free(schedulingRequestConfig->schedulingRequestToAddModList);
-           }
-           free(macCellGrpCfg->schedulingRequestConfig);
-        }
-        if(macCellGrpCfg->bsr_Config)
-        {
-           free(macCellGrpCfg->bsr_Config);
-        }
-        tagConfig = macCellGrpCfg->tag_Config;
-        if(tagConfig)
-        {
-           tagList = tagConfig->tag_ToAddModList;
-           if(tagList)
-           {
-              if(tagList->list.array)
-              {
-                 for(arrIdx=0; arrIdx<tagList->list.count; arrIdx++)
-                 {
-                    free(tagList->list.array[arrIdx]);
-                 }
-                 free(tagList->list.array);
-              }
-              free(tagConfig->tag_ToAddModList);
-           }
-           free(tagConfig); 
-        }
-
-        phrConfig = macCellGrpCfg->phr_Config;
-        if(phrConfig)
-        {
-           free(phrConfig->choice.setup); 
-           free(phrConfig); 
-        }
-
-        free(macCellGrpCfg); 
+         schReqList = schedulingRequestConfig->schedulingRequestToAddModList;
+         if(schReqList)
+         {
+            if(schReqList->list.array)
+            {
+               for(idx=0;idx<schReqList->list.count; idx++)
+               {
+                  if(schReqList->list.array[idx])
+                  {
+                     DU_FREE(schReqList->list.array[idx]->sr_ProhibitTimer, sizeof(long));
+                     DU_FREE(schReqList->list.array[idx], sizeof(struct SchedulingRequestToAddMod));
+                  }
+               }
+               DU_FREE(schReqList->list.array, schReqList->list.size);
+            }
+            DU_FREE(schedulingRequestConfig->schedulingRequestToAddModList,\
+                  sizeof(struct SchedulingRequestConfig__schedulingRequestToAddModList));    }
+            DU_FREE(macCellGrpCfg->schedulingRequestConfig, sizeof(struct SchedulingRequestConfig));
       }
-
-      phyCellGrpCfg = cellGrpCfg->physicalCellGroupConfig;
-      if(phyCellGrpCfg)
+      if(macCellGrpCfg->bsr_Config)
       {
-        free(phyCellGrpCfg->p_NR_FR1);
-        free(phyCellGrpCfg); 
+         DU_FREE(macCellGrpCfg->bsr_Config, sizeof(struct BSR_Config));
       }
-
-      spCellCfg = cellGrpCfg->spCellConfig;
-      if(spCellCfg)
+      tagConfig = macCellGrpCfg->tag_Config;
+      if(tagConfig)
       {
-        if(spCellCfg->servCellIndex)
-        {
-           if(spCellCfg->rlmInSyncOutOfSyncThreshold)
-           {
-              if(spCellCfg->spCellConfigDedicated)
-              {
-                 srvCellCfg = spCellCfg->spCellConfigDedicated;
-                 if(srvCellCfg->initialDownlinkBWP)
-                 {
-                    dlBwp = srvCellCfg->initialDownlinkBWP;
-                    if(srvCellCfg->firstActiveDownlinkBWP_Id)
-                    {
-                       if(srvCellCfg->defaultDownlinkBWP_Id)
-                       {
-                          if(srvCellCfg->uplinkConfig)
-                          {
-
-                             if(srvCellCfg->pdsch_ServingCellConfig)
-                             {
-                                pdschCfg=
-                                   srvCellCfg->pdsch_ServingCellConfig;
-                                if(pdschCfg->choice.setup)
-                                {
-
-                                   free(pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH);
-                                   free(pdschCfg->choice.setup);
-                                }
-
-                                free(srvCellCfg->pdsch_ServingCellConfig);
-                             }
-
-                             freeAperDecodeinitialUplinkBWPConfig(srvCellCfg->uplinkConfig);
-                             free(srvCellCfg->uplinkConfig);
-                          }
-                          free(srvCellCfg->defaultDownlinkBWP_Id);
-                       }
-
-                       free(srvCellCfg->firstActiveDownlinkBWP_Id);
-                    }
-                    if(dlBwp->pdcch_Config)
-                    {
-                       if(dlBwp->pdsch_Config)
-                       {
-                          freeAperDecodeBWPDlDedPdschConfig(dlBwp);
-                          free(dlBwp->pdsch_Config);
-                       }
-                       freeAperDecodeBWPDlDedPdcchConfig(dlBwp);
-                       free(dlBwp->pdcch_Config);
-                    }
-                    free(srvCellCfg->initialDownlinkBWP);
-                 }
+         tagList = tagConfig->tag_ToAddModList;
+         if(tagList)
+         {
+            if(tagList->list.array)
+            {
+               for(idx=0; idx<tagList->list.count; idx++)
+               {
+                  DU_FREE(tagList->list.array[idx], sizeof(struct TAG));
+               }
+               DU_FREE(tagList->list.array, tagList->list.size);
+            }
+            DU_FREE(tagConfig->tag_ToAddModList, sizeof(struct TAG_Config__tag_ToAddModList));
+         }
+         DU_FREE(tagConfig, sizeof(struct TAG_Config));
+      }
 
-                 free(spCellCfg->spCellConfigDedicated);
-              }
-              free(spCellCfg->rlmInSyncOutOfSyncThreshold);
-           }
-           free(spCellCfg->servCellIndex); 
-        }
-        free(spCellCfg);
+      phrConfig = macCellGrpCfg->phr_Config;
+      if(phrConfig)
+      {
+         DU_FREE(phrConfig->choice.setup, sizeof(struct PHR_Config));
+         DU_FREE(phrConfig, sizeof(struct MAC_CellGroupConfig__phr_Config));
       }
-      DU_FREE(ueCfg->cellGrpCfg, sizeof(CellGroupConfigRrc_t));
-      ueCfg->cellGrpCfg = NULLP;
-   }
-   if(ueCfg->ambrCfg)
-   {
-      memset(ueCfg->ambrCfg, 0, sizeof(AmbrCfg));
-      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, ueCfg->ambrCfg, sizeof(AmbrCfg));
-   }
-   for(lcIdx = 0; lcIdx < ueCfg->numRlcLcs; lcIdx++)
-   {
-      freeRlcLcCfg(&ueCfg->rlcLcCfg[lcIdx]);
+
+      DU_FREE(macCellGrpCfg, sizeof(MAC_CellGroupConfig_t));
    }
-   for(lcIdx = 0; lcIdx < ueCfg->numMacLcs; lcIdx++)
+
+   phyCellGrpCfg = cellGrpCfg->physicalCellGroupConfig;
+   if(phyCellGrpCfg)
    {
-      freeMacLcCfg(&ueCfg->macLcCfg[lcIdx]);
+      DU_FREE(phyCellGrpCfg->p_NR_FR1, sizeof(long));
+      DU_FREE(phyCellGrpCfg, sizeof(PhysicalCellGroupConfig_t));
    }
-   for(lcIdx = 0; lcIdx < ueCfg->numDrb; lcIdx++)
+
+   spCellCfg = cellGrpCfg->spCellConfig;
+   if(spCellCfg)
    {
-      DU_FREE(ueCfg->upTnlInfo[lcIdx].tnlCfg1, sizeof(GtpTnlCfg));
-      memset(&ueCfg->upTnlInfo[lcIdx], 0, sizeof(UpTnlCfg));
+      if(spCellCfg->servCellIndex)
+      {
+         if(spCellCfg->rlmInSyncOutOfSyncThreshold)
+         {
+            if(spCellCfg->spCellConfigDedicated)
+            {
+               srvCellCfg = spCellCfg->spCellConfigDedicated;
+               if(srvCellCfg->tdd_UL_DL_ConfigurationDedicated)
+               {
+                  if(srvCellCfg->initialDownlinkBWP)
+                  {
+                     dlBwp = srvCellCfg->initialDownlinkBWP;
+                     if(srvCellCfg->firstActiveDownlinkBWP_Id)
+                     {
+                        if(srvCellCfg->defaultDownlinkBWP_Id)
+                        {
+                           if(srvCellCfg->uplinkConfig)
+                           {
+                              if(srvCellCfg->pdsch_ServingCellConfig)
+                              {
+                                 pdschCfg= srvCellCfg->pdsch_ServingCellConfig;
+                                 if(pdschCfg->choice.setup)
+                                 {
+                                    DU_FREE(pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH,sizeof(long));
+                                    DU_FREE(pdschCfg->choice.setup, sizeof( struct PDSCH_ServingCellConfig));
+                                 }
+                                 DU_FREE(srvCellCfg->pdsch_ServingCellConfig, sizeof(struct
+                                          ServingCellConfig__pdsch_ServingCellConfig));
+                              }  
+                              FreeinitialUplinkBWP(srvCellCfg->uplinkConfig);
+                              DU_FREE(srvCellCfg->uplinkConfig, sizeof(UplinkConfig_t));       
+                           }
+                           DU_FREE(srvCellCfg->defaultDownlinkBWP_Id, sizeof(long));
+                        }
+                        DU_FREE(srvCellCfg->firstActiveDownlinkBWP_Id, sizeof(long));
+                     }
+                     if(dlBwp->pdcch_Config)
+                     {
+                        if(dlBwp->pdsch_Config)
+                        {
+                           FreeBWPDlDedPdschCfg(dlBwp);
+                           DU_FREE(dlBwp->pdsch_Config, sizeof(struct BWP_DownlinkDedicated__pdsch_Config));
+                        }
+                        FreeBWPDlDedPdcchCfg(dlBwp);
+                        DU_FREE(dlBwp->pdcch_Config, sizeof(struct BWP_DownlinkDedicated__pdcch_Config));
+                     }
+                     DU_FREE(srvCellCfg->initialDownlinkBWP, sizeof(BWP_DownlinkDedicated_t));
+                  }
+                  DU_FREE(srvCellCfg->tdd_UL_DL_ConfigurationDedicated, sizeof(TDD_UL_DL_ConfigDedicated_t));
+               }
+               DU_FREE(spCellCfg->spCellConfigDedicated, sizeof(ServingCellConfig_t));
+            }
+            DU_FREE(spCellCfg->rlmInSyncOutOfSyncThreshold, sizeof(long));
+         }
+         DU_FREE(spCellCfg->servCellIndex, sizeof(long));
+      }
+      DU_FREE(spCellCfg,sizeof(SpCellConfig_t));
    }
+   return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Function to free UecontextSetupDb
+ * @brief Builds CellGroupConfigRrc for DU To CU RRC Container 
  *
  * @details
  *
- *    Function : freeF1UeDb
+ *    Function : BuildCellGroupConfigRrc
  *
- *    Functionality: Function to free UecontextSetupDb
+ *    Functionality: Builds and copied Cell group config buffer into 
+ *       DuToCuRrcContainer
  *
- * @params[in] UecontextSetupDb *
- * @return void
+ * @params[in] idx, index in F1AP msg
+ *             DuToCuRRCContainer, DuToCuRRCContainer
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
  *
  * ****************************************************************/
-
-void freeF1UeDb(F1UeContextSetupDb *f1UeDb)
+uint8_t BuildCellGroupConfigRrc(DuUeCb *ueCb, OCTET_STRING_t *duToCuRrcContainer)
 {
-   
-   if(f1UeDb->dlRrcMsg)
+   uint8_t  ret = ROK;
+   CellGroupConfigRrc_t  cellGrpCfg;
+   asn_enc_rval_t        encRetVal;
+   memset(&cellGrpCfg, 0, sizeof(CellGroupConfigRrc_t));
+   memset(&encRetVal, 0, sizeof(asn_enc_rval_t));
+
+   while(true)
    {
-      if(f1UeDb->dlRrcMsg->rrcMsgPdu)
+      cellGrpCfg.cellGroupId = CELL_GRP_ID;
+
+      cellGrpCfg.rlc_BearerToAddModList = NULLP;
+      DU_ALLOC(cellGrpCfg.rlc_BearerToAddModList, sizeof(struct CellGroupConfigRrc__rlc_BearerToAddModList));
+      if(!cellGrpCfg.rlc_BearerToAddModList)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildDuToCuRrcContainer");
+         ret = RFAILED;
+         break;
+      }
+      if(BuildRlcBearerToAddModList(ueCb, cellGrpCfg.rlc_BearerToAddModList) != ROK)
       {
-         DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,\
-           f1UeDb->dlRrcMsg->rrcMsgPdu, f1UeDb->dlRrcMsg->rrcMsgSize);
+         DU_LOG("\nERROR  -->  F1AP : BuildRlcBearerToAddModList failed");
+         ret = RFAILED;
+         break;
       }
-      memset(f1UeDb->dlRrcMsg, 0, sizeof(F1DlRrcMsg));
-   }
-   freeDuUeCfg(&f1UeDb->duUeCfg);
-   memset(f1UeDb, 0, sizeof(F1UeContextSetupDb));
-   DU_FREE(f1UeDb, sizeof(F1UeContextSetupDb));
-}
 
-/*******************************************************************
- *
- * @brief Function to build Am cfg Info
- *
- * @details
- *
- *    Function : extractRlcAmCfg
- *
- *    Functionality: Function to build Am cfg Info
- *
- * @params[in] AmBearerCfg *
- *             void *
- *
- * @return ROK/RFAILED
- *
- * ****************************************************************/
+      cellGrpCfg.rlc_BearerToReleaseList = NULLP;
+      cellGrpCfg.mac_CellGroupConfig = NULLP;
+      DU_ALLOC(cellGrpCfg.mac_CellGroupConfig, sizeof(MAC_CellGroupConfig_t));
+      if(!cellGrpCfg.mac_CellGroupConfig)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildDuToCuRrcContainer");
+         ret = RFAILED;
+         break;
+      }
+      if(BuildMacCellGrpCfg(ueCb, cellGrpCfg.mac_CellGroupConfig) != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildMacCellGrpCfg failed");
+         ret = RFAILED;
+         break;
+      }
 
-void extractRlcAmCfg(AmBearerCfg *amCfgToSet, struct RLC_Config__am *rlcAmCfg)
-{
-   if(rlcAmCfg)
-   {
-      /* UL AM */
-      if(rlcAmCfg->dl_AM_RLC.sn_FieldLength)
+      cellGrpCfg.physicalCellGroupConfig = NULLP;
+      DU_ALLOC(cellGrpCfg.physicalCellGroupConfig, sizeof(PhysicalCellGroupConfig_t));
+      if(!cellGrpCfg.physicalCellGroupConfig)
       {
-        amCfgToSet->ulAmCfg.snLenUl = *(rlcAmCfg->dl_AM_RLC.sn_FieldLength);
-         /*TODO: Check the timer value when sent by real CU */
-        amCfgToSet->ulAmCfg.reAssemTmr = rlcAmCfg->dl_AM_RLC.t_Reassembly; 
-        amCfgToSet->ulAmCfg.statProhTmr = rlcAmCfg->dl_AM_RLC.t_StatusProhibit;
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildDuToCuRrcContainer");
+         ret = RFAILED;
+         break;
+      }
+      if(BuildPhyCellGrpCfg(ueCb, cellGrpCfg.physicalCellGroupConfig) != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildPhyCellGrpCfg failed");
+         ret = RFAILED;
+         break;
       }
 
-      /* DL AM */
-      if(rlcAmCfg->ul_AM_RLC.sn_FieldLength)
+      cellGrpCfg.spCellConfig = NULLP;
+      DU_ALLOC(cellGrpCfg.spCellConfig, sizeof(SpCellConfig_t));
+      if(!cellGrpCfg.spCellConfig)
       {
-        amCfgToSet->dlAmCfg.snLenDl = *(rlcAmCfg->ul_AM_RLC.sn_FieldLength);
-        amCfgToSet->dlAmCfg.pollRetxTmr = rlcAmCfg->ul_AM_RLC.t_PollRetransmit;
-        amCfgToSet->dlAmCfg.pollPdu   = rlcAmCfg->ul_AM_RLC.pollPDU;
-        amCfgToSet->dlAmCfg.pollByte  = rlcAmCfg->ul_AM_RLC.pollByte;
-        amCfgToSet->dlAmCfg.maxRetxTh = rlcAmCfg->ul_AM_RLC.maxRetxThreshold;
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildDuToCuRrcContainer");
+         ret = RFAILED;
+         break;
+      }
+      if(BuildSpCellCfg(ueCb, cellGrpCfg.spCellConfig) != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildSpCellCfg failed");
+         ret = RFAILED;
+         break;
       }
-   }
-}
 
-/*******************************************************************
- *
- * @brief Function to build Um Bi Info
- *
- * @details
- *
- *    Function : extractRlcUmBiCfg
- *
- *    Functionality: Function to build Um Bi Info
- *
- * @params[in] UmBiDirBearerCfg *
- *             void *
- *
- * @return ROK/RFAILED
- *
- * ****************************************************************/
+      cellGrpCfg.sCellToAddModList = NULLP;
+      cellGrpCfg.sCellToReleaseList = NULLP;
+      cellGrpCfg.ext1 = NULLP;
 
-void extractRlcUmBiCfg(UmBiDirBearerCfg *umBiCfgToSet, struct RLC_Config__um_Bi_Directional *rlcBiCfg)
-{
-   if(rlcBiCfg)
-   {
-      /* UL UM BI DIR Cfg */
-      if(rlcBiCfg->dl_UM_RLC.sn_FieldLength)
+      /* encode cellGrpCfg into duToCuRrcContainer */
+      xer_fprint(stdout, &asn_DEF_CellGroupConfigRrc, &cellGrpCfg);
+      memset(encBuf, 0, ENC_BUF_MAX_LEN);
+      encBufSize = 0;
+      encRetVal = aper_encode(&asn_DEF_CellGroupConfigRrc, 0, &cellGrpCfg, PrepFinalEncBuf, encBuf);
+      /* Encode results */
+      if(encRetVal.encoded == ENCODE_FAIL)
+      {
+         DU_LOG( "\nERROR  --> F1AP : Could not encode DuToCuRrcContainer (at %s)\n",\
+               encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+         ret = RFAILED;
+         break;
+      }
+      else
       {
-        umBiCfgToSet->ulUmCfg.snLenUlUm  = *(rlcBiCfg->dl_UM_RLC.sn_FieldLength);
-        umBiCfgToSet->ulUmCfg.reAssemTmr = rlcBiCfg->dl_UM_RLC.t_Reassembly;
+         DU_LOG("\nDEBUG   -->  F1AP : Created APER encoded buffer for DuToCuRrcContainer\n");
+         for(int i=0; i< encBufSize; i++)
+         {
+            printf("%x",encBuf[i]);
+         }
       }
 
-      /* DL UM BI DIR Cfg */
-      if(rlcBiCfg->ul_UM_RLC.sn_FieldLength)
-        umBiCfgToSet->dlUmCfg.snLenDlUm  = *(rlcBiCfg->ul_UM_RLC.sn_FieldLength);
+      duToCuRrcContainer->size = encBufSize;
+      DU_ALLOC(duToCuRrcContainer->buf, duToCuRrcContainer->size);
+      if(!duToCuRrcContainer->buf)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDuToCuRrcContainer");
+         ret = RFAILED;
+         break;
+      }
+      if(ret == ROK)
+      {
+         memcpy(duToCuRrcContainer->buf, encBuf, duToCuRrcContainer->size);
+      }
+      break;
    }
+   FreeMemDuToCuRrcCont(&cellGrpCfg);
+   return ret;
 }
 
 /*******************************************************************
  *
- * @brief Function to build Um Ul Info
+ * @brief Free memory allocated in InitialULRRCMessage
  *
  * @details
  *
- *    Function : extractRlcUmUlCfg
+ *    Function : freeInitUlRrcMsgTransfer
  *
- *    Functionality: Function to build Um Ul Info
+ *    Functionality: Free memory allocated in InitialULRRCMessage
  *
- * @params[in] UmUniDirUlBearerCfg *
- *             void *
+ * @params[in]F1AP_PDU_t  *f1apMsg)
  *
- * @return ROK/RFAILED
+ * @return ROK     - success
+ *         RFAILED - failure
  *
  * ****************************************************************/
 
-void extractRlcUmUlCfg(UmUniDirUlBearerCfg *umUlCfgToSet, struct RLC_Config__um_Uni_Directional_DL *umUlCfg)
+uint8_t freeInitUlRrcMsgTransfer(F1AP_PDU_t  *f1apMsg)
 {
-   if(umUlCfg)
+   uint8_t ieIdx, arrIdx;
+   InitialULRRCMessageTransfer_t *initULRRCMsg=NULLP;
+
+   if(f1apMsg)
    {
-      if(umUlCfg->dl_UM_RLC.sn_FieldLength)
+      if(f1apMsg->choice.initiatingMessage)
       {
-         umUlCfgToSet->ulUmCfg.snLenUlUm  = *(umUlCfg->dl_UM_RLC.sn_FieldLength);
-         umUlCfgToSet->ulUmCfg.reAssemTmr = umUlCfg->dl_UM_RLC.t_Reassembly;
+         initULRRCMsg = &f1apMsg->choice.initiatingMessage->value.\
+           choice.InitialULRRCMessageTransfer;
+        if(initULRRCMsg->protocolIEs.list.array)
+        {
+           for(ieIdx = 0; ieIdx < initULRRCMsg->protocolIEs.list.count; ieIdx++)
+           {
+              switch(initULRRCMsg->protocolIEs.list.array[ieIdx]->id)
+              {
+                 case ProtocolIE_ID_id_NRCGI:
+                 {
+                    if(initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.NRCGI.pLMN_Identity.buf)
+                    {
+                       if(initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.NRCGI.nRCellIdentity.buf)
+                       {
+                          DU_FREE(initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.NRCGI.nRCellIdentity.buf,\
+                          initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.NRCGI.nRCellIdentity.size);
+                       }
+                       DU_FREE(initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.NRCGI.pLMN_Identity.buf,\
+                       initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.NRCGI.pLMN_Identity.size);
+                    }
+                     break;
+                 }
+                 case ProtocolIE_ID_id_RRCContainer:
+                 {
+                    if(initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.buf)
+                    {
+                       DU_FREE(initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.buf,\
+                       initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.size);
+                    }
+                     break;
+                 }
+                 case ProtocolIE_ID_id_DUtoCURRCContainer:
+                 {
+                    if(initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.DUtoCURRCContainer.buf)
+                    {
+                       DU_FREE(initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.DUtoCURRCContainer.buf,
+                       initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.DUtoCURRCContainer.size);
+                    }
+                    break;
+                 }
+                 default:
+                    break;
+              }
+            }
+            for(arrIdx = 0; arrIdx < ieIdx; arrIdx++)
+            {
+               if(initULRRCMsg->protocolIEs.list.array[arrIdx])
+               {
+                  DU_FREE(initULRRCMsg->protocolIEs.list.array[arrIdx],\
+                     sizeof(InitialULRRCMessageTransferIEs_t));
+               }
+            }
+            DU_FREE(initULRRCMsg->protocolIEs.list.array, initULRRCMsg->protocolIEs.list.size);
+         }
+        DU_FREE(f1apMsg->choice.initiatingMessage,sizeof(InitiatingMessage_t));
       }
+      DU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
+   }
+   else
+   {
+      DU_LOG("\nERROR  -->  DU_APP : Recevied F1ap Pdu is null at freeInitUlRrcMsgTransfer()");
+      return RFAILED;
    }
+   return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Function to build Um Uni Dl Info
+ * @brief Builds and sends the InitialULRRCMessage 
  *
  * @details
  *
- *    Function : extractRlcUmDlCfg
+ *    Function : BuildAndSendInitialRrcMsgTransfer 
  *
- *    Functionality: Function to build Um Uni Dl Info
+ *    Functionality: Constructs the Initial UL RRC Message Transfer and sends
+ *                   it to the CU through SCTP.
  *
- * @params[in] UmUniDirDlBearerCfg *
- *             void *
+ * @params[in] 
  *
- * @return ROK/RFAILED
+ * @return ROK     - success
+ *         RFAILED - failure
  *
  * ****************************************************************/
-void extractRlcUmDlCfg(UmUniDirDlBearerCfg *umDlCfgToSet, struct RLC_Config__um_Uni_Directional_UL *umDlCfg)
+uint8_t BuildAndSendInitialRrcMsgTransfer(uint32_t gnbDuUeF1apId, uint16_t crnti,
+      uint16_t rrcContSize, uint8_t *rrcContainer)
 {
-   if(umDlCfg)
-   {
-      if(umDlCfg->ul_UM_RLC.sn_FieldLength)
-         umDlCfgToSet->dlUmCfg.snLenDlUm  = *(umDlCfg->ul_UM_RLC.sn_FieldLength);
-   }
-}
+   uint8_t   ret;
+   uint8_t   elementCnt;
+   uint8_t   ieIdx, cellIdx, ueIdx;
+   DuUeCb    *duUeCb = NULLP;
+   asn_enc_rval_t  encRetVal;
+   F1AP_PDU_t  *f1apMsg = NULLP;
+   InitialULRRCMessageTransfer_t *initULRRCMsg = NULLP;
+   memset(&encRetVal, 0, sizeof(asn_enc_rval_t));
 
-/*******************************************************************
- *
- * @brief Function to extractRlcModeCfg
- *
- * @details
- *
- *    Function : extractRlcModeCfg
- *
- *    Functionality: Function to extractRlcModeCfg
- *
- * @params[in] RLC_Config_t *
- *             RlcBearerCfg *
- *             void  *    
- * @return ROK/RFAILED
- *
- * ****************************************************************/
-void extractRlcModeCfg(uint8_t rlcMode, RlcBearerCfg *rlcDbCfg, RLC_Config_t *lcCfg)
-{
-   if(lcCfg)
+   while(true)
    {
-      switch(rlcMode)
+      DU_LOG("\n INFO   -->  F1AP : Building RRC Setup Request\n");
+      DU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t));
+      if(f1apMsg == NULLP)
       {
-         case RLC_AM :
-            {
-               if(lcCfg->choice.am)
-               {
-                  DU_ALLOC_SHRABL_BUF(rlcDbCfg->u.amCfg, sizeof(AmBearerCfg));
-                  if(rlcDbCfg->u.amCfg)
-                     extractRlcAmCfg(rlcDbCfg->u.amCfg, lcCfg->choice.am);
-               }
-               break;
-            }
-         case RLC_UM_BI_DIRECTIONAL :
-            {
-               if(lcCfg->choice.um_Bi_Directional)
-               {
-                  DU_ALLOC_SHRABL_BUF(rlcDbCfg->u.umBiDirCfg, sizeof(UmBiDirBearerCfg));
-                  if(rlcDbCfg->u.umBiDirCfg)
-                     extractRlcUmBiCfg(rlcDbCfg->u.umBiDirCfg, lcCfg->choice.um_Bi_Directional);
-               }
-               break;
-            }
-         case RLC_UM_UNI_DIRECTIONAL_UL :
-            {
-               if(lcCfg->choice.um_Uni_Directional_DL)
-               {
-                  DU_ALLOC_SHRABL_BUF(rlcDbCfg->u.umUniDirUlCfg, sizeof(UmUniDirUlBearerCfg));
-                  if(rlcDbCfg->u.umUniDirUlCfg)
-                     extractRlcUmUlCfg(rlcDbCfg->u.umUniDirUlCfg, lcCfg->choice.um_Uni_Directional_DL);
-               }
-               break;
-            }
-         case RLC_UM_UNI_DIRECTIONAL_DL :
+        DU_LOG(" ERROR  -->  F1AP : Memory allocation for F1AP-PDU failed");
+        break;
+      }
+      f1apMsg->present = F1AP_PDU_PR_initiatingMessage;
+      DU_ALLOC(f1apMsg->choice.initiatingMessage,sizeof(InitiatingMessage_t));
+      if(f1apMsg->choice.initiatingMessage == NULLP)
+      {
+        DU_LOG(" ERROR  -->  F1AP : Memory allocation for  F1AP-PDU failed");
+        break;
+      }
+      f1apMsg->choice.initiatingMessage->procedureCode =\
+                                                       ProcedureCode_id_InitialULRRCMessageTransfer;
+      f1apMsg->choice.initiatingMessage->criticality = Criticality_ignore;
+      f1apMsg->choice.initiatingMessage->value.present = \
+                                                        InitiatingMessage__value_PR_InitialULRRCMessageTransfer;
+      initULRRCMsg =\
+                   &f1apMsg->choice.initiatingMessage->value.choice.InitialULRRCMessageTransfer;
+      elementCnt = 5;
+      initULRRCMsg->protocolIEs.list.count = elementCnt;
+      initULRRCMsg->protocolIEs.list.size = \
+                                           elementCnt * sizeof(InitialULRRCMessageTransferIEs_t *);
+      /* Initialize the F1Setup members */
+      DU_ALLOC(initULRRCMsg->protocolIEs.list.array,initULRRCMsg->protocolIEs.list.size);
+      if(initULRRCMsg->protocolIEs.list.array == NULLP)
+      {
+        DU_LOG(" ERROR  -->  F1AP : Memory allocation for\
+              RRCSetupRequestMessageTransferIEs failed");
+        break;
+      }
+      for(ieIdx=0; ieIdx<elementCnt; ieIdx++)
+      {
+        DU_ALLOC(initULRRCMsg->protocolIEs.list.array[ieIdx],\
+              sizeof(InitialULRRCMessageTransferIEs_t));
+        if(initULRRCMsg->protocolIEs.list.array[ieIdx] == NULLP)
+        {
+           break;
+        }
+      }
+      ieIdx = 0;
+      /*GNB DU UE F1AP ID*/
+      initULRRCMsg->protocolIEs.list.array[ieIdx]->id  = \
+                                                       ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID;
+      initULRRCMsg->protocolIEs.list.array[ieIdx]->criticality  = Criticality_reject;
+      initULRRCMsg->protocolIEs.list.array[ieIdx]->value.present = \
+                                                                 InitialULRRCMessageTransferIEs__value_PR_GNB_DU_UE_F1AP_ID;
+      initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_UE_F1AP_ID = gnbDuUeF1apId;
+
+
+      /*NRCGI*/
+      ieIdx++;
+      initULRRCMsg->protocolIEs.list.array[ieIdx]->id  = \
+                                                       ProtocolIE_ID_id_NRCGI;
+      initULRRCMsg->protocolIEs.list.array[ieIdx]->criticality  =Criticality_reject;
+      initULRRCMsg->protocolIEs.list.array[ieIdx]->value.present = \
+                                                                 InitialULRRCMessageTransferIEs__value_PR_NRCGI;
+
+      ret =\
+          BuildNrcgi(&initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.NRCGI);
+      if(ret!=ROK)
+      {
+        break;
+      }
+
+      /*CRNTI*/
+      ieIdx++;
+      initULRRCMsg->protocolIEs.list.array[ieIdx]->id  = \
+                                                       ProtocolIE_ID_id_C_RNTI;
+      initULRRCMsg->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
+      initULRRCMsg->protocolIEs.list.array[ieIdx]->value.present =\
+                                                                InitialULRRCMessageTransferIEs__value_PR_C_RNTI;
+      initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.C_RNTI = crnti;
+
+      /*RRCContainer*/
+      ieIdx++;
+      initULRRCMsg->protocolIEs.list.array[ieIdx]->id  = \
+                                                       ProtocolIE_ID_id_RRCContainer;
+      initULRRCMsg->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
+      initULRRCMsg->protocolIEs.list.array[ieIdx]->value.present =\
+                                                                InitialULRRCMessageTransferIEs__value_PR_RRCContainer;
+
+      initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.size = rrcContSize;
+      DU_ALLOC(initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.buf,
+           initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.size)
+      if(!initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.buf)
+      {
+         DU_LOG(" ERROR  -->  F1AP : Memory allocation for RRCSetupRequestMessageTransferIEs failed");
+         break;
+      
+      }
+      memcpy(initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.buf, rrcContainer,
+           initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.size);
+
+
+      /*DUtoCURRCContainer*/
+      ieIdx++;
+      initULRRCMsg->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_DUtoCURRCContainer;
+      initULRRCMsg->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
+      initULRRCMsg->protocolIEs.list.array[ieIdx]->value.present =\
+                                                                InitialULRRCMessageTransferIEs__value_PR_DUtoCURRCContainer;
+
+      for(cellIdx = 0; cellIdx < MAX_NUM_CELL; cellIdx++)
+      {
+         for(ueIdx = 0; ueIdx < MAX_NUM_UE; ueIdx++)
+         {
+            if(duCb.actvCellLst[cellIdx] && (duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbDuUeF1apId == gnbDuUeF1apId)&&\
+                  (duCb.actvCellLst[cellIdx]->ueCb[ueIdx].crnti == crnti))
             {
-               if(lcCfg->choice.um_Uni_Directional_UL)
-               {
-                  DU_ALLOC_SHRABL_BUF(rlcDbCfg->u.umUniDirDlCfg, sizeof(UmUniDirDlBearerCfg));
-                  if(rlcDbCfg->u.umUniDirDlCfg)
-                     extractRlcUmDlCfg(rlcDbCfg->u.umUniDirDlCfg, lcCfg->choice.um_Uni_Directional_UL);
-               }
-               break;
+               duUeCb = &duCb.actvCellLst[cellIdx]->ueCb[ueIdx];
             }
-         default:
-            DU_LOG("\nERROR  -->  DUAPP: Invalid rlcMode %d at extractRlcCfgToAddMod()", rlcMode);
-            break;
+         }
       }
-   }
-}
-
-/*******************************************************************
- *
- * @brief Function to extract extractUlLcCfg
- *
- * @details
- *
- *    Function : extractUlLcCfg
- *
- *    Functionality: Function to extract extractUlLcCfg
- *
- * @params[in] UlLcCfg *f1UlLcCfg, LogicalChannelConfig_t *ulLcCfg
- * @return void
- *
- * ****************************************************************/
 
-void extractUlLcCfg(UlLcCfg *f1UlLcCfg, LogicalChannelConfig_t *ulLcCfg)
-{
-   if(ulLcCfg)
-   {
-      if(ulLcCfg->ul_SpecificParameters)
+      ret = BuildCellGroupConfigRrc(duUeCb, &initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.DUtoCURRCContainer);
+      if(ret != ROK)
       {
-         f1UlLcCfg->priority = \
-            ulLcCfg->ul_SpecificParameters->priority;
-      if(ulLcCfg->ul_SpecificParameters->logicalChannelGroup)
+        break;
+      }
+
+      xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
+
+      /* Encode the Intial UL RRC Message transfer as APER */
+      memset(encBuf, 0, ENC_BUF_MAX_LEN);
+      encBufSize = 0;
+      encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf, encBuf);
+      /* Encode results */
+      if(encRetVal.encoded == ENCODE_FAIL)
       {
-         f1UlLcCfg->lcGroup = \
-           *(ulLcCfg->ul_SpecificParameters->logicalChannelGroup);
+        DU_LOG( "\nERROR  --> F1AP : Could not encode Initial UL RRC Message Transfer\
+              structure (at %s)\n",encRetVal.failed_type ? \
+              encRetVal.failed_type->name : "unknown");
+        ret = RFAILED;
+        break;
       }
-      if(ulLcCfg->ul_SpecificParameters->schedulingRequestID)
+      else
       {
-         f1UlLcCfg->schReqId = \
-           *(ulLcCfg->ul_SpecificParameters->schedulingRequestID);
+
+        DU_LOG("\nDEBUG   -->  F1AP : Created APER encoded buffer for Initial UL RRC\
+              Message transfer\n");
+        for(int i=0; i< encBufSize; i++)
+        {
+           printf("%x",encBuf[i]);
+        }
       }
-      f1UlLcCfg->pbr = \
-         ulLcCfg->ul_SpecificParameters->prioritisedBitRate;
-      f1UlLcCfg->bsd = \
-         ulLcCfg->ul_SpecificParameters->bucketSizeDuration;
+      /* Sending  msg  */
+      if(sendF1APMsg() != ROK)
+      {
+        DU_LOG("\nERROR  -->  F1AP : Sending Initial UL RRC Message Transfer Failed");
+        ret = RFAILED;
+        break;
       }
+      break;
    }
-}
+   freeInitUlRrcMsgTransfer(f1apMsg);
+   return ret;
+}/* End of BuildAndSendInitialRrcMsgTransfer*/
+
+/*****  UE SETUP REQUEST *****/
 
 /*******************************************************************
  *
- * @brief Function to procRlcLcCfg
+ * @brief Free Qos And Snssai Drb Info
  *
  * @details
  *
- *    Function : procRlcLcCfg
+ *    Function : freeDrbQosAndSnssaiInfo
  *
- *    Functionality: Function to procRlcLcCfg
+ *    Functionality: Free Qos And Snssai Drb Info
  *
- * @params[in] rbId, lcId, rbType, rlcMod
- *             RLC_Config_t *, RlcBearerCfg * , 
+ * @params[in] LcCfg *lcCfg,
  * @return void
  *
  * ****************************************************************/
-
-void procRlcLcCfg(uint8_t rbId, uint8_t lcId, uint8_t rbType, uint8_t rlcMode,\
-   uint8_t configType, RLC_Config_t *f1RlcCfg, RlcBearerCfg *lcCfg)
+void freeDrbQosAndSnssaiInfo(LcCfg *lcCfg)
 {
-
-   lcCfg->rbId   = rbId;
-   lcCfg->configType = configType;
-
-   if(rbType == RB_TYPE_SRB)
+   if(lcCfg->snssai)
    {
-      lcCfg->rbType = RB_TYPE_SRB;
-      lcCfg->lcId   = rbId;
-      lcCfg->lcType = LCH_DCCH;
-      lcCfg->rlcMode = RLC_AM;
+      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->snssai, sizeof(Snssai));
    }
-   else if(rbType == RB_TYPE_DRB)
-   {
-      lcCfg->rbType = RB_TYPE_DRB;
-      lcCfg->lcId   = lcId;
-      lcCfg->lcType = LCH_DTCH;
-      lcCfg->rlcMode = rlcMode;
-   }
-   if(f1RlcCfg) /* rlc mode config recived */
+   if(lcCfg->drbQos)
    {
-      extractRlcModeCfg(lcCfg->rlcMode, lcCfg, f1RlcCfg);
+      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->drbQos, sizeof(DrbQosInfo));
    }
 }
 
+/******************************************************************
+*
+* @brief Function to delete the RLC Lc cfg from UE APP DB
+*
+* @details
+*
+*  Function : freeRlcLcCfg
+*
+*  Functionality: Function to delete the RLC Lc cfg from UE APP DB
+*
+*
+ *****************************************************************/
+
+void freeRlcLcCfg(RlcBearerCfg *lcCfg)
+{
+   switch(lcCfg->rlcMode)
+   {
+      case RLC_AM :
+         {
+            if(lcCfg->u.amCfg)
+            {
+               DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->u.amCfg, sizeof(AmBearerCfg));
+            }
+            break;
+         }
+      case RLC_UM_BI_DIRECTIONAL :
+         {
+            if(lcCfg->u.umBiDirCfg)
+            {
+               DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->u.umBiDirCfg, sizeof(UmBiDirBearerCfg));
+            }
+            break;
+         }
+      case RLC_UM_UNI_DIRECTIONAL_UL :
+         {
+            if(lcCfg->u.umUniDirUlCfg)
+            {
+               DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->u.umUniDirUlCfg, sizeof(UmUniDirUlBearerCfg));
+            }
+            break;
 
+         }
+      case RLC_UM_UNI_DIRECTIONAL_DL :
+         {
+            if(lcCfg->u.umUniDirDlCfg)
+            {
+               DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->u.umUniDirDlCfg, sizeof(UmUniDirDlBearerCfg));
+            }
+            break;
+         }
+      default:
+         DU_LOG("\nERROR  -->  DU_APP: Invalid Rlc Mode %d at freeRlcLcCfg()", lcCfg->rlcMode);
+         break;
+   }
+   DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->snssai, sizeof(Snssai));
+}
 
 /*******************************************************************
  *
- * @brief Fills DrbQos Info received by CU
+ * @brief Function to free MacLcCfg
  *
  * @details
  *
- *    Function : extractQosInfo
+ *    Function : freeMacLcCfg
  *
- *    Functionality: Fills DrbQos Info received  by CU
+ *    Functionality: Function to free MacLcCfg
  *
- * @params[in] DrbQosInfo *qosToAdd, 
- *             QoSFlowLevelQoSParameters_t *qosFlowCfg
+ * @params[in] LcCfg *lcCfg,
  * @return void
  *
  * ****************************************************************/
 
-void extractQosInfo(DrbQosInfo *qosToAdd, QoSFlowLevelQoSParameters_t *qosFlowCfg)
+void  freeMacLcCfg(LcCfg *lcCfg)
 {
-   qosToAdd->fiveQiType = qosFlowCfg->qoS_Characteristics.present;
-   qosToAdd->u.nonDyn5Qi.fiveQi     =\
-         qosFlowCfg->qoS_Characteristics.choice.non_Dynamic_5QI->fiveQI;
-   if(qosFlowCfg->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow)
-   {
-      qosToAdd->u.nonDyn5Qi.avgWindow = \
-        *(qosFlowCfg->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow);
-   }
-   qosToAdd->u.nonDyn5Qi.maxDataBurstVol = \
-      *(qosFlowCfg->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume);
-   if(qosFlowCfg->qoS_Characteristics.choice.non_Dynamic_5QI->qoSPriorityLevel)
+    /* Deleting DRBQOS */
+   if(lcCfg->drbQos)
    {
-      qosToAdd->u.nonDyn5Qi.priorLevel = \
-         *(qosFlowCfg->qoS_Characteristics.choice.non_Dynamic_5QI->qoSPriorityLevel);
+      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->drbQos, sizeof(DrbQosInfo));
    }
-   qosToAdd->ngRanRetPri.priorityLevel = \
-      qosFlowCfg->nGRANallocationRetentionPriority.priorityLevel; 
-   qosToAdd->ngRanRetPri.preEmptionCap = \
-      qosFlowCfg->nGRANallocationRetentionPriority.pre_emptionCapability;
-   qosToAdd->ngRanRetPri.preEmptionVul = \
-      qosFlowCfg->nGRANallocationRetentionPriority.pre_emptionVulnerability;
-   if(qosFlowCfg->gBR_QoS_Flow_Information)
+   /* Deleting SNSSAI */
+   if(lcCfg->snssai)
    {
-      memcpy(&qosToAdd->grbQosInfo.maxFlowBitRateDl, \
-         qosFlowCfg->gBR_QoS_Flow_Information->maxFlowBitRateDownlink.buf, \
-         qosFlowCfg->gBR_QoS_Flow_Information->maxFlowBitRateDownlink.size);
-      memcpy(&qosToAdd->grbQosInfo.maxFlowBitRateUl, \
-         qosFlowCfg->gBR_QoS_Flow_Information->maxFlowBitRateUplink.buf, \
-         qosFlowCfg->gBR_QoS_Flow_Information->maxFlowBitRateUplink.size);
-      memcpy(&qosToAdd->grbQosInfo.guarFlowBitRateDl,\
-         qosFlowCfg->gBR_QoS_Flow_Information->guaranteedFlowBitRateDownlink.buf, \
-         qosFlowCfg->gBR_QoS_Flow_Information->guaranteedFlowBitRateDownlink.size);
-      memcpy(&qosToAdd->grbQosInfo.guarFlowBitRateUl,\
-         qosFlowCfg->gBR_QoS_Flow_Information->guaranteedFlowBitRateUplink.buf, \
-         qosFlowCfg->gBR_QoS_Flow_Information->guaranteedFlowBitRateUplink.size);
+      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->snssai, sizeof(Snssai));
    }
-   qosToAdd->pduSessionId = 0;
-   qosToAdd->ulPduSessAggMaxBitRate = 0;
 }
-
 /*******************************************************************
  *
- * @brief Function to extract GTP Tunnel Info from CU
+ * @brief Free UE NR Capability received in UE Context setup request
  *
  * @details
  *
- *    Function : extractUpTnlInfo
+ *    Function : freeAperDecodeUeNrCapability
  *
- *    Functionality: Function to extract GTP Tunnel Info from CU
+ *    Functionality:  
+ *       Free UE NR Capability received in UE Context setup request
  *
- * @params[in] F1AP message
- * @return ROK/RFAILED
+ * @params[in] 
+ * @return ROK     - success
+ *         RFAILED - failure
  *
  * ****************************************************************/
-
-uint8_t extractUpTnlInfo(uint8_t drbId, uint8_t configType,\
-   ULUPTNLInformation_ToBeSetup_List_t *tnlInfo, UpTnlCfg *upTnlInfo)
+void freeAperDecodeUeNrCapability(void *ueNrCapability)
 {
-   uint8_t tnlIdx;
-   uint32_t ipv4_du = 0;
-   GTPTunnel_t *gtpTunnel = NULLP;
-
-   upTnlInfo->drbId = drbId; 
-   upTnlInfo->configType = configType;
-#ifdef O1_ENABLE
-   cmInetAddr((S8*)g_cfg.DU_IPV4_Addr, &ipv4_du);
-#else
-   cmInetAddr((char *)DU_IP_V4_ADDR, &ipv4_du);
-#endif
+   uint8_t arrIdx =0;
+   FeatureSets_t *featureSets =NULLP;
+   UE_NR_Capability_t *ueNrCap = (UE_NR_Capability_t *)ueNrCapability;
 
-   for(tnlIdx=0; tnlIdx < tnlInfo->list.count; tnlIdx++)
+   if(ueNrCap->rf_Parameters.supportedBandListNR.list.array)
    {
-      if(tnlInfo->list.array[tnlIdx]->uLUPTNLInformation.present == UPTransportLayerInformation_PR_gTPTunnel)
+      for(arrIdx = 0; arrIdx < ueNrCap->rf_Parameters.supportedBandListNR.list.count; arrIdx++)
       {
-        if(tnlInfo->list.array[tnlIdx]->uLUPTNLInformation.choice.gTPTunnel)
-        {
-           gtpTunnel = tnlInfo->list.array[tnlIdx]->uLUPTNLInformation.choice.gTPTunnel;
-           DU_ALLOC(upTnlInfo->tnlCfg1, sizeof(GtpTnlCfg));
-            if(upTnlInfo->tnlCfg1 == NULLP)
-           {
-               DU_LOG("\nERROR  -->  F1AP : extractUpTnlInfo: Failed to allocate mmeory for tunnel cfg 1");
-               return RFAILED;
-           }
-           bitStringToInt(&gtpTunnel->transportLayerAddress, &upTnlInfo->tnlCfg1->ulTnlAddress);
-           upTnlInfo->tnlCfg1->dlTnlAddress = ipv4_du;
-           if(gtpTunnel->gTP_TEID.size > 0)
-           {
-              teIdStringToInt(gtpTunnel->gTP_TEID.buf, &upTnlInfo->tnlCfg1->teId);
-           }
-        }
-        break;
+         if(ueNrCap->rf_Parameters.supportedBandListNR.list.array[arrIdx])
+            free(ueNrCap->rf_Parameters.supportedBandListNR.list.array[arrIdx]);
       }
+      free(ueNrCap->rf_Parameters.supportedBandListNR.list.array);
    }
-   return ROK;
+
+   if(ueNrCap->featureSets)
+   {
+      featureSets = ueNrCap->featureSets;
+      if(featureSets->featureSetsDownlinkPerCC)
+      {
+         if(featureSets->featureSetsDownlinkPerCC->list.array)
+         {
+            for(arrIdx = 0; arrIdx < featureSets->featureSetsDownlinkPerCC->list.count; arrIdx++)
+            {
+               if(featureSets->featureSetsDownlinkPerCC->list.array[arrIdx])
+               {
+                  if(featureSets->featureSetsDownlinkPerCC->list.array[arrIdx]->supportedModulationOrderDL)
+                     free(featureSets->featureSetsDownlinkPerCC->list.array[arrIdx]->supportedModulationOrderDL);
+                  free(featureSets->featureSetsDownlinkPerCC->list.array[arrIdx]);
+               }
+            }
+            free(featureSets->featureSetsDownlinkPerCC->list.array);
+         }
+         free(featureSets->featureSetsDownlinkPerCC);
+      }
+      if(featureSets->featureSetsUplinkPerCC)
+      {
+         if(featureSets->featureSetsUplinkPerCC->list.array)
+         {
+            for(arrIdx = 0; arrIdx < featureSets->featureSetsUplinkPerCC->list.count; arrIdx++)
+            {
+               if(featureSets->featureSetsUplinkPerCC->list.array[arrIdx])
+               {
+                  if(featureSets->featureSetsUplinkPerCC->list.array[arrIdx]->supportedModulationOrderUL)
+                     free(featureSets->featureSetsUplinkPerCC->list.array[arrIdx]->supportedModulationOrderUL);
+                  free(featureSets->featureSetsUplinkPerCC->list.array[arrIdx]);
+               }
+            }
+            free(featureSets->featureSetsUplinkPerCC->list.array);
+         }
+         free(featureSets->featureSetsUplinkPerCC);
+      }
+      free(ueNrCap->featureSets);
+   }   
 }
+
 /*******************************************************************
 *
-* @brief Function to extract Drb Qos Cfg Info from CU
+* @brief Function to free PdcchSearchSpcToAddModList
+         where memory allocated by aper_decoder
 *
 * @details
 *
-*    Function : extractDrbQosCfg 
+*    Function : freeAperDecodePdcchSearchSpcToAddModList 
 *
-*    Functionality: Function to extract Drb Qos Cfg Info from CU
+*    Functionality: Function to free PdcchSearchSpcToAddModList
 *
-* @params[in] DRB_Information_t *drbInfo, LcCfg *macLcToAdd
-* @return ROK/RFAILED
+* @params[in] struct PDCCH_Config__searchSpacesToAddModList *searchSpcList
+* @return void
 *
 * ****************************************************************/
 
-uint8_t extractDrbQosCfg(DRB_Information_t *drbInfo, LcCfg *macLcToAdd ) 
+void freeAperDecodePdcchSearchSpcToAddModList(struct PDCCH_Config__searchSpacesToAddModList *searchSpcList)
 {
-   if(!macLcToAdd->drbQos)
+   uint8_t searchSpcArrIdx=0;
+   uint8_t searchSpcArrIdx1=0;
+   struct  SearchSpace *searchSpc=NULLP;
+
+
+   if(searchSpcList->list.array)
    {
-      DU_ALLOC_SHRABL_BUF(macLcToAdd->drbQos, sizeof(DrbQosInfo));
-      if(macLcToAdd->drbQos == NULLP)
+      if(searchSpcList->list.array[searchSpcArrIdx1])
       {
-         DU_LOG("\nERROR  -->  DUAPP:Memory failed at allocating DrbQos at extractDrbCfg()");
-         return RFAILED;
+        searchSpc = searchSpcList->list.array[searchSpcArrIdx1];
+        if(searchSpc->controlResourceSetId)
+        {
+           if(searchSpc->monitoringSlotPeriodicityAndOffset)
+           {
+              if(searchSpc->monitoringSymbolsWithinSlot)
+              {
+                 if(searchSpc->monitoringSymbolsWithinSlot->buf)
+                 {
+                    if(searchSpc->nrofCandidates)
+                    {
+                       if(searchSpc->searchSpaceType)
+                       {
+                          free(searchSpc->searchSpaceType->choice.ue_Specific);
+                          free(searchSpc->searchSpaceType);
+                       }
+                       free(searchSpc->nrofCandidates);
+                    }
+                    free(searchSpc->monitoringSymbolsWithinSlot->buf);
+                 }
+                 free(searchSpc->monitoringSymbolsWithinSlot);
+              }
+              free(searchSpc->monitoringSlotPeriodicityAndOffset);
+           }
+           free(searchSpc->controlResourceSetId);
+        }
       }
-
-   }
-   if(drbInfo->dRB_QoS.qoS_Characteristics.present == QoS_Characteristics_PR_non_Dynamic_5QI)
-   {
-      extractQosInfo(macLcToAdd->drbQos, &drbInfo->dRB_QoS);
-      macLcToAdd->dlLcCfg.lcp = macLcToAdd->drbQos->ngRanRetPri.priorityLevel;
-   }
-   if(!macLcToAdd->snssai)
-   {
-      DU_ALLOC_SHRABL_BUF(macLcToAdd->snssai, sizeof(Snssai));
-      if(macLcToAdd->snssai == NULLP)
+      for(searchSpcArrIdx = 0; searchSpcArrIdx < searchSpcList->list.count; searchSpcArrIdx++)
       {
-         DU_LOG("\nERROR  -->  DUAPP : Memory failed at allocating SNSSAI at extractDrbCfg()");
-         return RFAILED;
+        free(searchSpcList->list.array[searchSpcArrIdx]);
       }
+      free(searchSpcList->list.array);
    }
-   memcpy(&macLcToAdd->snssai->sst, drbInfo->sNSSAI.sST.buf, \
-         drbInfo->sNSSAI.sST.size);
-   if(drbInfo->sNSSAI.sD)
-   {
-      memcpy(macLcToAdd->snssai->sd, drbInfo->sNSSAI.sD->buf, \
-            drbInfo->sNSSAI.sD->size);
-   }
-   return ROK;
 }
 /*******************************************************************
- *
- * @brief Function to extract DRB info received from CU
- *
- * @details
- *
- *    Function : extractDrbCfg
- *
- *    Functionality: Function to extract DRB info received from CU
- *
- * @params[in] F1AP message
- * @return void
- *
- * ****************************************************************/
-uint8_t extractDrbCfg(DRBs_ToBeSetup_Item_t *drbItem,DRBs_ToBeSetupMod_Item_t *drbSetupModItem,\
-LcCfg *macLcToAdd, UpTnlCfg *upTnlInfo)
-{
-   DRB_Information_t *drbInfo = NULLP;
+*
+* @brief Function for free part for the memory allocated by aper_decoder
+* 
+* @details
+*
+*    Function : freeAperDecodeBWPDlDedPdcchConfig
+*
+*    Functionality: Function to free BWPDlDedPdcchConfig
+*
+* @params[in] 
+* @return void
+*
+* ****************************************************************/
 
-   if(drbItem != NULLP)
+
+void freeAperDecodeBWPDlDedPdcchConfig(BWP_DownlinkDedicated_t *dlBwp)
+{
+   uint8_t arrIdx1=0;
+   uint8_t arrIdx2=0;
+   struct PDCCH_Config *pdcchCfg=NULLP;
+   struct ControlResourceSet *controlRSet=NULLP;
+   struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList=NULLP;
+   
+   if(dlBwp->pdcch_Config->choice.setup)
    {
-      if(extractUpTnlInfo(drbItem->dRBID, CONFIG_ADD, &drbItem->uLUPTNLInformation_ToBeSetup_List, upTnlInfo) != ROK)
-      {
-         DU_LOG("\nERROR  -->  DUAPP : Failed to extract tunnel Cfg at extractDrbCfg()");
-         return RFAILED;
-      }
-      if(drbItem->qoSInformation.present == QoSInformation_PR_choice_extension)
+      pdcchCfg=dlBwp->pdcch_Config->choice.setup;
+      if(pdcchCfg->controlResourceSetToAddModList)
       {
-         if(drbItem->qoSInformation.choice.choice_extension->value.present == QoSInformation_ExtIEs__value_PR_DRB_Information)
-         {
-            drbInfo = &drbItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information;
-            if(extractDrbQosCfg(drbInfo , macLcToAdd) != ROK)
-            {
-               DU_LOG("\nERROR  -->  DUAPP : Failed to extract qos Cfg at extractDrbCfg()");
-               return RFAILED;
-            }
-         }
+        controlRSetList = pdcchCfg->controlResourceSetToAddModList;
+        if(controlRSetList->list.array)
+        {
+           controlRSet = controlRSetList->list.array[arrIdx2];
+           if(controlRSet)
+           {
+              if(controlRSet->frequencyDomainResources.buf)
+              {
+                 if(controlRSet->pdcch_DMRS_ScramblingID)
+                 {
+                    if(pdcchCfg->searchSpacesToAddModList)
+                    {
+                       freeAperDecodePdcchSearchSpcToAddModList(pdcchCfg->searchSpacesToAddModList);
+                       free(pdcchCfg->searchSpacesToAddModList);
+                    }
+                    free(controlRSet->pdcch_DMRS_ScramblingID);
+                 }
+                 free(controlRSet->frequencyDomainResources.buf);
+              }
+           }
+           for(arrIdx1 = 0; arrIdx1 <controlRSetList->list.count; arrIdx1++)
+           {
+              free(controlRSetList->list.array[arrIdx1]);
+           }
+           free(controlRSetList->list.array);
+        }
+        free(pdcchCfg->controlResourceSetToAddModList);
       }
+      free(dlBwp->pdcch_Config->choice.setup);
    }
-   else if(drbSetupModItem != NULLP)
+}
+/*******************************************************************
+*
+* @brief Function to free PdschTimeDomAllocationList 
+*     where the memory allocated by aper_decoder
+* 
+* @details
+*
+*    Function : freeAperDecodePdschTimeDomAllocationList
+*
+*    Functionality: Function to free PdschTimeDomAllocationList
+*
+* @params[in] struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList 
+* @return void
+*
+* ****************************************************************/
+
+
+void freeAperDecodePdschTimeDomAllocationList( struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList)
+{
+   uint8_t arrIdx=0;
+
+   if(timeDomAllocList->choice.setup)
    {
-      if(extractUpTnlInfo(drbSetupModItem->dRBID, CONFIG_ADD, &drbSetupModItem->uLUPTNLInformation_ToBeSetup_List,\
-      upTnlInfo) != ROK)
-      {
-         DU_LOG("\nERROR  -->  DUAPP : Failed to extract tunnel Cfg at extractDrbCfg()");
-         return RFAILED;
-      }
-      if(drbSetupModItem->qoSInformation.present == QoSInformation_PR_choice_extension)
+      if(timeDomAllocList->choice.setup->list.array)
       {
-         if(drbSetupModItem->qoSInformation.choice.choice_extension->value.present ==\
-         QoSInformation_ExtIEs__value_PR_DRB_Information)
-         {
-            drbInfo = &drbSetupModItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information;
-            if(extractDrbQosCfg(drbInfo , macLcToAdd) != ROK)
-            {
-               DU_LOG("\nERROR  -->  DUAPP : Failed to extract qos Cfg at extractDrbCfg()");  
-               return RFAILED;
-            }
-
-         }
+        for(arrIdx = 0; arrIdx <timeDomAllocList->choice.setup->list.count ; arrIdx++)
+        {
+           free(timeDomAllocList->choice.setup->list.array[arrIdx]);
+        }
+        free(timeDomAllocList->choice.setup->list.array);
       }
+      free(timeDomAllocList->choice.setup);
    }
-
-   return ROK;
 }
 
 /*******************************************************************
- *
- * @brief Function to extract RB info received from CU
- *
- * @details
- *
- *    Function : extractMacRbCfg
- *
- *    Functionality: Function to extract RB info received from CU
- *
- * @params[in] F1AP message
- * @return ROK/RFAILED
- *
- * ****************************************************************/
+*
+* @brief Function to free BWPDlDedPdschConfig 
+*        where the memory allocated by aper_decoder
+*  
+* @details
+*
+*    Function : freeAperDecodeBWPDlDedPdschConfig 
+*
+*    Functionality: Function to free BWPDlDedPdschConfig 
+*
+* @params[in] BWP_DownlinkDedicated_t *dlBwp 
+* @return void
+*
+* ****************************************************************/
 
-uint8_t extractMacRbCfg(uint8_t lcId, DRBs_ToBeSetup_Item_t *drbCfg,\
-DRBs_ToBeSetupMod_Item_t *drbSetupModCfg,  LogicalChannelConfig_t *ulLcCfg, LcCfg *lcCfg, UpTnlCfg *upTnlInfo)
+
+void freeAperDecodeBWPDlDedPdschConfig(BWP_DownlinkDedicated_t *dlBwp)
 {
-   if(drbCfg != NULLP)
+   struct PDSCH_Config *pdschCfg=NULLP;
+   struct PDSCH_Config__prb_BundlingType *prbBndlType=NULLP;
+   struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList=NULLP;
+   struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA *dmrsDlCfg=NULLP;
+
+   if(dlBwp->pdsch_Config->choice.setup)
    {
-      if(extractDrbCfg(drbCfg, NULL, lcCfg, upTnlInfo) != ROK)
-      {
-         DU_LOG("ERROR  -->  F1AP : Failed to build Drb Qos at extractMacRbCfg()");
-         return RFAILED;
-      }
-   }
-   else if(drbSetupModCfg != NULLP)
-   { 
-      if(extractDrbCfg(NULL, drbSetupModCfg, lcCfg, upTnlInfo) != ROK)
+      pdschCfg=dlBwp->pdsch_Config->choice.setup;
+      if(pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA)
       {
-         DU_LOG("ERROR  -->  F1AP : Failed to build Drb Qos at extractMacRbCfg()");
-         return RFAILED;
+        if(pdschCfg->pdsch_TimeDomainAllocationList)
+        {
+           timeDomAllocList=pdschCfg->pdsch_TimeDomainAllocationList;
+           if(pdschCfg->maxNrofCodeWordsScheduledByDCI)
+           {
+              prbBndlType=&pdschCfg->prb_BundlingType;
+              free(prbBndlType->choice.staticBundling);
+              free(pdschCfg->maxNrofCodeWordsScheduledByDCI);
+           }
+           freeAperDecodePdschTimeDomAllocationList(timeDomAllocList);
+           free(pdschCfg->pdsch_TimeDomainAllocationList);
+        }
+        dmrsDlCfg=pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA;
+        if(dmrsDlCfg->choice.setup)
+        {
+           free(dmrsDlCfg->choice.setup->dmrs_AdditionalPosition);
+           free(dmrsDlCfg->choice.setup);
+        }
+        free(pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA);
       }
+      free(dlBwp->pdsch_Config->choice.setup);
    }
-   else
-   {
-      lcCfg->drbQos = NULLP;
-      lcCfg->snssai = NULLP;
-      if(lcCfg->lcId == SRB2_LCID)
-         lcCfg->dlLcCfg.lcp = LC_PRIORITY_3;
-      else
-         lcCfg->dlLcCfg.lcp = LC_PRIORITY_1;
-   }
-   if(ulLcCfg)
-   {
-      lcCfg->ulLcCfgPres = true;
-      extractUlLcCfg(&lcCfg->ulLcCfg, ulLcCfg);
-   }
-   else
-      lcCfg->ulLcCfgPres = false;
-   return ROK;
 }
-
 /*******************************************************************
- *
- * @brief Function processing LC config info received from CU
- *
- * @details
- *
- *    Function : procMacLcCfg
- *
- *    Functionality: Function processing LC config info received from CU
- *
- * @params[in] F1AP message
- * @return ROK/RFAILED
- *
- * ****************************************************************/
+*
+* @brief Function to free PuschTimeDomAllocListCfg
+                 where the memory allocated by aper_decoder
+*
+* @details
+*
+*    Function : freeAperDecodePuschTimeDomAllocListCfg
+*
+*    Functionality: Function to free PuschTimeDomAllocListCfg
+*
+* @params[in] PUSCH_Config_t *puschCfg 
+* @return void
+*
+* ****************************************************************/
 
-uint8_t procMacLcCfg(uint8_t lcId, uint8_t rbType, uint8_t configType,\
-DRBs_ToBeSetup_Item_t *drbItem, DRBs_ToBeSetupMod_Item_t *drbSetupModItem, LogicalChannelConfig_t *ulLcCfg,\
-LcCfg *lcCfg, UpTnlCfg *upTnlInfo)
+
+void freeAperDecodePuschTimeDomAllocListCfg(PUSCH_Config_t *puschCfg)
 {
-   uint8_t ret = ROK;
+   uint8_t arrIdx=0;
+   uint8_t arrIdx1=0;
+   struct PUSCH_Config__pusch_TimeDomainAllocationList *timeDomAllocList_t=NULLP;
 
-   lcCfg->lcId = lcId;
-   lcCfg->configType = configType;
-   if(rbType == RB_TYPE_SRB)
+   if(puschCfg->pusch_TimeDomainAllocationList)
    {
-      ret = extractMacRbCfg(lcId, NULL,NULL, ulLcCfg, lcCfg, NULL);
+      timeDomAllocList_t=puschCfg->pusch_TimeDomainAllocationList;
+      if(timeDomAllocList_t->choice.setup)
+      {
+        if(timeDomAllocList_t->choice.setup->list.array)
+        {
+           free(timeDomAllocList_t->choice.setup->list.array[arrIdx1]->k2);
+           for(arrIdx = 0; arrIdx<timeDomAllocList_t->choice.setup->list.count; arrIdx++)
+           {
+              free(timeDomAllocList_t->choice.setup->list.array[arrIdx]);
+           }
+           free(timeDomAllocList_t->choice.setup->list.array);
+        }
+        free(timeDomAllocList_t->choice.setup);
+      }
+      free(puschCfg->transformPrecoder);
+      free(puschCfg->pusch_TimeDomainAllocationList);
+   }
+}
+/*******************************************************************
+*
+* @brief Function to free InitialUlBWPConfig where memory allocated by aper_decoder
+*
+* @details
+*
+*    Function : freeAperDecodeInitialUlBWPConfig 
+*
+*    Functionality: Function to free InitialUlBWPConfig
+*
+* @params[in]  BWP_UplinkDedicated_t *ulBwp
+* @return void
+*
+* ****************************************************************/
+
+
+void freeAperDecodeInitialUlBWPConfig(BWP_UplinkDedicated_t *ulBwp)
+{
+   uint8_t  rSetIdx =0;
+   uint8_t  rsrcIdx =0;
+   SRS_Config_t   *srsCfg = NULLP;
+   PUSCH_Config_t *puschCfg = NULLP;
+   struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA *dmrsUlCfg = NULLP;
+   struct SRS_Config__srs_ResourceSetToAddModList *rsrcSetList = NULLP;
+   struct SRS_ResourceSet__srs_ResourceIdList *rsrcIdList = NULLP;
+   struct SRS_Config__srs_ResourceToAddModList *resourceList = NULLP;
+
+   if(ulBwp->pusch_Config)
+   {
+      if(ulBwp->pusch_Config->choice.setup)
+      {
+        puschCfg=ulBwp->pusch_Config->choice.setup;
+        if(puschCfg->dataScramblingIdentityPUSCH)
+        {
+           if(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA)
+           {
+              freeAperDecodePuschTimeDomAllocListCfg(puschCfg);
+              dmrsUlCfg=puschCfg->dmrs_UplinkForPUSCH_MappingTypeA;
+              if(dmrsUlCfg->choice.setup)
+              {
+                 if(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition)
+                 {
+                    if(dmrsUlCfg->choice.setup->transformPrecodingDisabled)
+                    {
+                       free(dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0);
+                       free(dmrsUlCfg->choice.setup->transformPrecodingDisabled);
+                    }
+                    free(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition);
+                 }
+                 free(dmrsUlCfg->choice.setup);
+              }
+              free(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA);
+           }
+           free(puschCfg->dataScramblingIdentityPUSCH);
+        }
+        free(ulBwp->pusch_Config->choice.setup);
+      }
+      free(ulBwp->pusch_Config);
+
+      /* Free SRS-Config */
+      if(ulBwp->srs_Config)
+      {
+        if(ulBwp->srs_Config->choice.setup)
+        {
+           srsCfg = ulBwp->srs_Config->choice.setup;
+
+           /* Free Resource Set to add/mod list */
+           if(srsCfg->srs_ResourceSetToAddModList)
+           {
+              rsrcSetList = srsCfg->srs_ResourceSetToAddModList;
+              if(rsrcSetList->list.array)
+              {
+                 rSetIdx = 0;
+
+                 /* Free SRS resource Id list in this SRS resource set */
+                 if(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList)
+                 {
+                    rsrcIdList =
+                       rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList;
+
+                    if(rsrcIdList->list.array)
+                    {
+                       for(rsrcIdx = 0; rsrcIdx < rsrcIdList->list.count;
+                             rsrcIdx++)
+                       {
+                          free(rsrcIdList->list.array[rsrcIdx]);
+                       }
+                       free(rsrcIdList->list.array);
+                    }
+                    free(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList);
+                 }
+
+                 /* Free resource type info for this SRS resource set */
+
+                 free(rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic);
+
+                 /* Free memory for each resource set */
+                 for(rSetIdx = 0; rSetIdx < rsrcSetList->list.count; rSetIdx++)
+                 {
+                    free(rsrcSetList->list.array[rSetIdx]);
+                 }
+                 free(rsrcSetList->list.array);
+              }
+              free(srsCfg->srs_ResourceSetToAddModList);
+           }
+
+           /* Free resource to add/modd list */
+           if(srsCfg->srs_ResourceToAddModList)
+           {
+              resourceList = srsCfg->srs_ResourceToAddModList;
+              if(resourceList->list.array)
+              {
+                 rsrcIdx = 0;
+
+                 free(resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2);
+                 free(resourceList->list.array[rsrcIdx]->resourceType.choice.aperiodic);
+
+                 for(rsrcIdx = 0; rsrcIdx < resourceList->list.count; rsrcIdx++)
+                 {
+                    free(resourceList->list.array[rsrcIdx]);
+                 }
+                 free(resourceList->list.array);
+              }
+              free(srsCfg->srs_ResourceToAddModList);
+           }
+
+           free(ulBwp->srs_Config->choice.setup);
+        }
+        free(ulBwp->srs_Config);
+      }
+   }
+}
+/*******************************************************************
+*
+* @brief Function to free initialUplinkBWPConfig where memory allocated by aper_decoder
+*
+* @details
+*
+*    Function : freeAperDecodeinitialUplinkBWPConfig
+*
+*    Functionality: Function to free initialUplinkBWPConfig
+*
+* @params[in] UplinkConfig_t *ulCfg 
+* @return void
+*
+* ****************************************************************/
+
+
+void freeAperDecodeinitialUplinkBWPConfig(UplinkConfig_t *ulCfg)
+{
+   BWP_UplinkDedicated_t *ulBwp=NULLP;
+   struct UplinkConfig__pusch_ServingCellConfig *puschCfg=NULLP;
+   
+   if(ulCfg->initialUplinkBWP)
+   {
+      ulBwp=ulCfg->initialUplinkBWP;
+      if(ulCfg->firstActiveUplinkBWP_Id)
+      {
+        if(ulCfg->pusch_ServingCellConfig)
+        {
+           puschCfg=ulCfg->pusch_ServingCellConfig;
+           if(puschCfg->choice.setup)
+           {
+              if(puschCfg->choice.setup->ext1)
+              {
+                 free(puschCfg->choice.setup->ext1->processingType2Enabled);
+                 free(puschCfg->choice.setup->ext1->maxMIMO_Layers);
+                 free(puschCfg->choice.setup->ext1);
+              }
+              free(puschCfg->choice.setup);
+           }
+           free(ulCfg->pusch_ServingCellConfig);
+        }
+        free(ulCfg->firstActiveUplinkBWP_Id);
+      }
+      freeAperDecodeInitialUlBWPConfig(ulBwp);
+      free(ulCfg->initialUplinkBWP);
+   }
+}
+
+/*******************************************************************
+ *
+ * @brief Function to free DuUeCfg
+ *
+ * @details
+ *
+ *    Function : freeDuUeCfg
+ *
+ *    Functionality: Function to free DuUeCfg
+ *
+ * @params[in] DuUeCfg *ueCfg
+ * @return void
+ *
+ * ****************************************************************/
+void freeDuUeCfg(DuUeCfg *ueCfg)
+{
+   uint8_t lcIdx = 0;
+   uint8_t arrIdx = 0;
+   SpCellConfig_t *spCellCfg = NULLP;
+   ServingCellConfig_t *srvCellCfg = NULLP;
+   BWP_DownlinkDedicated_t *dlBwp = NULLP;
+   MAC_CellGroupConfig_t *macCellGrpCfg = NULLP;
+   PhysicalCellGroupConfig_t *phyCellGrpCfg = NULLP;
+   struct CellGroupConfigRrc__rlc_BearerToAddModList *rlcBearerList = NULLP;
+   struct RLC_Config *rlcConfig = NULLP;
+   struct LogicalChannelConfig *macLcConfig = NULLP;
+   struct SchedulingRequestConfig *schedulingRequestConfig = NULLP;
+   struct SchedulingRequestConfig__schedulingRequestToAddModList *schReqList = NULLP;
+   struct TAG_Config *tagConfig = NULLP;
+   struct TAG_Config__tag_ToAddModList *tagList = NULLP;
+   struct MAC_CellGroupConfig__phr_Config *phrConfig = NULLP;
+   struct ServingCellConfig__pdsch_ServingCellConfig *pdschCfg = NULLP;
+   CellGroupConfigRrc_t *cellGrpCfg = ueCfg->cellGrpCfg;
+  
+   if(ueCfg->ueNrCapability)
+   {
+      freeAperDecodeUeNrCapability(ueCfg->ueNrCapability);
+      DU_FREE(ueCfg->ueNrCapability, sizeof(UE_NR_Capability_t));
+      ueCfg->ueNrCapability = NULLP;
+   }
+
+   if(ueCfg->cellGrpCfg)
+   {
+      
+      rlcBearerList = cellGrpCfg->rlc_BearerToAddModList;
+      if(rlcBearerList)
+      {
+        if(rlcBearerList->list.array)
+        {
+           for(arrIdx=0; arrIdx<rlcBearerList->list.count; arrIdx++)
+           {
+              if(rlcBearerList->list.array[arrIdx])
+              {
+                 rlcConfig   = rlcBearerList->list.array[arrIdx]->rlc_Config;
+                 macLcConfig = rlcBearerList->list.array[arrIdx]->mac_LogicalChannelConfig;
+                 
+                 if(rlcBearerList->list.array[arrIdx]->servedRadioBearer)
+                 {
+                    free(rlcBearerList->list.array[arrIdx]->servedRadioBearer);
+                 }
+                 if(rlcConfig)
+                 {
+                    if(rlcConfig->choice.am)
+                    {
+                       free(rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength);
+                       free(rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength);
+                       free(rlcConfig->choice.am);
+                    }
+                    free(rlcBearerList->list.array[arrIdx]->rlc_Config);
+                 }
+                 if(macLcConfig)
+                 {
+                    if(macLcConfig->ul_SpecificParameters)
+                    {
+                       free(macLcConfig->ul_SpecificParameters->schedulingRequestID);
+                       free(macLcConfig->ul_SpecificParameters->logicalChannelGroup);
+                       free(macLcConfig->ul_SpecificParameters);
+                    }
+                    free(rlcBearerList->list.array[arrIdx]->mac_LogicalChannelConfig);
+                 }
+                 free(rlcBearerList->list.array[arrIdx]); 
+              }
+           }
+           free(rlcBearerList->list.array);
+        }
+        free(cellGrpCfg->rlc_BearerToAddModList);
+      }
+
+      macCellGrpCfg = cellGrpCfg->mac_CellGroupConfig;
+      if(macCellGrpCfg)
+      {
+        schedulingRequestConfig = macCellGrpCfg->schedulingRequestConfig;
+        if(schedulingRequestConfig)
+        {
+           schReqList = schedulingRequestConfig->schedulingRequestToAddModList;
+           if(schReqList)
+           {
+              if(schReqList->list.array)
+              {
+                 for(arrIdx=0;arrIdx<schReqList->list.count; arrIdx++)
+                 {
+                    if(schReqList->list.array[arrIdx])
+                    {
+                       free(schReqList->list.array[arrIdx]->sr_ProhibitTimer); 
+                       free(schReqList->list.array[arrIdx]);
+                    }
+                 }
+                 free(schReqList->list.array);
+              }
+              free(schedulingRequestConfig->schedulingRequestToAddModList);
+           }
+           free(macCellGrpCfg->schedulingRequestConfig);
+        }
+        if(macCellGrpCfg->bsr_Config)
+        {
+           free(macCellGrpCfg->bsr_Config);
+        }
+        tagConfig = macCellGrpCfg->tag_Config;
+        if(tagConfig)
+        {
+           tagList = tagConfig->tag_ToAddModList;
+           if(tagList)
+           {
+              if(tagList->list.array)
+              {
+                 for(arrIdx=0; arrIdx<tagList->list.count; arrIdx++)
+                 {
+                    free(tagList->list.array[arrIdx]);
+                 }
+                 free(tagList->list.array);
+              }
+              free(tagConfig->tag_ToAddModList);
+           }
+           free(tagConfig); 
+        }
+
+        phrConfig = macCellGrpCfg->phr_Config;
+        if(phrConfig)
+        {
+           free(phrConfig->choice.setup); 
+           free(phrConfig); 
+        }
+
+        free(macCellGrpCfg); 
+      }
+
+      phyCellGrpCfg = cellGrpCfg->physicalCellGroupConfig;
+      if(phyCellGrpCfg)
+      {
+        free(phyCellGrpCfg->p_NR_FR1);
+        free(phyCellGrpCfg); 
+      }
+
+      spCellCfg = cellGrpCfg->spCellConfig;
+      if(spCellCfg)
+      {
+        if(spCellCfg->servCellIndex)
+        {
+           if(spCellCfg->rlmInSyncOutOfSyncThreshold)
+           {
+              if(spCellCfg->spCellConfigDedicated)
+              {
+                 srvCellCfg = spCellCfg->spCellConfigDedicated;
+                 if(srvCellCfg->initialDownlinkBWP)
+                 {
+                    dlBwp = srvCellCfg->initialDownlinkBWP;
+                    if(srvCellCfg->firstActiveDownlinkBWP_Id)
+                    {
+                       if(srvCellCfg->defaultDownlinkBWP_Id)
+                       {
+                          if(srvCellCfg->uplinkConfig)
+                          {
+
+                             if(srvCellCfg->pdsch_ServingCellConfig)
+                             {
+                                pdschCfg=
+                                   srvCellCfg->pdsch_ServingCellConfig;
+                                if(pdschCfg->choice.setup)
+                                {
+
+                                   free(pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH);
+                                   free(pdschCfg->choice.setup);
+                                }
+
+                                free(srvCellCfg->pdsch_ServingCellConfig);
+                             }
+
+                             freeAperDecodeinitialUplinkBWPConfig(srvCellCfg->uplinkConfig);
+                             free(srvCellCfg->uplinkConfig);
+                          }
+                          free(srvCellCfg->defaultDownlinkBWP_Id);
+                       }
+
+                       free(srvCellCfg->firstActiveDownlinkBWP_Id);
+                    }
+                    if(dlBwp->pdcch_Config)
+                    {
+                       if(dlBwp->pdsch_Config)
+                       {
+                          freeAperDecodeBWPDlDedPdschConfig(dlBwp);
+                          free(dlBwp->pdsch_Config);
+                       }
+                       freeAperDecodeBWPDlDedPdcchConfig(dlBwp);
+                       free(dlBwp->pdcch_Config);
+                    }
+                    free(srvCellCfg->initialDownlinkBWP);
+                 }
+
+                 free(spCellCfg->spCellConfigDedicated);
+              }
+              free(spCellCfg->rlmInSyncOutOfSyncThreshold);
+           }
+           free(spCellCfg->servCellIndex); 
+        }
+        free(spCellCfg);
+      }
+      DU_FREE(ueCfg->cellGrpCfg, sizeof(CellGroupConfigRrc_t));
+      ueCfg->cellGrpCfg = NULLP;
+   }
+   if(ueCfg->ambrCfg)
+   {
+      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, ueCfg->ambrCfg, sizeof(AmbrCfg));
+   }
+   for(lcIdx = 0; lcIdx < ueCfg->numRlcLcs; lcIdx++)
+   {
+      freeRlcLcCfg(&ueCfg->rlcLcCfg[lcIdx]);
+   }
+   for(lcIdx = 0; lcIdx < ueCfg->numMacLcs; lcIdx++)
+   {
+      freeMacLcCfg(&ueCfg->macLcCfg[lcIdx]);
+   }
+   for(lcIdx = 0; lcIdx < ueCfg->numDrb; lcIdx++)
+   {
+      DU_FREE(ueCfg->upTnlInfo[lcIdx].tnlCfg1, sizeof(GtpTnlCfg));
+   }
+}
+
+/*******************************************************************
+ *
+ * @brief Function to free UecontextSetupDb
+ *
+ * @details
+ *
+ *    Function : freeF1UeDb
+ *
+ *    Functionality: Function to free UecontextSetupDb
+ *
+ * @params[in] UecontextSetupDb *
+ * @return void
+ *
+ * ****************************************************************/
+
+void freeF1UeDb(F1UeContextSetupDb *f1UeDb)
+{
+   
+   if(f1UeDb->dlRrcMsg)
+   {
+      if(f1UeDb->dlRrcMsg->rrcMsgPdu)
+      {
+        //DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,\
+              f1UeDb->dlRrcMsg->rrcMsgPdu, f1UeDb->dlRrcMsg->rrcMsgSize);
+      }
+      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, f1UeDb->dlRrcMsg, sizeof(F1DlRrcMsg));
+   }
+   freeDuUeCfg(&f1UeDb->duUeCfg);
+   memset(f1UeDb, 0, sizeof(F1UeContextSetupDb));
+   DU_FREE(f1UeDb, sizeof(F1UeContextSetupDb));
+}
+
+/*******************************************************************
+ *
+ * @brief Function to build Am cfg Info
+ *
+ * @details
+ *
+ *    Function : extractRlcAmCfg
+ *
+ *    Functionality: Function to build Am cfg Info
+ *
+ * @params[in] AmBearerCfg *
+ *             void *
+ *
+ * @return ROK/RFAILED
+ *
+ * ****************************************************************/
+
+void extractRlcAmCfg(AmBearerCfg *amCfgToSet, struct RLC_Config__am *rlcAmCfg)
+{
+   if(rlcAmCfg)
+   {
+      /* UL AM */
+      if(rlcAmCfg->dl_AM_RLC.sn_FieldLength)
+      {
+        amCfgToSet->ulAmCfg.snLenUl = covertAmSnLenFromRrcEnumToIntEnum(*(rlcAmCfg->dl_AM_RLC.sn_FieldLength));
+         /*TODO: Check the timer value when sent by real CU */
+        amCfgToSet->ulAmCfg.reAssemTmr = convertReasmblTmrEnumToValue(rlcAmCfg->dl_AM_RLC.t_Reassembly); 
+        amCfgToSet->ulAmCfg.statProhTmr = convertProhibitTmrEnumToValue(rlcAmCfg->dl_AM_RLC.t_StatusProhibit);
+      }
+
+      /* DL AM */
+      if(rlcAmCfg->ul_AM_RLC.sn_FieldLength)
+      {
+        amCfgToSet->dlAmCfg.snLenDl = covertAmSnLenFromRrcEnumToIntEnum(*(rlcAmCfg->ul_AM_RLC.sn_FieldLength));
+        amCfgToSet->dlAmCfg.pollRetxTmr = covertPollRetxTmrEnumToValue(rlcAmCfg->ul_AM_RLC.t_PollRetransmit);
+        amCfgToSet->dlAmCfg.pollPdu   = covertPollPduEnumToValue(rlcAmCfg->ul_AM_RLC.pollPDU);
+        amCfgToSet->dlAmCfg.pollByte  = covertPollByteEnumToValue(rlcAmCfg->ul_AM_RLC.pollByte);
+        amCfgToSet->dlAmCfg.maxRetxTh = covertMaxRetxEnumToValue(rlcAmCfg->ul_AM_RLC.maxRetxThreshold);
+      }
+   }
+}
+
+/*******************************************************************
+ *
+ * @brief Function to build Um Bi Info
+ *
+ * @details
+ *
+ *    Function : extractRlcUmBiCfg
+ *
+ *    Functionality: Function to build Um Bi Info
+ *
+ * @params[in] UmBiDirBearerCfg *
+ *             void *
+ *
+ * @return ROK/RFAILED
+ *
+ * ****************************************************************/
+
+void extractRlcUmBiCfg(UmBiDirBearerCfg *umBiCfgToSet, struct RLC_Config__um_Bi_Directional *rlcBiCfg)
+{
+   if(rlcBiCfg)
+   {
+      /* UL UM BI DIR Cfg */
+      if(rlcBiCfg->dl_UM_RLC.sn_FieldLength)
+      {
+        umBiCfgToSet->ulUmCfg.snLenUlUm  = covertUmSnLenFromRrcEnumToIntEnum(*(rlcBiCfg->dl_UM_RLC.sn_FieldLength));
+        umBiCfgToSet->ulUmCfg.reAssemTmr = convertReasmblTmrEnumToValue(rlcBiCfg->dl_UM_RLC.t_Reassembly);
+      }
+
+      /* DL UM BI DIR Cfg */
+      if(rlcBiCfg->ul_UM_RLC.sn_FieldLength)
+        umBiCfgToSet->dlUmCfg.snLenDlUm  = covertUmSnLenFromRrcEnumToIntEnum(*(rlcBiCfg->ul_UM_RLC.sn_FieldLength));
+   }
+}
+
+/*******************************************************************
+ *
+ * @brief Function to build Um Ul Info
+ *
+ * @details
+ *
+ *    Function : extractRlcUmUlCfg
+ *
+ *    Functionality: Function to build Um Ul Info
+ *
+ * @params[in] UmUniDirUlBearerCfg *
+ *             void *
+ *
+ * @return ROK/RFAILED
+ *
+ * ****************************************************************/
+
+void extractRlcUmUlCfg(UmUniDirUlBearerCfg *umUlCfgToSet, struct RLC_Config__um_Uni_Directional_DL *umUlCfg)
+{
+   if(umUlCfg)
+   {
+      if(umUlCfg->dl_UM_RLC.sn_FieldLength)
+      {
+         umUlCfgToSet->ulUmCfg.snLenUlUm  = covertUmSnLenFromRrcEnumToIntEnum(*(umUlCfg->dl_UM_RLC.sn_FieldLength));
+         umUlCfgToSet->ulUmCfg.reAssemTmr = convertReasmblTmrEnumToValue(umUlCfg->dl_UM_RLC.t_Reassembly);
+      }
+   }
+}
+
+/*******************************************************************
+ *
+ * @brief Function to build Um Uni Dl Info
+ *
+ * @details
+ *
+ *    Function : extractRlcUmDlCfg
+ *
+ *    Functionality: Function to build Um Uni Dl Info
+ *
+ * @params[in] UmUniDirDlBearerCfg *
+ *             void *
+ *
+ * @return ROK/RFAILED
+ *
+ * ****************************************************************/
+void extractRlcUmDlCfg(UmUniDirDlBearerCfg *umDlCfgToSet, struct RLC_Config__um_Uni_Directional_UL *umDlCfg)
+{
+   if(umDlCfg)
+   {
+      if(umDlCfg->ul_UM_RLC.sn_FieldLength)
+         umDlCfgToSet->dlUmCfg.snLenDlUm  = covertUmSnLenFromRrcEnumToIntEnum(*(umDlCfg->ul_UM_RLC.sn_FieldLength));
+   }
+}
+
+/*******************************************************************
+ *
+ * @brief Function to extractRlcModeCfg
+ *
+ * @details
+ *
+ *    Function : extractRlcModeCfg
+ *
+ *    Functionality: Function to extractRlcModeCfg
+ *
+ * @params[in] RLC_Config_t *
+ *             RlcBearerCfg *
+ *             void  *    
+ * @return ROK/RFAILED
+ *
+ * ****************************************************************/
+void extractRlcModeCfg(uint8_t rlcMode, RlcBearerCfg *rlcDbCfg, RLC_Config_t *lcCfg)
+{
+   if(lcCfg)
+   {
+      switch(rlcMode)
+      {
+         case RLC_AM :
+            {
+               if(lcCfg->choice.am)
+               {
+                  DU_ALLOC_SHRABL_BUF(rlcDbCfg->u.amCfg, sizeof(AmBearerCfg));
+                  if(rlcDbCfg->u.amCfg)
+                     extractRlcAmCfg(rlcDbCfg->u.amCfg, lcCfg->choice.am);
+               }
+               break;
+            }
+         case RLC_UM_BI_DIRECTIONAL :
+            {
+               if(lcCfg->choice.um_Bi_Directional)
+               {
+                  DU_ALLOC_SHRABL_BUF(rlcDbCfg->u.umBiDirCfg, sizeof(UmBiDirBearerCfg));
+                  if(rlcDbCfg->u.umBiDirCfg)
+                     extractRlcUmBiCfg(rlcDbCfg->u.umBiDirCfg, lcCfg->choice.um_Bi_Directional);
+               }
+               break;
+            }
+         case RLC_UM_UNI_DIRECTIONAL_UL :
+            {
+               if(lcCfg->choice.um_Uni_Directional_DL)
+               {
+                  DU_ALLOC_SHRABL_BUF(rlcDbCfg->u.umUniDirUlCfg, sizeof(UmUniDirUlBearerCfg));
+                  if(rlcDbCfg->u.umUniDirUlCfg)
+                     extractRlcUmUlCfg(rlcDbCfg->u.umUniDirUlCfg, lcCfg->choice.um_Uni_Directional_DL);
+               }
+               break;
+            }
+         case RLC_UM_UNI_DIRECTIONAL_DL :
+            {
+               if(lcCfg->choice.um_Uni_Directional_UL)
+               {
+                  DU_ALLOC_SHRABL_BUF(rlcDbCfg->u.umUniDirDlCfg, sizeof(UmUniDirDlBearerCfg));
+                  if(rlcDbCfg->u.umUniDirDlCfg)
+                     extractRlcUmDlCfg(rlcDbCfg->u.umUniDirDlCfg, lcCfg->choice.um_Uni_Directional_UL);
+               }
+               break;
+            }
+         default:
+            DU_LOG("\nERROR  -->  DUAPP: Invalid rlcMode %d at extractRlcCfgToAddMod()", rlcMode);
+            break;
+      }
+   }
+}
+
+/*******************************************************************
+ *
+ * @brief Function to extract extractUlLcCfg
+ *
+ * @details
+ *
+ *    Function : extractUlLcCfg
+ *
+ *    Functionality: Function to extract extractUlLcCfg
+ *
+ * @params[in] UlLcCfg *f1UlLcCfg, LogicalChannelConfig_t *ulLcCfg
+ * @return void
+ *
+ * ****************************************************************/
+
+void extractUlLcCfg(UlLcCfg *f1UlLcCfg, LogicalChannelConfig_t *ulLcCfg)
+{
+   if(ulLcCfg)
+   {
+      if(ulLcCfg->ul_SpecificParameters)
+      {
+         f1UlLcCfg->priority = \
+            ulLcCfg->ul_SpecificParameters->priority;
+      if(ulLcCfg->ul_SpecificParameters->logicalChannelGroup)
+      {
+         f1UlLcCfg->lcGroup = \
+           *(ulLcCfg->ul_SpecificParameters->logicalChannelGroup);
+      }
+      if(ulLcCfg->ul_SpecificParameters->schedulingRequestID)
+      {
+         f1UlLcCfg->schReqId = \
+           *(ulLcCfg->ul_SpecificParameters->schedulingRequestID);
+      }
+      f1UlLcCfg->pbr = \
+         ulLcCfg->ul_SpecificParameters->prioritisedBitRate;
+      f1UlLcCfg->bsd = \
+         ulLcCfg->ul_SpecificParameters->bucketSizeDuration;
+      }
+   }
+}
+
+/*******************************************************************
+*
+* @brief Function to extract Snssai Cfg Info from CU
+*
+* @details
+*
+*    Function : extractDrbSnssaiCfg
+*
+*    Functionality: Function to extract Drb Snssai Cfg Info from CU
+*
+* @params[in] DRB_Information_t *drbInfo, Snssai  *snssai
+* @return ROK/RFAILED
+*
+* ****************************************************************/
+
+uint8_t extractDrbSnssaiCfg(SNSSAI_t *RecvSnssai, Snssai **snssaiToBeShared)
+{
+   if(!(*snssaiToBeShared))
+   {
+      DU_ALLOC_SHRABL_BUF((*snssaiToBeShared), sizeof(Snssai));
+      if(snssaiToBeShared == NULLP)
+      {
+         DU_LOG("\nERROR  -->  DUAPP : extractDrbSnssaiCfg(): Memory failed at allocating for SNSSAI ");
+         return RFAILED;
+      }
+   }
+   if(RecvSnssai)
+   {
+      memcpy(&(*snssaiToBeShared)->sst, RecvSnssai->sST.buf, RecvSnssai->sST.size);
+      if(RecvSnssai->sD)
+      {
+         memcpy((*snssaiToBeShared)->sd, RecvSnssai->sD->buf,  RecvSnssai->sD->size);
+      }
+      else
+      {
+         DU_LOG("\nERROR  -->  DUAPP : extractDrbSnssaiCfg(): Received Null pointer of Snssai->SD");
+         return RFAILED;
+      }
+   }
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Function to procRlcLcCfg
+ *
+ * @details
+ *
+ *    Function : procRlcLcCfg
+ *
+ *    Functionality: Function to procRlcLcCfg
+ *
+ * @params[in] rbId, lcId, rbType, rlcMod
+ *             RLC_Config_t *, RlcBearerCfg * , 
+ * @return void
+ *
+ * ****************************************************************/
+
+void procRlcLcCfg(uint8_t rbId, uint8_t lcId, uint8_t rbType, uint8_t rlcMode,\
+   uint8_t configType, RLC_Config_t *f1RlcCfg, RlcBearerCfg *lcCfg, QoSInformation_t *qoSInformation)
+{
+   DRB_Information_t *drbInfo;
+
+   lcCfg->rbId   = rbId;
+   lcCfg->configType = configType;
+
+   if(rbType == RB_TYPE_SRB)
+   {
+      lcCfg->rbType = RB_TYPE_SRB;
+      lcCfg->lcId   = rbId;
+      lcCfg->lcType = LCH_DCCH;
+      lcCfg->rlcMode = RLC_AM;
+   }
+   else if(rbType == RB_TYPE_DRB)
+   {
+      lcCfg->rbType = RB_TYPE_DRB;
+      lcCfg->lcId   = lcId;
+      lcCfg->lcType = LCH_DTCH;
+      lcCfg->rlcMode = rlcMode;
+   }
+   if(f1RlcCfg) /* rlc mode config recived */
+   {
+      extractRlcModeCfg(lcCfg->rlcMode, lcCfg, f1RlcCfg);
+   }
+   if(qoSInformation != NULLP)
+   {
+      if(qoSInformation->present == QoSInformation_PR_choice_extension)
+      {
+         if(qoSInformation->choice.choice_extension->value.present ==\
+               QoSInformation_ExtIEs__value_PR_DRB_Information)
+         {
+            drbInfo = &qoSInformation->choice.choice_extension->value.choice.DRB_Information; 
+            if(extractDrbSnssaiCfg(&drbInfo->sNSSAI, &lcCfg->snssai) != ROK)
+            {
+               DU_LOG("\nERROR  -->  DUAPP: Unable to extract Snssai information at procRlcLcCfg()");
+               return;
+            }
+         }
+      }
+   }
+}
+
+/*******************************************************************
+ *
+ * @brief Fills DrbQos Info received by CU
+ *
+ * @details
+ *
+ *    Function : extractQosInfo
+ *
+ *    Functionality: Fills DrbQos Info received  by CU
+ *
+ * @params[in] DrbQosInfo *qosToAdd, 
+ *             QoSFlowLevelQoSParameters_t *qosFlowCfg
+ * @return void
+ *
+ * ****************************************************************/
+
+void extractQosInfo(DrbQosInfo *qosToAdd, QoSFlowLevelQoSParameters_t *qosFlowCfg)
+{
+   uint8_t qosCntIdx = 0;
+   ProtocolExtensionContainer_4624P74_t *qosIeExt = NULLP;
+
+   qosToAdd->fiveQiType = qosFlowCfg->qoS_Characteristics.present;
+   qosToAdd->u.nonDyn5Qi.fiveQi     =\
+                                     qosFlowCfg->qoS_Characteristics.choice.non_Dynamic_5QI->fiveQI;
+   if(qosFlowCfg->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow)
+   {
+      qosToAdd->u.nonDyn5Qi.avgWindow = \
+                                        *(qosFlowCfg->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow);
+   }
+
+   if(qosFlowCfg->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume)
+   {
+      qosToAdd->u.nonDyn5Qi.maxDataBurstVol = \
+                                              *(qosFlowCfg->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume);
+   }
+
+   if(qosFlowCfg->qoS_Characteristics.choice.non_Dynamic_5QI->qoSPriorityLevel)
+   {
+      qosToAdd->u.nonDyn5Qi.priorLevel = \
+                                         *(qosFlowCfg->qoS_Characteristics.choice.non_Dynamic_5QI->qoSPriorityLevel);
+   }
+   qosToAdd->ngRanRetPri.priorityLevel = \
+                                         qosFlowCfg->nGRANallocationRetentionPriority.priorityLevel; 
+   qosToAdd->ngRanRetPri.preEmptionCap = \
+                                         qosFlowCfg->nGRANallocationRetentionPriority.pre_emptionCapability;
+   qosToAdd->ngRanRetPri.preEmptionVul = \
+                                         qosFlowCfg->nGRANallocationRetentionPriority.pre_emptionVulnerability;
+   if(qosFlowCfg->gBR_QoS_Flow_Information)
+   {
+      memcpy(&qosToAdd->grbQosInfo.maxFlowBitRateDl, \
+            qosFlowCfg->gBR_QoS_Flow_Information->maxFlowBitRateDownlink.buf, \
+            qosFlowCfg->gBR_QoS_Flow_Information->maxFlowBitRateDownlink.size);
+      memcpy(&qosToAdd->grbQosInfo.maxFlowBitRateUl, \
+            qosFlowCfg->gBR_QoS_Flow_Information->maxFlowBitRateUplink.buf, \
+            qosFlowCfg->gBR_QoS_Flow_Information->maxFlowBitRateUplink.size);
+      memcpy(&qosToAdd->grbQosInfo.guarFlowBitRateDl,\
+            qosFlowCfg->gBR_QoS_Flow_Information->guaranteedFlowBitRateDownlink.buf, \
+            qosFlowCfg->gBR_QoS_Flow_Information->guaranteedFlowBitRateDownlink.size);
+      memcpy(&qosToAdd->grbQosInfo.guarFlowBitRateUl,\
+            qosFlowCfg->gBR_QoS_Flow_Information->guaranteedFlowBitRateUplink.buf, \
+            qosFlowCfg->gBR_QoS_Flow_Information->guaranteedFlowBitRateUplink.size);
+   }
+   /*Extracting PDU_SESSION_ID*/
+   qosIeExt = (ProtocolExtensionContainer_4624P74_t *)qosFlowCfg->iE_Extensions;
+   if(qosIeExt)
+   {
+      for(qosCntIdx = 0; qosCntIdx < qosIeExt->list.count; qosCntIdx++)
+      {
+         if(qosIeExt->list.array[qosCntIdx]->extensionValue.present == \
+               QoSFlowLevelQoSParameters_ExtIEs__extensionValue_PR_PDUSessionID)
+         {
+            qosToAdd->pduSessionId = qosIeExt->list.array[qosCntIdx]->extensionValue.choice.PDUSessionID;
+            DU_LOG("\nDEBUG -->  DU_F1AP : extractQosInfo: PDU SessionID:%d",qosToAdd->pduSessionId);
+         }
+      }  
+   }
+   qosToAdd->ulPduSessAggMaxBitRate = 0;
+}
+
+/*******************************************************************
+ *
+ * @brief Function to extract GTP Tunnel Info from CU
+ *
+ * @details
+ *
+ *    Function : extractUpTnlInfo
+ *
+ *    Functionality: Function to extract GTP Tunnel Info from CU
+ *
+ * @params[in] F1AP message
+ * @return ROK/RFAILED
+ *
+ * ****************************************************************/
+
+uint8_t extractUpTnlInfo(uint8_t drbId, uint8_t configType,\
+   ULUPTNLInformation_ToBeSetup_List_t *tnlInfo, UpTnlCfg *upTnlInfo)
+{
+   uint8_t tnlIdx;
+   uint32_t ipv4_du = 0;
+   GTPTunnel_t *gtpTunnel = NULLP;
+
+   upTnlInfo->drbId = drbId; 
+   upTnlInfo->configType = configType;
+#ifdef O1_ENABLE
+   cmInetAddr((S8*)g_cfg.DU_IPV4_Addr, &ipv4_du);
+#else
+   cmInetAddr((char *)DU_IP_V4_ADDR, &ipv4_du);
+#endif
+
+   for(tnlIdx=0; tnlIdx < tnlInfo->list.count; tnlIdx++)
+   {
+      if(tnlInfo->list.array[tnlIdx]->uLUPTNLInformation.present == UPTransportLayerInformation_PR_gTPTunnel)
+      {
+        if(tnlInfo->list.array[tnlIdx]->uLUPTNLInformation.choice.gTPTunnel)
+        {
+           gtpTunnel = tnlInfo->list.array[tnlIdx]->uLUPTNLInformation.choice.gTPTunnel;
+           DU_ALLOC(upTnlInfo->tnlCfg1, sizeof(GtpTnlCfg));
+            if(upTnlInfo->tnlCfg1 == NULLP)
+           {
+               DU_LOG("\nERROR  -->  F1AP : extractUpTnlInfo: Failed to allocate mmeory for tunnel cfg 1");
+               return RFAILED;
+           }
+           bitStringToInt(&gtpTunnel->transportLayerAddress, &upTnlInfo->tnlCfg1->ulTnlAddress);
+           upTnlInfo->tnlCfg1->dlTnlAddress = ipv4_du;
+           if(gtpTunnel->gTP_TEID.size > 0)
+           {
+              teIdStringToInt(gtpTunnel->gTP_TEID.buf, &upTnlInfo->tnlCfg1->teId);
+           }
+        }
+        break;
+      }
+   }
+   return ROK;
+}
+
+/*******************************************************************
+*
+* @brief Function to extract Drb Qos Cfg Info from CU
+*
+* @details
+*
+*    Function : extractDrbQosCfg 
+*
+*    Functionality: Function to extract Drb Qos Cfg Info from CU
+*
+* @params[in] DRB_Information_t *drbInfo, LcCfg *macLcToAdd
+* @return ROK/RFAILED
+*
+* ****************************************************************/
+
+uint8_t extractDrbQosCfg(DRB_Information_t *drbInfo, LcCfg *macLcToAdd ) 
+{
+   if(!macLcToAdd->drbQos)
+   {
+      DU_ALLOC_SHRABL_BUF(macLcToAdd->drbQos, sizeof(DrbQosInfo));
+      if(macLcToAdd->drbQos == NULLP)
+      {
+         DU_LOG("\nERROR  -->  DUAPP:Memory failed at allocating DrbQos at extractDrbQosCfg()");
+         return RFAILED;
+      }
+
+   }
+   if(drbInfo->dRB_QoS.qoS_Characteristics.present == QoS_Characteristics_PR_non_Dynamic_5QI)
+   {
+      extractQosInfo(macLcToAdd->drbQos, &drbInfo->dRB_QoS);
+      macLcToAdd->dlLcCfg.lcp = macLcToAdd->drbQos->ngRanRetPri.priorityLevel;
+   }
+   if(extractDrbSnssaiCfg(&drbInfo->sNSSAI, &macLcToAdd->snssai) != ROK)
+   {
+      DU_LOG("\nERROR  -->  DUAPP: Unable to extract Snssai information  at extractDrbQosCfg()");
+      return RFAILED;
+   }
+   return ROK;
+}
+/*******************************************************************
+ *
+ * @brief Function to extract DRB info received from CU
+ *
+ * @details
+ *
+ *    Function : extractDrbCfg
+ *
+ *    Functionality: Function to extract DRB info received from CU
+ *
+ * @params[in] F1AP message
+ * @return void
+ *
+ * ****************************************************************/
+uint8_t extractDrbCfg(DRBs_ToBeSetup_Item_t *drbItem, DRBs_ToBeSetupMod_Item_t *drbSetupModItem,\
+DRBs_ToBeModified_Item_t *drbModItem,  LcCfg *macLcToAdd, UpTnlCfg *upTnlInfo)
+{
+   DRB_Information_t *drbInfo = NULLP;
+
+   if(drbItem != NULLP)
+   {
+      if(extractUpTnlInfo(drbItem->dRBID, CONFIG_ADD, &drbItem->uLUPTNLInformation_ToBeSetup_List, upTnlInfo) != ROK)
+      {
+         DU_LOG("\nERROR  -->  DUAPP : Failed to extract tunnel Cfg at extractDrbCfg()");
+         return RFAILED;
+      }
+      if(drbItem->qoSInformation.present == QoSInformation_PR_choice_extension)
+      {
+         if(drbItem->qoSInformation.choice.choice_extension->value.present == QoSInformation_ExtIEs__value_PR_DRB_Information)
+         {
+            drbInfo = &drbItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information;
+            if(extractDrbQosCfg(drbInfo , macLcToAdd) != ROK)
+            {
+               DU_LOG("\nERROR  -->  DUAPP : Failed to extract qos Cfg at extractDrbCfg()");
+               return RFAILED;
+            }
+         }
+      }
+   }
+   else if(drbSetupModItem != NULLP)
+   {
+      if(extractUpTnlInfo(drbSetupModItem->dRBID, CONFIG_ADD, &drbSetupModItem->uLUPTNLInformation_ToBeSetup_List,\
+      upTnlInfo) != ROK)
+      {
+         DU_LOG("\nERROR  -->  DUAPP : Failed to extract tunnel Cfg at extractDrbCfg()");
+         return RFAILED;
+      }
+      if(drbSetupModItem->qoSInformation.present == QoSInformation_PR_choice_extension)
+      {
+         if(drbSetupModItem->qoSInformation.choice.choice_extension->value.present ==\
+         QoSInformation_ExtIEs__value_PR_DRB_Information)
+         {
+            drbInfo = &drbSetupModItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information;
+            if(extractDrbQosCfg(drbInfo , macLcToAdd) != ROK)
+            {
+               DU_LOG("\nERROR  -->  DUAPP : Failed to extract qos Cfg at extractDrbCfg()");  
+               return RFAILED;
+            }
+
+         }
+      }
+   }
+   else if(drbModItem != NULLP)
+   {
+      if(extractUpTnlInfo(drbModItem->dRBID, CONFIG_MOD, &drbModItem->uLUPTNLInformation_ToBeSetup_List,\
+      upTnlInfo) != ROK)
+      {
+         DU_LOG("\nERROR  -->  DUAPP : Failed to extract tunnel Cfg at extractDrbCfg()");
+         return RFAILED;
+      }
+      if(drbModItem->qoSInformation != NULLP)
+      {
+         if(drbModItem->qoSInformation->present == QoSInformation_PR_choice_extension)
+         {
+            if(drbModItem->qoSInformation->choice.choice_extension->value.present ==\
+                  QoSInformation_ExtIEs__value_PR_DRB_Information)
+            {
+               drbInfo = &drbModItem->qoSInformation->choice.choice_extension->value.choice.DRB_Information;
+               if(extractDrbQosCfg(drbInfo , macLcToAdd) != ROK)
+               {
+                  DU_LOG("\nERROR  -->  DUAPP : Failed to extract qos Cfg at extractDrbCfg()");  
+                  return RFAILED;
+               }
+
+            }
+         }
+      }
+   }
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Function to extract RB info received from CU
+ *
+ * @details
+ *
+ *    Function : extractMacRbCfg
+ *
+ *    Functionality: Function to extract RB info received from CU
+ *
+ * @params[in] F1AP message
+ * @return ROK/RFAILED
+ *
+ * ****************************************************************/
+
+uint8_t extractMacRbCfg(uint8_t lcId, DRBs_ToBeSetup_Item_t *drbCfg,\
+DRBs_ToBeSetupMod_Item_t *drbSetupModCfg,  DRBs_ToBeModified_Item_t *drbModCfg, LogicalChannelConfig_t *ulLcCfg, LcCfg *lcCfg, UpTnlCfg *upTnlInfo)
+{
+   if(drbCfg != NULLP)
+   {
+      if(extractDrbCfg(drbCfg, NULL, NULL, lcCfg, upTnlInfo) != ROK)
+      {
+         DU_LOG("ERROR  -->  F1AP : Failed to build Drb Qos at extractMacRbCfg()");
+         return RFAILED;
+      }
+   }
+   else if(drbSetupModCfg != NULLP)
+   { 
+      if(extractDrbCfg(NULL, drbSetupModCfg, NULL, lcCfg, upTnlInfo) != ROK)
+      {
+         DU_LOG("ERROR  -->  F1AP : Failed to build Drb Qos at extractMacRbCfg()");
+         return RFAILED;
+      }
+   }
+   else if(drbModCfg != NULLP)
+   { 
+      if(extractDrbCfg(NULL, NULL, drbModCfg, lcCfg, upTnlInfo) != ROK)
+      {
+         DU_LOG("ERROR  -->  F1AP : Failed to build Drb Qos at extractMacRbCfg()");
+         return RFAILED;
+      }
+   }
+   else
+   {
+      lcCfg->drbQos = NULLP;
+      lcCfg->snssai = NULLP;
+      if(lcCfg->lcId == SRB2_LCID)
+         lcCfg->dlLcCfg.lcp = LC_PRIORITY_3;
+      else
+         lcCfg->dlLcCfg.lcp = LC_PRIORITY_1;
+   }
+   if(ulLcCfg)
+   {
+      lcCfg->ulLcCfgPres = true;
+      extractUlLcCfg(&lcCfg->ulLcCfg, ulLcCfg);
+   }
+   else
+      lcCfg->ulLcCfgPres = false;
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Function processing LC config info received from CU
+ *
+ * @details
+ *
+ *    Function : procMacLcCfg
+ *
+ *    Functionality: Function processing LC config info received from CU
+ *
+ * @params[in] F1AP message
+ * @return ROK/RFAILED
+ *
+ * ****************************************************************/
+
+uint8_t procMacLcCfg(uint8_t lcId, uint8_t rbType, uint8_t configType, DRBs_ToBeSetup_Item_t *drbItem,\
+DRBs_ToBeSetupMod_Item_t *drbSetupModItem, DRBs_ToBeModified_Item_t *drbModItem, LogicalChannelConfig_t *ulLcCfg,\
+LcCfg *lcCfg, UpTnlCfg *upTnlInfo)
+{
+   uint8_t ret = ROK;
+
+   lcCfg->lcId = lcId;
+   lcCfg->configType = configType;
+   if(rbType == RB_TYPE_SRB)
+   {
+      ret = extractMacRbCfg(lcId, NULL, NULL, NULL, ulLcCfg, lcCfg, NULL);
    }
    else if(rbType == RB_TYPE_DRB)
    {
       if(drbItem != NULL)
-        ret = extractMacRbCfg(lcId, drbItem, NULL, ulLcCfg, lcCfg, upTnlInfo);
+        ret = extractMacRbCfg(lcId, drbItem, NULL, NULL, ulLcCfg, lcCfg, upTnlInfo);
       else if(drbSetupModItem != NULL)
-        ret = extractMacRbCfg(lcId, NULL, drbSetupModItem, ulLcCfg, lcCfg, upTnlInfo);
+        ret = extractMacRbCfg(lcId, NULL, drbSetupModItem, NULL, ulLcCfg, lcCfg, upTnlInfo);
+      else if(drbModItem != NULL)
+        ret = extractMacRbCfg(lcId, NULL, NULL, drbModItem, ulLcCfg, lcCfg, upTnlInfo);
    }
    return ret;
 }
@@ -7476,14 +9209,16 @@ uint8_t extractRlcCfgToAddMod(struct CellGroupConfigRrc__rlc_BearerToAddModList
      /* Filling RLC/MAC Config*/
      memset(&ueCfgDb->macLcCfg[idx], 0, sizeof(LcCfg));
      memset(&ueCfgDb->rlcLcCfg[idx], 0, sizeof(RlcBearerCfg));
-     procRlcLcCfg(rbId, lcId, rbType, rlcMode, CONFIG_UNKNOWN, f1RlcCfg, &(ueCfgDb->rlcLcCfg[idx]));
-     if(procMacLcCfg(lcId, rbType, CONFIG_UNKNOWN, NULL, NULL, macUlLcCfg, &ueCfgDb->macLcCfg[idx], NULL) != ROK)
+     procRlcLcCfg(rbId, lcId, rbType, rlcMode, CONFIG_UNKNOWN, f1RlcCfg, &(ueCfgDb->rlcLcCfg[idx]), NULLP);
+     if(procMacLcCfg(lcId, rbType, CONFIG_UNKNOWN, NULL, NULL, NULL, macUlLcCfg, &ueCfgDb->macLcCfg[idx], NULL) != ROK)
      {
         DU_LOG("\nERROR  -->  DU APP : Failed while filling MAC LC config at extractRlcCfgToAddMod()");
         return RFAILED;
      }
      (ueCfgDb->numRlcLcs)++;
      (ueCfgDb->numMacLcs)++;
+     DU_LOG("\nDEBUG  -> DUAPP: extractRlcCfgToAddMod:RBType:%d, DrbID: %d,lcId:%d, [RLC,MAC,NumDrb]:[%x,%x,%x]",\
+        rbType, rbId, lcId, ueCfgDb->numRlcLcs, ueCfgDb->numMacLcs,  ueCfgDb->numDrb);
   }
   //TODO: To send the failure cause in UeContextSetupRsp 
   return ROK;
@@ -7508,7 +9243,7 @@ void freeMacPdschServCellInfo(PdschServCellCfg *pdsch)
 {
    if(pdsch->xOverhead)
    {
-      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, pdsch->xOverhead, sizeof(uint8_t));
+      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, pdsch->xOverhead, sizeof(PdschXOverhead));
    }
    if(pdsch->codeBlkGrpFlushInd)
    {
@@ -7516,7 +9251,7 @@ void freeMacPdschServCellInfo(PdschServCellCfg *pdsch)
    }
    if(pdsch->maxCodeBlkGrpPerTb)
    {
-      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, pdsch->maxCodeBlkGrpPerTb, sizeof(uint8_t));
+      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, pdsch->maxCodeBlkGrpPerTb, sizeof(MaxCodeBlkGrpPerTB));
    }
    if(pdsch->maxMimoLayers)
    {
@@ -7540,11 +9275,27 @@ void freeMacPdschServCellInfo(PdschServCellCfg *pdsch)
  * ****************************************************************/
 void freeMacServingCellInfo(ServCellCfgInfo *srvCellCfg)
 {
+   uint8_t timeDomRsrcIdx;
+
+   if(srvCellCfg->initDlBwp.pdschPresent)
+   {
+      for(timeDomRsrcIdx = 0; timeDomRsrcIdx < srvCellCfg->initDlBwp.pdschCfg.numTimeDomRsrcAlloc; timeDomRsrcIdx++)
+      {
+         DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, \
+            srvCellCfg->initDlBwp.pdschCfg.timeDomRsrcAllociList[timeDomRsrcIdx].k0, sizeof(uint8_t));
+      }
+   }
+
    freeMacPdschServCellInfo(&srvCellCfg->pdschServCellCfg);
    if(srvCellCfg->bwpInactivityTmr)
    {
       DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, srvCellCfg->bwpInactivityTmr, sizeof(uint8_t));
    }
+
+   if(srvCellCfg->initUlBwp.pucchPresent)
+   {
+      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, srvCellCfg->initUlBwp.pucchCfg.dlDataToUlAck, sizeof(PucchDlDataToUlAck));
+   }
 }
 
 /*******************************************************************
@@ -7709,31 +9460,34 @@ void extractPdcchCfg(PDCCH_Config_t *cuPdcchCfg, PdcchConfig *macPdcchCfg)
       if(cRsetToAddModList->list.count)
       {
          macPdcchCfg->numCRsetToAddMod = cRsetToAddModList->list.count;
-        for(cRsetIdx = 0; cRsetIdx < cRsetToAddModList->list.count; cRsetIdx++)
-        {
-           macPdcchCfg->cRSetToAddModList[cRsetIdx].cRSetId = \
-             cRsetToAddModList->list.array[cRsetIdx]->controlResourceSetId;
-           bitStringToInt(&cRsetToAddModList->list.array[cRsetIdx]->frequencyDomainResources,\
-              macPdcchCfg->cRSetToAddModList[cRsetIdx].freqDomainRsrc);
+         for(cRsetIdx = 0; cRsetIdx < cRsetToAddModList->list.count; cRsetIdx++)
+         {
+            macPdcchCfg->cRSetToAddModList[cRsetIdx].cRSetId = \
+               cRsetToAddModList->list.array[cRsetIdx]->controlResourceSetId;
+            //freqDomRsrcBitStringToInt(&cRsetToAddModList->list.array[cRsetIdx]->frequencyDomainResources,\
+                  macPdcchCfg->cRSetToAddModList[cRsetIdx].freqDomainRsrc);
+            memcpy(macPdcchCfg->cRSetToAddModList[cRsetIdx].freqDomainRsrc, \
+               cRsetToAddModList->list.array[cRsetIdx]->frequencyDomainResources.buf,
+               cRsetToAddModList->list.array[cRsetIdx]->frequencyDomainResources.size);
+
             macPdcchCfg->cRSetToAddModList[cRsetIdx].duration = \
-             cRsetToAddModList->list.array[cRsetIdx]->duration;
+                cRsetToAddModList->list.array[cRsetIdx]->duration;
 
-           macPdcchCfg->cRSetToAddModList[cRsetIdx].cceRegMappingType = \
-             cRsetToAddModList->list.array[cRsetIdx]->cce_REG_MappingType.present;   
+            macPdcchCfg->cRSetToAddModList[cRsetIdx].cceRegMappingType = \
+               cRsetToAddModList->list.array[cRsetIdx]->cce_REG_MappingType.present;   
             if(macPdcchCfg->cRSetToAddModList[cRsetIdx].cceRegMappingType == CCE_REG_MAPPINGTYPE_PR_INTERLEAVED)
-           {
-              //TODO: handle the case for Interleaved
+            {
+               //TODO: handle the case for Interleaved
             }
             macPdcchCfg->cRSetToAddModList[cRsetIdx].precoderGranularity = \
-             cRsetToAddModList->list.array[cRsetIdx]->precoderGranularity;
-           if(cRsetToAddModList->list.array[cRsetIdx]->pdcch_DMRS_ScramblingID)
-           {
-              macPdcchCfg->cRSetToAddModList[cRsetIdx].dmrsScramblingId= \
-                 *(cRsetToAddModList->list.array[cRsetIdx]->pdcch_DMRS_ScramblingID);
-           }
+                cRsetToAddModList->list.array[cRsetIdx]->precoderGranularity;
+            if(cRsetToAddModList->list.array[cRsetIdx]->pdcch_DMRS_ScramblingID)
+            {
+               macPdcchCfg->cRSetToAddModList[cRsetIdx].dmrsScramblingId= \
+                  *(cRsetToAddModList->list.array[cRsetIdx]->pdcch_DMRS_ScramblingID);
+            }
          }
       }
-
    }
    /* Control Resource Set To Release List */
    if(cuPdcchCfg->controlResourceSetToReleaseList)
@@ -7742,10 +9496,10 @@ void extractPdcchCfg(PDCCH_Config_t *cuPdcchCfg, PdcchConfig *macPdcchCfg)
       if(cRsetToRelList->list.count)
       {
          macPdcchCfg->numCRsetToRel = cRsetToRelList->list.count;
-        for(cRsetIdx = 0; cRsetIdx < cRsetToRelList->list.count; cRsetIdx++)
-        {
+         for(cRsetIdx = 0; cRsetIdx < cRsetToRelList->list.count; cRsetIdx++)
+         {
             macPdcchCfg->cRSetToRelList[cRsetIdx] = *(cRsetToRelList->list.array[cRsetIdx]);
-        }
+         }
       }
    }
 
@@ -7756,49 +9510,49 @@ void extractPdcchCfg(PDCCH_Config_t *cuPdcchCfg, PdcchConfig *macPdcchCfg)
       if(srchSpcToAddModList->list.count)
       {
          macPdcchCfg->numSearchSpcToAddMod = srchSpcToAddModList->list.count;
-        for(srchSpcIdx = 0; srchSpcIdx < srchSpcToAddModList->list.count; srchSpcIdx++)
-        {
+         for(srchSpcIdx = 0; srchSpcIdx < srchSpcToAddModList->list.count; srchSpcIdx++)
+         {
             macPdcchCfg->searchSpcToAddModList[srchSpcIdx].searchSpaceId =\
-              srchSpcToAddModList->list.array[srchSpcIdx]->searchSpaceId;
+                                                                          srchSpcToAddModList->list.array[srchSpcIdx]->searchSpaceId;
             macPdcchCfg->searchSpcToAddModList[srchSpcIdx].cRSetId =\
-              *(srchSpcToAddModList->list.array[srchSpcIdx]->controlResourceSetId);
-           if(srchSpcToAddModList->list.array[srchSpcIdx]->monitoringSlotPeriodicityAndOffset)
-           {
+                                                                    *(srchSpcToAddModList->list.array[srchSpcIdx]->controlResourceSetId);
+            if(srchSpcToAddModList->list.array[srchSpcIdx]->monitoringSlotPeriodicityAndOffset)
+            {
                macPdcchCfg->searchSpcToAddModList[srchSpcIdx].mSlotPeriodicityAndOffset =\
-                 srchSpcToAddModList->list.array[srchSpcIdx]->monitoringSlotPeriodicityAndOffset->present;
+                                                                                         srchSpcToAddModList->list.array[srchSpcIdx]->monitoringSlotPeriodicityAndOffset->present;
             }
             if(srchSpcToAddModList->list.array[srchSpcIdx]->monitoringSymbolsWithinSlot)
             {
-              bitStringToInt(srchSpcToAddModList->list.array[srchSpcIdx]->monitoringSymbolsWithinSlot,\
-                 macPdcchCfg->searchSpcToAddModList[srchSpcIdx].mSymbolsWithinSlot);
+               bitStringToInt(srchSpcToAddModList->list.array[srchSpcIdx]->monitoringSymbolsWithinSlot,\
+                     macPdcchCfg->searchSpcToAddModList[srchSpcIdx].mSymbolsWithinSlot);
             }
-           if(srchSpcToAddModList->list.array[srchSpcIdx]->nrofCandidates)
+            if(srchSpcToAddModList->list.array[srchSpcIdx]->nrofCandidates)
             {
-             macPdcchCfg->searchSpcToAddModList[srchSpcIdx].numCandidatesAggLevel1 = \
-                 srchSpcToAddModList->list.array[srchSpcIdx]->nrofCandidates->aggregationLevel1;
-              macPdcchCfg->searchSpcToAddModList[srchSpcIdx].numCandidatesAggLevel2 = \
-                 srchSpcToAddModList->list.array[srchSpcIdx]->nrofCandidates->aggregationLevel2;
-              macPdcchCfg->searchSpcToAddModList[srchSpcIdx].numCandidatesAggLevel4 = \
-                 srchSpcToAddModList->list.array[srchSpcIdx]->nrofCandidates->aggregationLevel4;
-              
-              macPdcchCfg->searchSpcToAddModList[srchSpcIdx].numCandidatesAggLevel8 = \
-                 srchSpcToAddModList->list.array[srchSpcIdx]->nrofCandidates->aggregationLevel8;
-              
-              macPdcchCfg->searchSpcToAddModList[srchSpcIdx].numCandidatesAggLevel16 = \
-                 srchSpcToAddModList->list.array[srchSpcIdx]->nrofCandidates->aggregationLevel16;
-           }
+               macPdcchCfg->searchSpcToAddModList[srchSpcIdx].numCandidatesAggLevel1 = \
+                                                                                       srchSpcToAddModList->list.array[srchSpcIdx]->nrofCandidates->aggregationLevel1;
+               macPdcchCfg->searchSpcToAddModList[srchSpcIdx].numCandidatesAggLevel2 = \
+                                                                                       srchSpcToAddModList->list.array[srchSpcIdx]->nrofCandidates->aggregationLevel2;
+               macPdcchCfg->searchSpcToAddModList[srchSpcIdx].numCandidatesAggLevel4 = \
+                                                                                       srchSpcToAddModList->list.array[srchSpcIdx]->nrofCandidates->aggregationLevel4;
+
+               macPdcchCfg->searchSpcToAddModList[srchSpcIdx].numCandidatesAggLevel8 = \
+                                                                                       srchSpcToAddModList->list.array[srchSpcIdx]->nrofCandidates->aggregationLevel8;
+
+               macPdcchCfg->searchSpcToAddModList[srchSpcIdx].numCandidatesAggLevel16 = \
+                                                                                        srchSpcToAddModList->list.array[srchSpcIdx]->nrofCandidates->aggregationLevel16;
+            }
             if(srchSpcToAddModList->list.array[srchSpcIdx]->searchSpaceType)
-           {
-              macPdcchCfg->searchSpcToAddModList[srchSpcIdx].searchSpaceType =\
-                 srchSpcToAddModList->list.array[srchSpcIdx]->searchSpaceType->present;
-              if(macPdcchCfg->searchSpcToAddModList[srchSpcIdx].searchSpaceType == SEARCHSPACETYPE_PR_UE_SPECIFIC)
-              {
-                 macPdcchCfg->searchSpcToAddModList[srchSpcIdx].ueSpecificDciFormat =\
-                    srchSpcToAddModList->list.array[srchSpcIdx]->searchSpaceType->choice.ue_Specific->dci_Formats;
-              }
-         
-           }
-        }
+            {
+               macPdcchCfg->searchSpcToAddModList[srchSpcIdx].searchSpaceType =\
+                                                                               srchSpcToAddModList->list.array[srchSpcIdx]->searchSpaceType->present;
+               if(macPdcchCfg->searchSpcToAddModList[srchSpcIdx].searchSpaceType == SEARCHSPACETYPE_PR_UE_SPECIFIC)
+               {
+                  macPdcchCfg->searchSpcToAddModList[srchSpcIdx].ueSpecificDciFormat =\
+                                                                                      srchSpcToAddModList->list.array[srchSpcIdx]->searchSpaceType->choice.ue_Specific->dci_Formats;
+               }
+
+            }
+         }
       }
    }
    /* Search space To Rel List */
@@ -7808,11 +9562,11 @@ void extractPdcchCfg(PDCCH_Config_t *cuPdcchCfg, PdcchConfig *macPdcchCfg)
       if(srchSpcToRelList->list.count)
       {
          macPdcchCfg->numSearchSpcToRel = srchSpcToRelList->list.count;
-        for(srchSpcIdx = 0; srchSpcIdx < srchSpcToRelList->list.count; srchSpcIdx++)
-        {
+         for(srchSpcIdx = 0; srchSpcIdx < srchSpcToRelList->list.count; srchSpcIdx++)
+         {
             macPdcchCfg->searchSpcToRelList[srchSpcIdx] =\
-              *(srchSpcToRelList->list.array[srchSpcIdx]);
-        }
+                                                         *(srchSpcToRelList->list.array[srchSpcIdx]);
+         }
       }
    }
 }
@@ -7827,13 +9581,19 @@ void extractPdcchCfg(PDCCH_Config_t *cuPdcchCfg, PdcchConfig *macPdcchCfg)
  *
  *    Functionality: Fills PdschCfg received  by CU
  *
- * @params[in] PDSCH_Config_t *cuPdschCfg,
- *             PdschConfig *macPdschCfg
+ * @params[in] PDSCH_Config_t *cuPdschCfg = Information which is send by CU,
+ *                   which we have stored in F1UeContextSetupDb,
+ *             PdschConfig *macPdschCfg = Used to Store the information which
+ *                   needs to send in other layer, as well as this can be the variable
+ *                   which stores the information in DuCb,
+ *             PdschConfig *storedPdschCfg =  Null in case of sending the
+ *                   information to other layer else it will have stored pdsch 
+ *                   configuration in copyOfmacUeCfg.
  * @return void
  *
  * ****************************************************************/
 
-void extractPdschCfg(PDSCH_Config_t *cuPdschCfg, PdschConfig *macPdschCfg)
+void extractPdschCfg(PDSCH_Config_t *cuPdschCfg, PdschConfig *macPdschCfg, PdschConfig *storedPdschCfg)
 {
    uint8_t timeDomIdx;
    struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAlloc = NULLP;
@@ -7841,13 +9601,13 @@ void extractPdschCfg(PDSCH_Config_t *cuPdschCfg, PdschConfig *macPdschCfg)
    if(cuPdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA)
    {
       if(cuPdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA->present == \
-         PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA_PR_setup)
+            PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA_PR_setup)
       {
          if(cuPdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA->choice.setup)
-        {
+         {
             macPdschCfg->dmrsDlCfgForPdschMapTypeA.addPos = \
-              *(cuPdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA->choice.setup->dmrs_AdditionalPosition);
-        }
+               *(cuPdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA->choice.setup->dmrs_AdditionalPosition);
+         }
       }
    }
    macPdschCfg->resourceAllocType = cuPdschCfg->resourceAllocation;
@@ -7855,19 +9615,49 @@ void extractPdschCfg(PDSCH_Config_t *cuPdschCfg, PdschConfig *macPdschCfg)
    {
       timeDomAlloc = cuPdschCfg->pdsch_TimeDomainAllocationList;
       if(timeDomAlloc->present ==\
-         PDSCH_Config__pdsch_TimeDomainAllocationList_PR_setup)
+            PDSCH_Config__pdsch_TimeDomainAllocationList_PR_setup)
       {
          if(timeDomAlloc->choice.setup)
-        {
-           macPdschCfg->numTimeDomRsrcAlloc  = timeDomAlloc->choice.setup->list.count;
+         {
+            macPdschCfg->numTimeDomRsrcAlloc  = timeDomAlloc->choice.setup->list.count;
             for(timeDomIdx = 0; timeDomIdx < timeDomAlloc->choice.setup->list.count; timeDomIdx++)
             {
-              macPdschCfg->timeDomRsrcAllociList[timeDomIdx].mappingType = \
-                 timeDomAlloc->choice.setup->list.array[timeDomIdx]->mappingType;
-              macPdschCfg->timeDomRsrcAllociList[timeDomIdx].startSymbolAndLength = \
-                 timeDomAlloc->choice.setup->list.array[timeDomIdx]->startSymbolAndLength;
-           }
-        }
+               macPdschCfg->timeDomRsrcAllociList[timeDomIdx].k0 = NULLP;
+               if(timeDomAlloc->choice.setup->list.array[timeDomIdx]->k0)
+               {
+                  if(macPdschCfg->timeDomRsrcAllociList[timeDomIdx].k0 == NULL)
+                  {
+                     if(storedPdschCfg)
+                     {
+                        if(storedPdschCfg->timeDomRsrcAllociList[timeDomIdx].k0)
+                        {
+                           macPdschCfg->timeDomRsrcAllociList[timeDomIdx].k0 =\
+                           storedPdschCfg->timeDomRsrcAllociList[timeDomIdx].k0;
+                        }
+                        else
+                        {
+                           DU_ALLOC_SHRABL_BUF(macPdschCfg->timeDomRsrcAllociList[timeDomIdx].k0, sizeof(uint8_t));
+                        }
+                     }
+                     else
+                     {
+                        DU_ALLOC_SHRABL_BUF(macPdschCfg->timeDomRsrcAllociList[timeDomIdx].k0, sizeof(uint8_t));
+                     }
+                     if(!macPdschCfg->timeDomRsrcAllociList[timeDomIdx].k0)
+                     {
+                        DU_LOG("\nERROR  -->  DU APP : Memory allocation failed for k0 at extractPdschCfg()");
+                        return;
+                     }
+                  }
+                  *(macPdschCfg->timeDomRsrcAllociList[timeDomIdx].k0) = \
+                  *(timeDomAlloc->choice.setup->list.array[timeDomIdx]->k0);
+               }
+               macPdschCfg->timeDomRsrcAllociList[timeDomIdx].mappingType = \
+                  timeDomAlloc->choice.setup->list.array[timeDomIdx]->mappingType;
+               macPdschCfg->timeDomRsrcAllociList[timeDomIdx].startSymbolAndLength = \
+                  timeDomAlloc->choice.setup->list.array[timeDomIdx]->startSymbolAndLength;
+            }
+         }
       }
    }
    macPdschCfg->rbgSize = cuPdschCfg->rbg_Size;
@@ -7879,10 +9669,10 @@ void extractPdschCfg(PDSCH_Config_t *cuPdschCfg, PdschConfig *macPdschCfg)
       if(cuPdschCfg->prb_BundlingType.choice.staticBundling)
       {
          if(cuPdschCfg->prb_BundlingType.choice.staticBundling->bundleSize)
-        {
+         {
             macPdschCfg->bundlingInfo.StaticBundling.size = \
-              *(cuPdschCfg->prb_BundlingType.choice.staticBundling->bundleSize);
-        }
+               *(cuPdschCfg->prb_BundlingType.choice.staticBundling->bundleSize);
+         }
       }
    }
    else if(cuPdschCfg->prb_BundlingType.present == PDSCH_Config__prb_BundlingType_PR_dynamicBundling)
@@ -7921,7 +9711,7 @@ uint8_t extractPdschServingCellCfg(PDSCH_ServingCellConfig_t *cuPdschSrvCellCfg,
         }
         else
         {
-            DU_ALLOC_SHRABL_BUF(macUePdschSrvCellCfg->maxCodeBlkGrpPerTb, sizeof(uint8_t));
+            DU_ALLOC_SHRABL_BUF(macUePdschSrvCellCfg->maxCodeBlkGrpPerTb, sizeof(MaxCodeBlkGrpPerTB));
             if(macUePdschSrvCellCfg->maxCodeBlkGrpPerTb)
            {
                *(macUePdschSrvCellCfg->maxCodeBlkGrpPerTb)  = \
@@ -7940,7 +9730,7 @@ uint8_t extractPdschServingCellCfg(PDSCH_ServingCellConfig_t *cuPdschSrvCellCfg,
         }
         else
         {
-            DU_ALLOC_SHRABL_BUF(macUePdschSrvCellCfg->maxCodeBlkGrpPerTb, sizeof(bool));
+            DU_ALLOC_SHRABL_BUF(macUePdschSrvCellCfg->codeBlkGrpFlushInd , sizeof(bool));
             if(macUePdschSrvCellCfg->codeBlkGrpFlushInd)
            {
                *(macUePdschSrvCellCfg->codeBlkGrpFlushInd)  = \
@@ -7989,7 +9779,7 @@ uint8_t extractPdschServingCellCfg(PDSCH_ServingCellConfig_t *cuPdschSrvCellCfg,
       }
       else
       {
-         DU_ALLOC_SHRABL_BUF(macUePdschSrvCellCfg->xOverhead, sizeof(uint8_t));
+         DU_ALLOC_SHRABL_BUF(macUePdschSrvCellCfg->xOverhead, sizeof(PdschXOverhead));
          if(macUePdschSrvCellCfg->xOverhead)
          {
             *(macUePdschSrvCellCfg->xOverhead)  = *(cuPdschSrvCellCfg->xOverhead);
@@ -8174,8 +9964,16 @@ void extractResrcSetToAddModList(PucchResrcSetCfg *macRsrcSetList, struct PUCCH_
          macRsrcSetList->resrcSetToAddModList[arrIdx].resrcList[rsrcListIdx] =\
             *cuRsrcSetList->list.array[arrIdx]->resourceList.list.array[rsrcListIdx];
       }
-      macRsrcSetList->resrcSetToAddModList[arrIdx].maxPayLoadSize =\
-         *cuRsrcSetList->list.array[arrIdx]->maxPayloadMinus1;
+
+      if(cuRsrcSetList->list.array[arrIdx]->maxPayloadMinus1)
+      {
+         macRsrcSetList->resrcSetToAddModList[arrIdx].maxPayLoadSize =\
+            *cuRsrcSetList->list.array[arrIdx]->maxPayloadMinus1;
+      }
+      else
+      {
+         macRsrcSetList->resrcSetToAddModList[arrIdx].maxPayLoadSize = 0;
+      }
    }
 }/* End of extractResrcSetToAddModList */
 
@@ -8506,13 +10304,20 @@ void extractSchedReqCfgToAddMod(PucchSchedReqCfg *macSchedReqCfg, struct PUCCH_C
  *
  *    Functionality: Fills PucchCfg received  by CU
  *
- * @params[in] BWP_UplinkDedicated__pucch_Config *cuPucchCfg,
- *             PucchCfg *macPucchCfg
+ * @params[in] BWP_UplinkDedicated__pucch_Config *cuPucchCfg = Information which
+ *                is send by CU, which we have stored in F1UeContextSetupDb,
+ *             PucchCfg *macPucchCfg = Used to Store the information which
+ *                needs to send in other layer, as well as this can be the variable
+ *                which stores the information in DuCb,
+ *             PucchCfg *storedPucchCfg = Null in case of sending the
+ *                information to other layer else it will have Pucch Cfg which
+ *                we have stored in copyOfmacUeCfg.
  * @return ROK/RFAILED
  *
  * ****************************************************************/
 
-uint8_t extractPucchCfg(struct BWP_UplinkDedicated__pucch_Config *cuPucchCfg, PucchCfg *macPucchCfg)         
+uint8_t extractPucchCfg(struct BWP_UplinkDedicated__pucch_Config *cuPucchCfg, PucchCfg *macPucchCfg,\
+PucchCfg *storedPucchCfg)        
 {
    uint8_t arrIdx;
 
@@ -8638,20 +10443,34 @@ uint8_t extractPucchCfg(struct BWP_UplinkDedicated__pucch_Config *cuPucchCfg, Pu
 
          /* Dl_DataToUL_ACK */ 
         if(cuPucchCfg->choice.setup->dl_DataToUL_ACK)
-        {
+    {
+       if(storedPucchCfg)
+       {
+          if(storedPucchCfg->dlDataToUlAck)
+          {
+             macPucchCfg->dlDataToUlAck = storedPucchCfg->dlDataToUlAck; 
+          }
+          else
+          {
             DU_ALLOC_SHRABL_BUF(macPucchCfg->dlDataToUlAck, sizeof(PucchDlDataToUlAck));
-           if(macPucchCfg->dlDataToUlAck == NULLP)
-           {
-              DU_LOG("\nERROR --> F1AP : Failed to extract Dl_DataToUL_ACK in extractPucchCfg()");
-              return RFAILED;
-           }
-           memset(macPucchCfg->dlDataToUlAck, 0, sizeof(PucchDlDataToUlAck));
-            macPucchCfg->dlDataToUlAck->dlDataToUlAckListCount = cuPucchCfg->choice.setup->dl_DataToUL_ACK->list.count;
-           for(arrIdx = 0; arrIdx < macPucchCfg->dlDataToUlAck->dlDataToUlAckListCount; arrIdx++)
-            {
-               macPucchCfg->dlDataToUlAck->dlDataToUlAckList[arrIdx] =\
-                  *cuPucchCfg->choice.setup->dl_DataToUL_ACK->list.array[arrIdx];
-           }
+          }
+       }
+       else
+       {
+          DU_ALLOC_SHRABL_BUF(macPucchCfg->dlDataToUlAck, sizeof(PucchDlDataToUlAck));
+       }
+       if(macPucchCfg->dlDataToUlAck == NULLP)
+       {
+          DU_LOG("\nERROR --> F1AP : Failed to extract Dl_DataToUL_ACK in extractPucchCfg()");
+          return RFAILED;
+       }
+       memset(macPucchCfg->dlDataToUlAck, 0, sizeof(PucchDlDataToUlAck));
+       macPucchCfg->dlDataToUlAck->dlDataToUlAckListCount = cuPucchCfg->choice.setup->dl_DataToUL_ACK->list.count;
+       for(arrIdx = 0; arrIdx < macPucchCfg->dlDataToUlAck->dlDataToUlAckListCount; arrIdx++)
+       {
+          macPucchCfg->dlDataToUlAck->dlDataToUlAckList[arrIdx] =\
+          *cuPucchCfg->choice.setup->dl_DataToUL_ACK->list.array[arrIdx];
+       }
         }
 
         /* Power Control */
@@ -8681,12 +10500,19 @@ uint8_t extractPucchCfg(struct BWP_UplinkDedicated__pucch_Config *cuPucchCfg, Pu
  *
  *    Functionality: Fills ServingCellReconfig received  by CU
  *
- * @params[in] ServingCellConfig_t *cuSrvCellCfg
- *             ServCellCfgInfo *macSrvCellCfg
+ * @params[in] ServingCellConfig_t *cuSrvCellCfg = Information which is send by
+ *                  CU, which we have stored in F1UeContextSetupDb,
+ *             ServCellCfgInfo *macSrvCellCfg = Used to Store the information
+ *                  which  needs to send in other layer, as well as this can be the
+ *                  variable which stores the information in DuCb, 
+ *             ServCellCfgInfo *storedSrvCellCfg = Null in case of sending the
+ *                  information to other layer else it will have ServCellCfgInfo which
+ *                  we have stored in copyOfmacUeCfg.
  * @return ROK/RFAILD
  *
  * ****************************************************************/
-uint8_t extractSpCellDedicatedCfg(ServingCellConfig_t *cuSrvCellCfg, ServCellCfgInfo *macSrvCellCfg)
+uint8_t extractSpCellDedicatedCfg(ServingCellConfig_t *cuSrvCellCfg, ServCellCfgInfo *macSrvCellCfg,\
+ServCellCfgInfo *storedSrvCellCfg)
 {
    uint8_t ret = ROK;
    BWP_DownlinkDedicated_t *dlBwp = NULLP;
@@ -8698,18 +10524,48 @@ uint8_t extractSpCellDedicatedCfg(ServingCellConfig_t *cuSrvCellCfg, ServCellCfg
       if(dlBwp->pdcch_Config)
       {
          if(dlBwp->pdcch_Config->choice.setup)
-        {
-           macSrvCellCfg->initDlBwp.pdcchPresent = true;
-           extractPdcchCfg(dlBwp->pdcch_Config->choice.setup, &macSrvCellCfg->initDlBwp.pdcchCfg);
-        }
+         {
+            macSrvCellCfg->initDlBwp.pdcchPresent = true;
+            if(storedSrvCellCfg)
+            {
+               if(!storedSrvCellCfg->initDlBwp.pdcchPresent)
+               {
+                  extractPdcchCfg(dlBwp->pdcch_Config->choice.setup, &macSrvCellCfg->initDlBwp.pdcchCfg);
+               }
+               else
+               {
+                  extractPdcchCfg(dlBwp->pdcch_Config->choice.setup, &macSrvCellCfg->initDlBwp.pdcchCfg);
+               }
+            }
+            else
+            {
+               extractPdcchCfg(dlBwp->pdcch_Config->choice.setup, &macSrvCellCfg->initDlBwp.pdcchCfg);
+            }
+         }
       }
       if(dlBwp->pdsch_Config)
       {
          if(dlBwp->pdsch_Config->choice.setup)
-        {
-           macSrvCellCfg->initDlBwp.pdschPresent = true;
-           extractPdschCfg(dlBwp->pdsch_Config->choice.setup, &macSrvCellCfg->initDlBwp.pdschCfg);
-        }
+         {
+            macSrvCellCfg->initDlBwp.pdschPresent = true;
+            
+            if(storedSrvCellCfg)
+            {
+               if(!storedSrvCellCfg->initDlBwp.pdschPresent)
+               {
+                  extractPdschCfg(dlBwp->pdsch_Config->choice.setup, &macSrvCellCfg->initDlBwp.pdschCfg, NULL);
+               }
+               else
+               {
+                  extractPdschCfg(dlBwp->pdsch_Config->choice.setup, &macSrvCellCfg->initDlBwp.pdschCfg,\
+                        &storedSrvCellCfg->initDlBwp.pdschCfg);
+               }
+            }
+            else
+            {
+               extractPdschCfg(dlBwp->pdsch_Config->choice.setup, &macSrvCellCfg->initDlBwp.pdschCfg, NULL);
+            }
+         }
       }
    }
    if(cuSrvCellCfg->firstActiveDownlinkBWP_Id)
@@ -8726,15 +10582,15 @@ uint8_t extractSpCellDedicatedCfg(ServingCellConfig_t *cuSrvCellCfg, ServCellCfg
       {
          macSrvCellCfg->bwpInactivityTmr = NULLP;
          DU_ALLOC_SHRABL_BUF(macSrvCellCfg->bwpInactivityTmr, sizeof(uint8_t));
-        if(macSrvCellCfg->bwpInactivityTmr)
-        {
+         if(macSrvCellCfg->bwpInactivityTmr)
+         {
             memcpy(macSrvCellCfg->bwpInactivityTmr, cuSrvCellCfg->bwp_InactivityTimer, sizeof(uint8_t));
-        }
-        else
-        {
-           DU_LOG("\nERROR  --> F1AP : Memory Alloc failed for bwpInactivityTmr at extractSpCellDedicatedCfg()");
-           return RFAILED;
-        }
+         }
+         else
+         {
+            DU_LOG("\nERROR  --> F1AP : Memory Alloc failed for bwpInactivityTmr at extractSpCellDedicatedCfg()");
+            return RFAILED;
+         }
       }
    }
    if(cuSrvCellCfg->pdsch_ServingCellConfig)
@@ -8743,31 +10599,42 @@ uint8_t extractSpCellDedicatedCfg(ServingCellConfig_t *cuSrvCellCfg, ServCellCfg
       {
          ret = extractPdschServingCellCfg(cuSrvCellCfg->pdsch_ServingCellConfig->choice.setup, &macSrvCellCfg->pdschServCellCfg);
          if(ret == RFAILED)
-        {
-           DU_LOG("\nERROR --> F1AP : Failed at extractPdschServingCellCfg()");
-           return RFAILED;
-        }
+         {
+            DU_LOG("\nERROR --> F1AP : Failed at extractPdschServingCellCfg()");
+            return RFAILED;
+         }
       }
    }
    if(cuSrvCellCfg->uplinkConfig)
    {
-     if(cuSrvCellCfg->uplinkConfig->initialUplinkBWP)
-     {
-        ulBwp = ((BWP_UplinkDedicated_t *)(cuSrvCellCfg->uplinkConfig->initialUplinkBWP));
-       if(ulBwp->pusch_Config)
-       {
-          macSrvCellCfg->initUlBwp.puschPresent = true;
-           extractPuschCfg(ulBwp->pusch_Config, &macSrvCellCfg->initUlBwp.puschCfg);
-       }
-       if(ulBwp->pucch_Config)
-       {
-          macSrvCellCfg->initUlBwp.pucchPresent = true;
-          memset(&macSrvCellCfg->initUlBwp.pucchCfg, 0, sizeof(PucchCfg));
-           extractPucchCfg(ulBwp->pucch_Config, &macSrvCellCfg->initUlBwp.pucchCfg); 
-       }
-     }
-     if(cuSrvCellCfg->uplinkConfig->firstActiveUplinkBWP_Id)
-        macSrvCellCfg->firstActvUlBwpId = *(cuSrvCellCfg->uplinkConfig->firstActiveUplinkBWP_Id);
+      if(cuSrvCellCfg->uplinkConfig->initialUplinkBWP)
+      {
+         ulBwp = ((BWP_UplinkDedicated_t *)(cuSrvCellCfg->uplinkConfig->initialUplinkBWP));
+         if(ulBwp->pusch_Config)
+         {
+            macSrvCellCfg->initUlBwp.puschPresent = true;
+            extractPuschCfg(ulBwp->pusch_Config, &macSrvCellCfg->initUlBwp.puschCfg);
+         }
+         if(ulBwp->pucch_Config)
+         {
+            macSrvCellCfg->initUlBwp.pucchPresent = true;
+            memset(&macSrvCellCfg->initUlBwp.pucchCfg, 0, sizeof(PucchCfg));
+            if(storedSrvCellCfg)
+            {
+               if(!storedSrvCellCfg->initUlBwp.pucchPresent)
+                  extractPucchCfg(ulBwp->pucch_Config, &macSrvCellCfg->initUlBwp.pucchCfg, NULL);
+               else
+                  extractPucchCfg(ulBwp->pucch_Config, &macSrvCellCfg->initUlBwp.pucchCfg,\
+                  &storedSrvCellCfg->initUlBwp.pucchCfg);
+            }
+            else
+            {
+               extractPucchCfg(ulBwp->pucch_Config, &macSrvCellCfg->initUlBwp.pucchCfg, NULL);
+            }
+         }
+      }
+      if(cuSrvCellCfg->uplinkConfig->firstActiveUplinkBWP_Id)
+         macSrvCellCfg->firstActvUlBwpId = *(cuSrvCellCfg->uplinkConfig->firstActiveUplinkBWP_Id);
    }
    return ret;
 }
@@ -8780,13 +10647,20 @@ uint8_t extractSpCellDedicatedCfg(ServingCellConfig_t *cuSrvCellCfg, ServCellCfg
  *    Function : extractUeReCfgCellInfo
  *
  *    Functionality: Fills Reconfig Cell group Info received by CU
+ *   
+ * @params[in] CellGroupConfigRrc_t *cellGrp = CellGroupConfigRrc_t information which
+ *                       is send by CU, which we have stored in F1UeContextSetupDb
+ *             MacUeCfg *MacUeCfg = Used to Store the information,
+ *                      which needs to send in other layer, as well as this can be
+ *                      the variable which stores the information in DuCb,
+ *             MacUeCfg *storedMacUeCfg = Null in case of sending the
+ *                      information to other layer else it will have copyOfmacUeCfg
+ *                      which we have stored in F1UeContextSetupDb.
  *
- * @params[in] CellGroupConfigRrc_t *macCellGrpCfg
- *             MacUeCfg*  macUeCfg
  * @return ROK/RFAILED
  *
  * ****************************************************************/
-uint8_t extractUeReCfgCellInfo(CellGroupConfigRrc_t *cellGrp, MacUeCfg *macUeCfg)
+uint8_t extractUeReCfgCellInfo(CellGroupConfigRrc_t *cellGrp, MacUeCfg *macUeCfg, MacUeCfg *storedMacUeCfg)
 {
    uint8_t ret = ROK;
    MAC_CellGroupConfig_t     *macCellGroup = NULLP;
@@ -8869,7 +10743,18 @@ uint8_t extractUeReCfgCellInfo(CellGroupConfigRrc_t *cellGrp, MacUeCfg *macUeCfg
          if(cellGrp->spCellConfig->spCellConfigDedicated)
          {
             servCellCfg = ((ServingCellConfig_t *)(cellGrp->spCellConfig->spCellConfigDedicated));
-            ret = extractSpCellDedicatedCfg(servCellCfg, &macUeCfg->spCellCfg.servCellCfg);
+            if(storedMacUeCfg)
+            {
+               if(!storedMacUeCfg->spCellCfgPres)
+                  ret = extractSpCellDedicatedCfg(servCellCfg, &macUeCfg->spCellCfg.servCellCfg, NULL);
+               else
+                  ret = extractSpCellDedicatedCfg(servCellCfg, &macUeCfg->spCellCfg.servCellCfg,\
+                        &storedMacUeCfg->spCellCfg.servCellCfg);
+            }
+            else
+            {
+               ret = extractSpCellDedicatedCfg(servCellCfg, &macUeCfg->spCellCfg.servCellCfg, NULL);
+            }
             if(ret == RFAILED)
             {
                DU_LOG("\nERROR --> F1AP : Failed at extractSpCellDedicatedCfg()");
@@ -9248,13 +11133,19 @@ void freeAperDecodeDRBSetup(DRBs_ToBeSetup_List_t *drbSet)
  *
  *    Functionality: builds Mac Cell Cfg
  *
- * @params[in] MacUeCfg pointer
- *             void pointer
+ * @params[in] MacUeCfg *macUeCfgToSend = Used to Store the information which
+ *                       needs to send in other layer, as well as this can be
+ *                       the variable which stores the information in DuCb.
+ *             MacUeCfg *storedMacUeCfg = Null in case of sending the
+ *                       information to other layer else it will have copyOfmacUeCfg  
+ *                       which we have stored in F1UeContextSetupDb
+ *             void *cellInfo = CellGroupConfigRrc_t information which is send
+ *                        by CU, which we have stored in F1UeContextSetupDb 
  *
  * @return void 
  *
  * ****************************************************************/
-uint8_t procUeReCfgCellInfo(MacUeCfg *macUeCfg, void *cellInfo)
+uint8_t procUeReCfgCellInfo(MacUeCfg *macUeCfgToSend, MacUeCfg *storedMacUeCfg, void *cellInfo)
 {
    uint8_t ret = ROK;
    CellGroupConfigRrc_t *cellGrp = NULLP;
@@ -9262,13 +11153,13 @@ uint8_t procUeReCfgCellInfo(MacUeCfg *macUeCfg, void *cellInfo)
    if(cellInfo)
    {
       cellGrp = (CellGroupConfigRrc_t *)cellInfo;
-      ret = extractUeReCfgCellInfo(cellGrp, macUeCfg);
+      ret = extractUeReCfgCellInfo(cellGrp, macUeCfgToSend, storedMacUeCfg);
       if(ret == RFAILED)
          DU_LOG("\nERROR  -->  F1AP : Failed at procUeReCfgCellInfo()");
    }
    if(ret == RFAILED)
    {
-      freeUeReCfgCellGrpInfo(macUeCfg);
+      freeUeReCfgCellGrpInfo(macUeCfgToSend);
    }
    return ret;
 }
@@ -9292,118 +11183,127 @@ uint8_t procUeReCfgCellInfo(MacUeCfg *macUeCfg, void *cellInfo)
  * ****************************************************************/
 void duFillModulationDetails(MacUeCfg *ueCfg, MacUeCfg *oldUeCfg, void *ueCap)
 {
-   UE_NR_Capability_t *ueNrCap;
+   UE_NR_Capability_t *ueNrCap=NULLP;
 
-   if(ueCap)
+   if(!ueCap && oldUeCfg)
+   {
+      memcpy(&ueCfg->dlModInfo, &oldUeCfg->dlModInfo, sizeof(ModulationInfo));     
+      memcpy(&ueCfg->ulModInfo, &oldUeCfg->ulModInfo, sizeof(ModulationInfo));
+   }
+   else
+   {
       ueNrCap = (UE_NR_Capability_t *)ueCap;
 
-   /* Filling DL modulation info */
-   if(ueNrCap->featureSets && ueNrCap->featureSets->featureSetsDownlinkPerCC && \
+      /* Filling DL modulation info */
+      if(ueNrCap->featureSets && ueNrCap->featureSets->featureSetsDownlinkPerCC && \
          ueNrCap->featureSets->featureSetsDownlinkPerCC->list.array[0] && \
          ueNrCap->featureSets->featureSetsDownlinkPerCC->list.array[0]->supportedModulationOrderDL)
-   {
-      switch(*(ueNrCap->featureSets->featureSetsDownlinkPerCC->list.array[0]->supportedModulationOrderDL))
       {
-         case ModulationOrder_qpsk:
-            {
-               ueCfg->dlModInfo.modOrder = MOD_ORDER_QPSK;
-               break;
-            }
-         case ModulationOrder_qam16:
-            {
-               ueCfg->dlModInfo.modOrder = MOD_ORDER_QAM16;
-               break;
-            }
-         case ModulationOrder_qam64:
-            {
-               ueCfg->dlModInfo.modOrder = MOD_ORDER_QAM64;
-               ueCfg->dlModInfo.mcsIndex = PDSCH_MCS_INDEX;
-               ueCfg->dlModInfo.mcsTable = MCS_TABLE_QAM64;
-               break;
-            }
-         case ModulationOrder_qam256:
-            {
-               ueCfg->dlModInfo.modOrder = MOD_ORDER_QAM256;
-               break;
-            }
-         default:
-            {
-               DU_LOG("\nERROR  -->  DU APP: Incorrect downlink modulation order received. Reatining old modulation configuration");
-               memcpy(&ueCfg->dlModInfo, &oldUeCfg->dlModInfo, sizeof(ModulationInfo));
-               break;
-            }
+         switch(*(ueNrCap->featureSets->featureSetsDownlinkPerCC->list.array[0]->supportedModulationOrderDL))
+         {
+            case ModulationOrder_qpsk:
+               {
+                  ueCfg->dlModInfo.modOrder = MOD_ORDER_QPSK;
+                  break;
+               }
+            case ModulationOrder_qam16:
+               {
+                  ueCfg->dlModInfo.modOrder = MOD_ORDER_QAM16;
+                  break;
+               }
+            case ModulationOrder_qam64:
+               {
+                  ueCfg->dlModInfo.modOrder = MOD_ORDER_QAM64;
+                  ueCfg->dlModInfo.mcsIndex = PDSCH_MCS_INDEX;
+                  ueCfg->dlModInfo.mcsTable = MCS_TABLE_QAM64;
+                  break;
+               }
+            case ModulationOrder_qam256:
+               {
+                  ueCfg->dlModInfo.modOrder = MOD_ORDER_QAM256;
+                  break;
+               }
+            default:
+               {
+                  DU_LOG("\nERROR  -->  DU APP: Incorrect downlink modulation order received. Reatining old modulation configuration");
+                  if(oldUeCfg)
+                     memcpy(&ueCfg->dlModInfo, &oldUeCfg->dlModInfo, sizeof(ModulationInfo));
+                  break;
+               }
+         }
+      }
+      else
+      {
+         if(oldUeCfg)
+            memcpy(&ueCfg->dlModInfo, &oldUeCfg->dlModInfo, sizeof(ModulationInfo));
       }
-   }
-   else
-   {
-      memcpy(&ueCfg->dlModInfo, &oldUeCfg->dlModInfo, sizeof(ModulationInfo));
-   }
 
-   /* Filling UL modulation info */
-   if(ueNrCap->featureSets && ueNrCap->featureSets->featureSetsUplinkPerCC && \
+      /* Filling UL modulation info */
+      if(ueNrCap->featureSets && ueNrCap->featureSets->featureSetsUplinkPerCC && \
          ueNrCap->featureSets->featureSetsUplinkPerCC->list.array[0] && \
          ueNrCap->featureSets->featureSetsUplinkPerCC->list.array[0]->supportedModulationOrderUL)
-   {
-      switch(*(ueNrCap->featureSets->featureSetsUplinkPerCC->list.array[0]->supportedModulationOrderUL))
       {
-         case ModulationOrder_qpsk:
-            {
-               ueCfg->ulModInfo.modOrder = MOD_ORDER_QPSK;
-               break;
-            }
-         case ModulationOrder_qam16:
-            {
-               ueCfg->ulModInfo.modOrder = MOD_ORDER_QAM16;
-               ueCfg->ulModInfo.mcsIndex = PUSCH_MCS_INDEX;
-               ueCfg->ulModInfo.mcsTable = MCS_TABLE_QAM64;
-               break;
-            }
-         case ModulationOrder_qam64:
-            {
-               ueCfg->ulModInfo.modOrder = MOD_ORDER_QAM64;
-               break;
-            }
-         case ModulationOrder_qam256:
-            {
-               ueCfg->ulModInfo.modOrder = MOD_ORDER_QAM256;
-               break;
-            }
-         default:
-            {
-               DU_LOG("\nERROR  -->  DU APP: Incorrect uplink modulation order received. Reatining old modulation configuration");
-               memcpy(&ueCfg->ulModInfo, &oldUeCfg->ulModInfo, sizeof(ModulationInfo));
-               break;
-            }
+         switch(*(ueNrCap->featureSets->featureSetsUplinkPerCC->list.array[0]->supportedModulationOrderUL))
+         {
+            case ModulationOrder_qpsk:
+               {
+                  ueCfg->ulModInfo.modOrder = MOD_ORDER_QPSK;
+                  break;
+               }
+            case ModulationOrder_qam16:
+               {
+                  ueCfg->ulModInfo.modOrder = MOD_ORDER_QAM16;
+                  ueCfg->ulModInfo.mcsIndex = PUSCH_MCS_INDEX;
+                  ueCfg->ulModInfo.mcsTable = MCS_TABLE_QAM64;
+                  break;
+               }
+            case ModulationOrder_qam64:
+               {
+                  ueCfg->ulModInfo.modOrder = MOD_ORDER_QAM64;
+                  break;
+               }
+            case ModulationOrder_qam256:
+               {
+                  ueCfg->ulModInfo.modOrder = MOD_ORDER_QAM256;
+                  break;
+               }
+            default:
+               {
+                  DU_LOG("\nERROR  -->  DU APP: Incorrect uplink modulation order received. Reatining old modulation configuration");
+                  if(oldUeCfg)
+                     memcpy(&ueCfg->ulModInfo, &oldUeCfg->ulModInfo, sizeof(ModulationInfo));
+                  break;
+               }
+         }
+      }
+      else
+      {
+         if(oldUeCfg)
+            memcpy(&ueCfg->ulModInfo, &oldUeCfg->ulModInfo, sizeof(ModulationInfo));
       }
-   }
-   else
-   {
-      memcpy(&ueCfg->ulModInfo, &oldUeCfg->ulModInfo, sizeof(ModulationInfo));
    }
 }
 
 /*******************************************************************
  *
- * @brief Function to extract cellGrp Info present in cutoDu cont
+ * @brief Function to extract info from CU to DU RRC container extension
  *
  * @details
  *
- *    Function : extractCellGrpInfo
+ *    Function : extractCuToDuRrcInfoExt
  *
- *    Functionality: Function to extract cellGrp Info present
- *                   in cutoDu cont
+ *    Functionality: Function to extract info from CU to DU RRC container
+ *    extension
  *
  * @params[in] ProtocolExtensionContainer_4624P16_t pointer
  *
- * @return CellGroupConfigRrc_t *
+ * @return ROK
+ *         RFAILED
  *
  * ****************************************************************/
-
-CellGroupConfigRrc_t *extractCellGrpInfo(ProtocolExtensionContainer_4624P16_t *protocolIeExtn,\
-      DuUeCfg *ueCfgDb)
+uint8_t extractCuToDuRrcInfoExt(ProtocolExtensionContainer_4624P16_t *protocolIeExtn, DuUeCfg *ueCfgDb)
 {
-   uint8_t idx2 =0;
-   uint16_t id =0;
+   uint8_t ieIdx =0;
    uint16_t recvBufLen =0;
    CellGroupConfigRrc_t *cellGrpCfg = NULLP;
    CUtoDURRCInformation_ExtIEs_t *extIeInfo = NULLP;
@@ -9412,40 +11312,48 @@ CellGroupConfigRrc_t *extractCellGrpInfo(ProtocolExtensionContainer_4624P16_t *p
 
    if(protocolIeExtn)
    {
-      for(idx2 = 0; idx2 < protocolIeExtn->list.count; idx2++)
+      for(ieIdx = 0; ieIdx < protocolIeExtn->list.count; ieIdx++)
       {
-         extIeInfo = ((CUtoDURRCInformation_ExtIEs_t *)(protocolIeExtn->list.array[idx2]));
-        id = extIeInfo->id;
-         switch(id)
+         extIeInfo = ((CUtoDURRCInformation_ExtIEs_t *)(protocolIeExtn->list.array[ieIdx]));
+         switch(extIeInfo->id)
          {
             case ProtocolIE_ID_id_CellGroupConfig:
-            {
-              recvBufLen = extIeInfo->extensionValue.choice.CellGroupConfig.size;
-              /* decoding the CellGroup Buf received */
-              DU_ALLOC(cellGrpCfg, sizeof(CellGroupConfigRrc_t));
-              if(cellGrpCfg)
-              {
-                  memset(cellGrpCfg, 0, sizeof(CellGroupConfigRrc_t));
-                  rval = aper_decode(0, &asn_DEF_CellGroupConfigRrc, (void **)&cellGrpCfg,
-                    extIeInfo->extensionValue.choice.CellGroupConfig.buf, recvBufLen, 0, 0);
-                  if(rval.code == RC_FAIL || rval.code == RC_WMORE)
+               {
+                  /* decoding the CellGroup Buf received */
+                  recvBufLen = extIeInfo->extensionValue.choice.CellGroupConfig.size;
+                  DU_ALLOC(cellGrpCfg, sizeof(CellGroupConfigRrc_t));
+                  if(cellGrpCfg)
                   {
-                     DU_LOG("\nERROR  -->  F1AP : ASN decode failed at decodeCellGrpCfg()");
-                     return NULLP;
+                     memset(cellGrpCfg, 0, sizeof(CellGroupConfigRrc_t));
+                     rval = aper_decode(0, &asn_DEF_CellGroupConfigRrc, (void **)&cellGrpCfg,
+                           extIeInfo->extensionValue.choice.CellGroupConfig.buf, recvBufLen, 0, 0);
+                     if(rval.code == RC_FAIL || rval.code == RC_WMORE)
+                     {
+                        DU_LOG("\nERROR  -->  F1AP : ASN decode failed at decodeCellGrpCfg()");
+                        return RFAILED;
+                     }
+                     xer_fprint(stdout, &asn_DEF_CellGroupConfigRrc, cellGrpCfg);
+
+                     if(extractRlcCfgToAddMod(cellGrpCfg->rlc_BearerToAddModList, ueCfgDb))
+                        return NULLP;
+                     ueCfgDb->cellGrpCfg = cellGrpCfg;
                   }
-                  xer_fprint(stdout, &asn_DEF_CellGroupConfigRrc, cellGrpCfg);
-                 if(extractRlcCfgToAddMod(cellGrpCfg->rlc_BearerToAddModList, ueCfgDb))
-                    return NULLP;
-              }
-              break;
-            }
+                  break;
+               }
+
+            case ProtocolIE_ID_id_HandoverPreparationInformation:
+               {
+                  DU_LOG("\nINFO -->  F1AP : Received HANDOVER PREPARATION INFO in UE CONTEXT SETUP REQUEST");
+                  break;
+               }
+
             default:
-               DU_LOG("\nERROR  -->  F1AP : Invalid IE received CUtoDURRCInformation:%d at decodeCellGrpCfg()", id);
-              break;
+               DU_LOG("\nERROR  -->  F1AP : Invalid IE received CUtoDURRCInformation: %ld at decodeCellGrpCfg()", extIeInfo->id);
+               break;
          }
       }
    }
-   return cellGrpCfg;
+   return ROK;
 }
 
 /*******************************************************************
@@ -9466,19 +11374,18 @@ CellGroupConfigRrc_t *extractCellGrpInfo(ProtocolExtensionContainer_4624P16_t *p
  * ****************************************************************/
 uint8_t procSrbListToSetup(SRBs_ToBeSetup_Item_t * srbItem, LcCfg *macLcToAdd, RlcBearerCfg *rlcLcToAdd)
 {
-   uint8_t ret = ROK;
 
    /* Filling RLC INFO */
-   procRlcLcCfg(srbItem->sRBID, srbItem->sRBID, RB_TYPE_SRB, RLC_AM, CONFIG_ADD, NULL, rlcLcToAdd);
+   procRlcLcCfg(srbItem->sRBID, srbItem->sRBID, RB_TYPE_SRB, RLC_AM, CONFIG_ADD, NULL, rlcLcToAdd, NULL);
 
    /* Filling MAC INFO */
-   ret = procMacLcCfg(srbItem->sRBID, RB_TYPE_SRB, CONFIG_ADD, NULL,NULL, NULL, macLcToAdd, NULL);
-   if(ret == RFAILED)
+   if(procMacLcCfg(srbItem->sRBID, RB_TYPE_SRB, CONFIG_ADD, NULL,NULL, NULL, NULL, macLcToAdd, NULL)  != ROK)
    { 
       DU_LOG("\nERROR  -->  F1AP : Failed at MAC LC Cfg in procSrbListToSetup()");
-      return ret;
+      return RFAILED;
    }
-   return ret;
+
+   return ROK;
 }
 
 
@@ -9502,37 +11409,63 @@ uint8_t procSrbListToSetup(SRBs_ToBeSetup_Item_t * srbItem, LcCfg *macLcToAdd, R
 
 uint8_t extractSrbListToSetup(SRBs_ToBeSetup_List_t *srbCfg, DuUeCfg *ueCfgDb)
 {
-   uint8_t ret, srbIdx;
+   uint8_t ret = ROK, srbIdx = 0, rlcLcIdx = 0;
    SRBs_ToBeSetup_Item_t *srbItem = NULLP;
+   LcCfg *macLcCtxt = NULLP;
+   RlcBearerCfg *rlcLcCtxt = NULLP;
 
    if(srbCfg)
    {
       for(srbIdx = 0; srbIdx < srbCfg->list.count; srbIdx++)
       {
+         macLcCtxt = NULL;
+         rlcLcCtxt = NULL;
+
          srbItem = &srbCfg->list.array[srbIdx]->value.choice.SRBs_ToBeSetup_Item;
          if(ueCfgDb->numMacLcs > MAX_NUM_LC)
-        { 
+         
             DU_LOG("\nERROR   -->  F1AP:  MAX LC Reached in MAC");
-           ret = RFAILED;
-           break;
-        }
+            ret = RFAILED;
+            break;
+         }
          if(ueCfgDb->numRlcLcs > MAX_NUM_LC)
-        {
+         {
             DU_LOG("\nERROR   -->  F1AP:  MAX LC Reached in RLC");
-           ret = RFAILED;
-           break;
-        }
-        memset(&ueCfgDb->macLcCfg[ueCfgDb->numMacLcs], 0, sizeof(LcCfg));
-        memset(&ueCfgDb->rlcLcCfg[ueCfgDb->numRlcLcs], 0, sizeof(RlcBearerCfg));
-         ret = procSrbListToSetup(srbItem, &ueCfgDb->macLcCfg[ueCfgDb->numMacLcs],\
-           &ueCfgDb->rlcLcCfg[ueCfgDb->numRlcLcs]);
-        ueCfgDb->numRlcLcs++;
-        ueCfgDb->numMacLcs++;
-        if(ret == RFAILED)
-        {
+            ret = RFAILED;
+            break;
+         }
+
+         for(rlcLcIdx = 0; rlcLcIdx < ueCfgDb->numMacLcs; rlcLcIdx++)
+         {
+            if(ueCfgDb->rlcLcCfg[rlcLcIdx].rbId == srbItem->sRBID && ueCfgDb->rlcLcCfg[rlcLcIdx].rbType == RB_TYPE_SRB)
+            {
+               macLcCtxt = &ueCfgDb->macLcCfg[rlcLcIdx];
+               rlcLcCtxt = &ueCfgDb->rlcLcCfg[rlcLcIdx];
+               break;
+            }
+         }
+         if(!macLcCtxt)
+         {
+            memset(&ueCfgDb->macLcCfg[ueCfgDb->numMacLcs], 0, sizeof(LcCfg));
+            macLcCtxt = &ueCfgDb->macLcCfg[ueCfgDb->numMacLcs];
+            ueCfgDb->numMacLcs++;
+         }
+         if(!rlcLcCtxt)
+         {
+            memset(&ueCfgDb->rlcLcCfg[ueCfgDb->numRlcLcs], 0, sizeof(RlcBearerCfg));
+            rlcLcCtxt = &ueCfgDb->rlcLcCfg[ueCfgDb->numRlcLcs];
+            ueCfgDb->numRlcLcs++;
+         }
+
+         ret = procSrbListToSetup(srbItem, macLcCtxt, rlcLcCtxt);
+
+         DU_LOG("\nDEBUG --> DUAPP: extractSrbListToSetup: SRBID: %ld [RLC,MAC,NumDrb]:[%x,%x,%x]",\
+               srbItem->sRBID, ueCfgDb->numRlcLcs, ueCfgDb->numMacLcs,  ueCfgDb->numDrb);
+         if(ret == RFAILED)
+         {
             DU_LOG("\nERROR  -->  F1AP:  Failed at extractSrbListToSetup()");
-           break;
-        }
+            break;
+         }
       }
    }
    else
@@ -9547,41 +11480,68 @@ uint8_t extractSrbListToSetup(SRBs_ToBeSetup_List_t *srbCfg, DuUeCfg *ueCfgDb)
  *
  * @details
  *
- *    Function : procDrbListToSetup
+ *    Function : procDrbListToSetupMod
  *
  *    Functionality: Fills Drb List received by CU
  *                   for both MAC and RLC
  *
- * @params[in] SRBs_ToBeSetup_Item_t pointer
- *             LcCfg pointer,
- *             RlcBearerCfg pointer
+ * @params[in] DRBs_ToBeSetup_Item_t , DRBs_ToBeSetupMod_Item_t,
+ *             DRBs_ToBeModified_Item_t , lcId, LcCfg pointer,
+ *             RlcBearerCfg , UpTnlCfg, RlcUeCfg
  * @return void
  *
  * ****************************************************************/
 
-uint8_t procDrbListToSetup(uint8_t lcId, DRBs_ToBeSetup_Item_t *drbItem,\
-DRBs_ToBeSetupMod_Item_t *drbSetupModItem, LcCfg *macLcToAdd, RlcBearerCfg *rlcLcToAdd, UpTnlCfg *upTnlInfo)
+uint8_t procDrbListToSetupMod(uint8_t lcId, DRBs_ToBeSetup_Item_t *drbItem,\
+DRBs_ToBeSetupMod_Item_t *drbSetupModItem, DRBs_ToBeModified_Item_t *drbModItem, LcCfg *macLcToAdd, RlcBearerCfg *rlcLcToAdd, UpTnlCfg *upTnlInfo, RlcUeCfg *storedRlcUeCfg)
 {
+   uint8_t cfgIdx = 0;
+   RlcMode rlcModeInfo;
 
    if(drbItem != NULLP)
    {
       /* Filling RLC INFO */
-      procRlcLcCfg(drbItem->dRBID, lcId, RB_TYPE_DRB, drbItem->rLCMode, CONFIG_ADD, NULL, rlcLcToAdd);
+      procRlcLcCfg(drbItem->dRBID, lcId, RB_TYPE_DRB, drbItem->rLCMode, CONFIG_ADD, NULL, rlcLcToAdd, &drbItem->\
+      qoSInformation);
 
       /* Filling MAC INFO */
-      if(procMacLcCfg(lcId, RB_TYPE_DRB, CONFIG_ADD, drbItem, NULL, NULL, macLcToAdd, upTnlInfo) != ROK)
+      if(procMacLcCfg(lcId, RB_TYPE_DRB, CONFIG_ADD, drbItem, NULL, NULL, NULL, macLcToAdd, upTnlInfo) != ROK)
       { 
-         DU_LOG("\nERROR  --> F1AP : Failed at RLC LC Cfg in procDrbListToSetup()");
+         DU_LOG("\nERROR  --> F1AP : Failed at RLC LC Cfg in procDrbListToSetupMod()");
          return RFAILED;
       }
    }
    else if(drbSetupModItem != NULLP)
    {
-      procRlcLcCfg(drbSetupModItem->dRBID, lcId, RB_TYPE_DRB, drbSetupModItem->rLCMode, CONFIG_ADD, NULL, rlcLcToAdd);
+      procRlcLcCfg(drbSetupModItem->dRBID, lcId, RB_TYPE_DRB, drbSetupModItem->rLCMode, CONFIG_ADD, NULL, rlcLcToAdd, 
+      &drbSetupModItem->qoSInformation);
 
-      if(procMacLcCfg(lcId, RB_TYPE_DRB, CONFIG_ADD, NULL, drbSetupModItem, NULL, macLcToAdd, upTnlInfo) != ROK)
+      if(procMacLcCfg(lcId, RB_TYPE_DRB, CONFIG_ADD, NULL, drbSetupModItem, NULL, NULL, macLcToAdd, upTnlInfo) != ROK)
       {
-         DU_LOG("\nERROR  --> F1AP : Failed at RLC LC Cfg in procDrbListToSetup()");
+         DU_LOG("\nERROR  --> F1AP : Failed at RLC LC Cfg in procDrbListToSetupMod()");
+         return RFAILED;
+      }
+   }
+   else if(drbModItem != NULLP)
+   {
+      /* Drb to Mod IEs doesnot have rlcMode to be modified
+       * in ASN. Hence no change in RLC configurations */
+      if(storedRlcUeCfg != NULLP)
+      {
+         for(cfgIdx = 0; cfgIdx < storedRlcUeCfg->numLcs; cfgIdx++)
+         {
+            if(storedRlcUeCfg->rlcLcCfg[cfgIdx].lcId == lcId)
+            {
+               rlcModeInfo = storedRlcUeCfg->rlcLcCfg[cfgIdx].rlcMode;
+               break;
+            }
+         }
+      }
+
+      procRlcLcCfg(drbModItem->dRBID, lcId, RB_TYPE_DRB, rlcModeInfo, CONFIG_MOD, NULL, rlcLcToAdd, drbModItem->qoSInformation);
+      if(procMacLcCfg(lcId, RB_TYPE_DRB, CONFIG_MOD, NULL, NULL, drbModItem, NULL, macLcToAdd, upTnlInfo) != ROK)
+      {
+         DU_LOG("\nERROR  --> F1AP : Failed at RLC LC Cfg in procDrbListToSetupMod()");
          return RFAILED;
       }
    }
@@ -9594,7 +11554,7 @@ DRBs_ToBeSetupMod_Item_t *drbSetupModItem, LcCfg *macLcToAdd, RlcBearerCfg *rlcL
  *
  * @details
  *
- *    Function : extractDrbListToSetup
+ *    Function : extractDrbListToSetupMod
  *
  *    Functionality: extract Drb List received by CU
  *                   for both MAC and RLC
@@ -9605,62 +11565,128 @@ DRBs_ToBeSetupMod_Item_t *drbSetupModItem, LcCfg *macLcToAdd, RlcBearerCfg *rlcL
  *
  * ****************************************************************/
 
-uint8_t extractDrbListToSetup(uint8_t lcId, DRBs_ToBeSetup_List_t *drbCfg,DRBs_ToBeSetupMod_List_t *drbSetupModCfg,\
-uint8_t drbCount, DuUeCfg *ueCfgDb)
+uint8_t extractDrbListToSetupMod(DRBs_ToBeSetup_List_t *drbCfg, DRBs_ToBeSetupMod_List_t *drbSetupModCfg,\
+ DRBs_ToBeModified_List_t *drbModCfg, uint8_t drbCount, DuUeCfg *ueCfgDb, uint32_t *drbBitMap, RlcUeCfg *rlcUeCfg)
 {
-   uint8_t ret, drbIdx;
+   uint8_t ret = ROK;
+   uint8_t drbIdx = 0, rlcLcIdx = 0;
+   uint8_t drbId = 0, lcId = 0;
    DRBs_ToBeSetup_Item_t *drbItem = NULLP;
    DRBs_ToBeSetupMod_ItemIEs_t *drbSetupModItem = NULLP;
+   DRBs_ToBeModified_ItemIEs_t *drbModItem = NULLP;
+   LcCfg *macLcCtxt = NULLP;
+   RlcBearerCfg *rlcLcCtxt = NULLP;
 
    ret = ROK;
    if(drbCount > 0)
    {
       for(drbIdx = 0; drbIdx < drbCount; drbIdx++)
       {
+         macLcCtxt = NULL;
+         rlcLcCtxt = NULL;
+
          if(ueCfgDb->numMacLcs > MAX_NUM_LC)
          { 
-            DU_LOG("\nERROR  -->  F1AP :  MAX LC Reached in MAC at extractDrbListToSetup()");
+            DU_LOG("\nERROR  -->  F1AP :  MAX LC Reached in MAC at extractDrbListToSetupMod()");
             ret = RFAILED;
             break;
          }
          if(ueCfgDb->numRlcLcs > MAX_NUM_LC)
          {
-            DU_LOG("\nERROR  -->  F1AP :  MAX LC Reached in RLC at extractDrbListToSetup()");
+            DU_LOG("\nERROR  -->  F1AP :  MAX LC Reached in RLC at extractDrbListToSetupMod()");
             ret = RFAILED;
             break;
          }
-         memset(&ueCfgDb->macLcCfg[ueCfgDb->numMacLcs], 0, sizeof(LcCfg));
-         memset(&ueCfgDb->rlcLcCfg[ueCfgDb->numRlcLcs], 0, sizeof(RlcBearerCfg));
-   
-         if(drbCfg != NULL)
+
+         if(drbModCfg != NULLP)
          {
-            drbItem = &drbCfg->list.array[drbIdx]->value.choice.DRBs_ToBeSetup_Item;
-            ret = procDrbListToSetup(lcId, drbItem, NULL, &ueCfgDb->macLcCfg[ueCfgDb->numMacLcs],\
-               &ueCfgDb->rlcLcCfg[ueCfgDb->numRlcLcs], &ueCfgDb->upTnlInfo[ueCfgDb->numDrb]);
-            if(ret == RFAILED)
+            drbModItem = (DRBs_ToBeModified_ItemIEs_t *) drbModCfg->list.array[drbIdx];
+            drbId = drbModItem->value.choice.DRBs_ToBeModified_Item.dRBID;
+         }
+         else if(drbCfg != NULLP)
+            drbId = drbCfg->list.array[drbIdx]->value.choice.DRBs_ToBeSetup_Item.dRBID;
+         else if(drbSetupModCfg != NULL)
+         {
+            drbSetupModItem = (DRBs_ToBeSetupMod_ItemIEs_t *) drbSetupModCfg->list.array[drbIdx];
+            drbId = drbSetupModItem->value.choice.DRBs_ToBeSetupMod_Item.dRBID;
+         }
+
+         for(rlcLcIdx = 0; rlcLcIdx < ueCfgDb->numRlcLcs; rlcLcIdx++)
+         {
+            if(ueCfgDb->rlcLcCfg[rlcLcIdx].rbId == drbId && ueCfgDb->rlcLcCfg[rlcLcIdx].rbType == RB_TYPE_DRB)
             {
-               DU_LOG("\nERROR  --> F1AP : Failed at extractDrbListToSetup()");
+               macLcCtxt = &ueCfgDb->macLcCfg[rlcLcIdx];
+               rlcLcCtxt = &ueCfgDb->rlcLcCfg[rlcLcIdx];
                break;
             }
          }
-         else if(drbSetupModCfg != NULL)
+         if(!macLcCtxt)
          {
-            drbSetupModItem = (DRBs_ToBeSetupMod_ItemIEs_t *) drbSetupModCfg->list.array[drbIdx];
-            ret = procDrbListToSetup(lcId, NULL, &(drbSetupModItem->value.choice.DRBs_ToBeSetupMod_Item) ,\
-            &ueCfgDb->macLcCfg[ueCfgDb->numMacLcs], &ueCfgDb->rlcLcCfg[ueCfgDb->numRlcLcs],\
-            &ueCfgDb->upTnlInfo[ueCfgDb->numDrb]);
+            memset(&ueCfgDb->macLcCfg[ueCfgDb->numMacLcs], 0, sizeof(LcCfg));
+            macLcCtxt = &ueCfgDb->macLcCfg[ueCfgDb->numMacLcs];
+            ueCfgDb->numMacLcs++;
+         }
+         if(!rlcLcCtxt)
+         {
+            memset(&ueCfgDb->rlcLcCfg[ueCfgDb->numRlcLcs], 0, sizeof(RlcBearerCfg));
+            rlcLcCtxt = &ueCfgDb->rlcLcCfg[ueCfgDb->numRlcLcs];
+            ueCfgDb->numRlcLcs++;
+         }
+
+         if(drbModCfg != NULLP)
+         {
+            lcId = fetchLcId(drbId);
+            if(lcId < MIN_DRB_LCID)
+            {
+               DU_LOG("\nERROR  --> F1AP : Failed fetching LCID %d in extractDrbListToSetupMod() for Modified List", lcId);
+               break;
+            } 
+            ret = procDrbListToSetupMod(lcId, NULL, NULL, &(drbModItem->value.choice.DRBs_ToBeModified_Item),\
+            macLcCtxt, rlcLcCtxt, &ueCfgDb->upTnlInfo[ueCfgDb->numDrb], rlcUeCfg);
             if(ret == RFAILED)
             {
-               DU_LOG("\nERROR  --> F1AP : Failed at extractDrbListToSetup()");
+               DU_LOG("\nERROR  --> F1AP : Failed at extractDrbListToSetupMod() for Modified List");
+               break;
+            }
+         }
+         else
+         {
+            lcId = getDrbLcId(drbBitMap);
+            if(lcId == RFAILED)
+            {
+               DU_LOG("\nERROR  -->  F1AP :  InCorrect LCID extractDrbListToSetupMod()");
+               ret = RFAILED;
                break;
             }
+            if(drbCfg != NULL)
+            {
+               drbItem = &drbCfg->list.array[drbIdx]->value.choice.DRBs_ToBeSetup_Item;
+               ret = procDrbListToSetupMod(lcId, drbItem, NULL, NULL, macLcCtxt, rlcLcCtxt, &ueCfgDb->upTnlInfo[ueCfgDb->numDrb], rlcUeCfg);
+               if(ret == RFAILED)
+               {
+                  DU_LOG("\nERROR  --> F1AP : Failed at extractDrbListToSetupMod() for DrbSetup List");
+                  break;
+               }
+            }
+            else if(drbSetupModCfg != NULL)
+            {
+               ret = procDrbListToSetupMod(lcId, NULL, &(drbSetupModItem->value.choice.DRBs_ToBeSetupMod_Item), NULL,\
+                     macLcCtxt, rlcLcCtxt, &ueCfgDb->upTnlInfo[ueCfgDb->numDrb], rlcUeCfg);
+               if(ret == RFAILED)
+               {
+                  DU_LOG("\nERROR  --> F1AP : Failed at extractDrbListToSetupMod() for DrbSetupMod List");
+                  break;
+               }
+               ueCfgDb->numDrbSetupMod++;
+            }
          }
-         ueCfgDb->numRlcLcs++;
-         ueCfgDb->numMacLcs++;
          ueCfgDb->numDrb++;
+         DU_LOG("\nDEBUG --> DUAPP: extractDrbListToSetupMod:lcId:%x ,BitMap:%x, [RLC,MAC,NumDrb]:[%x,%x,%x]",\
+                            lcId,*drbBitMap, ueCfgDb->numRlcLcs, ueCfgDb->numMacLcs,  ueCfgDb->numDrb);
          if(ret == RFAILED)
          {
-            DU_LOG("\nERROR  --> F1AP : Failed at extractDrbListToSetup()");
+            DU_LOG("\nERROR  --> F1AP : Failed at extractDrbListToSetupMod()");
             break;
          }
       }
@@ -9891,12 +11917,15 @@ void freeAperDecodeF1UeContextSetupReq(UEContextSetupRequest_t   *ueSetReq)
  * ****************************************************************/
 uint8_t procF1UeContextSetupReq(F1AP_PDU_t *f1apMsg)
 {
-   uint8_t  ret=0, ieIdx=0, ueIdx=0, lcId=0, cellIdx=0;
-   bool ueCbFound = false;
+   int8_t ueIdx = -1;
+   uint8_t  ret=0, ieIdx=0, ieExtIdx = 0, cellIdx=0, servCellIdx = 0;
+   bool ueCbFound = false, hoInProgress = false;
+   uint16_t nrCellId = 0;
    uint32_t gnbCuUeF1apId=0, gnbDuUeF1apId=0, bitRateSize=0;
    DuUeCb   *duUeCb = NULL;
    UEContextSetupRequest_t   *ueSetReq = NULL;
    DRBs_ToBeSetup_List_t *drbCfg = NULL;
+   CUtoDURRCInformation_t *rrcInfo = NULL;
 
    ret = ROK;
 
@@ -9910,79 +11939,138 @@ uint8_t procF1UeContextSetupReq(F1AP_PDU_t *f1apMsg)
                gnbCuUeF1apId = ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.GNB_CU_UE_F1AP_ID;
                break;
             }
+
          case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
             {
                gnbDuUeF1apId = ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_UE_F1AP_ID;
                break;
             }
+
+         case ProtocolIE_ID_id_SpCell_ID:
+            {
+               bitStringToInt(&ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.NRCGI.nRCellIdentity, &nrCellId);
+
+               GET_CELL_IDX(nrCellId, cellIdx);
+               if(!duCb.actvCellLst[cellIdx])
+               {
+                  DU_LOG("\nERROR  -->  F1AP : Cell Id [%d] not found", nrCellId);
+                  ret = RFAILED;
+               }
+               break;
+            }
+
          case ProtocolIE_ID_id_ServCellIndex:
             {
-               cellIdx = ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.ServCellIndex;
+               servCellIdx = ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.ServCellIndex;
+               break;
+            }
+
+         case ProtocolIE_ID_id_SpCellULConfigured:
+            {
+               /* Indicates whether the gNB-CU requests the gNB-DU to configure the uplink as no UL, 
+                  UL, SUL or UL+SUL for the indicated cell for the UE */
+               break;
+            }
+
+         case ProtocolIE_ID_id_CUtoDURRCInformation:
+            {
+               rrcInfo = &ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.CUtoDURRCInformation;
+
+               /* Search if UE context is present */
                for(ueIdx = 0; ueIdx < MAX_NUM_UE; ueIdx++)
                {
-                  if((duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbDuUeF1apId == gnbDuUeF1apId)&&\
-                        (duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbCuUeF1apId == gnbCuUeF1apId))
+                  if(duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbCuUeF1apId == gnbCuUeF1apId)
                   {
                      ueCbFound = true;
                      duUeCb = &duCb.actvCellLst[cellIdx]->ueCb[ueIdx];
-                     DU_ALLOC(duUeCb->f1UeDb, sizeof(F1UeContextSetupDb));
-                     if(duUeCb->f1UeDb)
-                     {
-                        memset(duUeCb->f1UeDb, 0, sizeof(F1UeContextSetupDb));
-                        duUeCb->f1UeDb->actionType = UE_CTXT_SETUP;
-                        duUeCb->f1UeDb->cellIdx = cellIdx;
-                     }
-                     else
+                     break;
+                  }
+               }
+
+               /* Check if UE Handover scenario */
+               if(rrcInfo->iE_Extensions)
+               {
+                  for(ieExtIdx = 0; ieExtIdx < rrcInfo->iE_Extensions->list.count; ieExtIdx++)
+                  {
+                     if(rrcInfo->iE_Extensions->list.array[ieExtIdx]->id == ProtocolIE_ID_id_HandoverPreparationInformation)
                      {
-                        DU_LOG("\nERROR  -->  F1AP: Memory Alloc Failed at procF1UeContextSetupReq()");
-                        ret = RFAILED;
+                        hoInProgress = true;
+                        break;
                      }
                   }
+               }
+               
+               /* If UE context is not present, but UE is in handover */
+               if(!ueCbFound && hoInProgress)
+               {
+                  ueIdx = getFreeBitFromUeBitMap(nrCellId);
+                  if(ueIdx != -1)
+                     gnbDuUeF1apId = ueIdx +1;
                   else
-                     ueCbFound = false;
+                  {
+                     DU_LOG("\nERROR  -->  F1AP : No free UE IDX found in UE bit map of cell Id [%d]", nrCellId);
+                     ret = RFAILED;
+                     break;
+                  }
+                  duUeCb = &duCb.actvCellLst[cellIdx]->hoUeCb[ueIdx];
+                  duUeCb->f1UeDb = NULL;
+                  duUeCb->gnbCuUeF1apId = gnbCuUeF1apId;
+                  duUeCb->gnbDuUeF1apId = gnbDuUeF1apId;
+                  duUeCb->ueState = UE_HANDIN_IN_PROGRESS;
+               }
 
+               if(duUeCb)
+               {
+                  DU_ALLOC(duUeCb->f1UeDb, sizeof(F1UeContextSetupDb));
+                  if(duUeCb->f1UeDb)
+                  {
+                     memset(duUeCb->f1UeDb, 0, sizeof(F1UeContextSetupDb));
+                     duUeCb->f1UeDb->actionType = UE_CTXT_SETUP;
+                     duUeCb->f1UeDb->cellIdx = cellIdx;
+                  }
+                  else
+                  {
+                     DU_LOG("\nERROR  -->  F1AP: Memory Alloc Failed at procF1UeContextSetupReq()");
+                     ret = RFAILED;
+                     break;
+                  }
                }
-               if(!ueCbFound)
+               else
                {
                   DU_LOG("\nERROR  -->  F1AP: DuUeCb is not found at procF1UeContextSetupReq()");
                   ret = RFAILED;
+                  break;
                }
-               break;
-            }
-         case ProtocolIE_ID_id_SpCellULConfigured:
-            /* Indicates whether the gNB-CU requests the gNB-DU to configure the uplink as no UL, 
-               UL, SUL or UL+SUL for the indicated cell for the UE */
-            break;
-         case ProtocolIE_ID_id_CUtoDURRCInformation:
-            {
-               if(ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.CUtoDURRCInformation.uE_CapabilityRAT_ContainerList)
+                 
+               /* Extract UE capability info */
+               if(rrcInfo->uE_CapabilityRAT_ContainerList)
                {
-                  duUeCb->f1UeDb->duUeCfg.ueNrCapability = \
-                  extractUeCapability(ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.CUtoDURRCInformation.\
-                  uE_CapabilityRAT_ContainerList, duUeCb);
+                  duUeCb->f1UeDb->duUeCfg.ueNrCapability = extractUeCapability(rrcInfo->uE_CapabilityRAT_ContainerList, duUeCb);
                }
-               if(ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.CUtoDURRCInformation.iE_Extensions)
+
+               /* Extract IE extension */
+               if(rrcInfo->iE_Extensions)
                {
-                  duUeCb->f1UeDb->duUeCfg.cellGrpCfg = extractCellGrpInfo(ueSetReq->protocolIEs.list.array[ieIdx]->\
-                        value.choice.CUtoDURRCInformation.iE_Extensions, &duUeCb->f1UeDb->duUeCfg);
-                  if(!duUeCb->f1UeDb->duUeCfg.cellGrpCfg)
+                  if(extractCuToDuRrcInfoExt(rrcInfo->iE_Extensions, &duUeCb->f1UeDb->duUeCfg) != ROK)
                   {
-                     DU_LOG("\nERROR  -->  F1AP: Failed to extract cell Grp Info");
+                     DU_LOG("\nERROR  -->  F1AP: Failed to extract CU to DU RRC information extension IE");
                      //TODO: Update the failure cause in ue context Setup Response
                      ret = RFAILED;
                   }
                }
                break;
             } 
+
          case ProtocolIE_ID_id_SCell_ToBeSetup_List:
             {
                DU_LOG("\nINFO   -->  DU_APP: Received SCell_ToBeSetup_List but  Not processing the list");
                break;
             }
+
          case ProtocolIE_ID_id_SRBs_ToBeSetup_List:
             {
                if(extractSrbListToSetup(&ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.SRBs_ToBeSetup_List,\
-               &duUeCb->f1UeDb->duUeCfg))
+                        &duUeCb->f1UeDb->duUeCfg))
                {
                   DU_LOG("\nERROR  -->  DU APP : Failed at extractSrbListToSetup()");
                   //TODO: Update the failure cause in ue context Setup Response
@@ -9990,23 +12078,20 @@ uint8_t procF1UeContextSetupReq(F1AP_PDU_t *f1apMsg)
                }
                break;
             }
+
          case ProtocolIE_ID_id_DRBs_ToBeSetup_List:
             {
-               lcId = getDrbLcId(&duUeCb->drbBitMap);
-               if(lcId != RFAILED)
+               drbCfg = &ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.DRBs_ToBeSetup_List;
+
+               if(extractDrbListToSetupMod(drbCfg, NULL, NULL, drbCfg->list.count, &duUeCb->f1UeDb->duUeCfg, &duUeCb->drbBitMap, NULLP))
                {
-                  drbCfg = &ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.DRBs_ToBeSetup_List;
-                  if(extractDrbListToSetup(lcId, drbCfg, NULL, drbCfg->list.count, &duUeCb->f1UeDb->duUeCfg))
-                  {
-                     DU_LOG("\nERROR  -->  DU APP : Failed at extractDrbListToSetup()");
-                     //TODO: Update the failure cause in ue context Setup Response
-                     ret = RFAILED;
-                  }
-               }
-               else 
+                  DU_LOG("\nERROR  -->  DU APP : Failed at extractDrbListToSetupMod()");
+                  //TODO: Update the failure cause in ue context Setup Response
                   ret = RFAILED;
+               }
                break;
             }
+
          case ProtocolIE_ID_id_RRCContainer:
             {
                /* Filling Dl RRC Msg Info */
@@ -10025,6 +12110,7 @@ uint8_t procF1UeContextSetupReq(F1AP_PDU_t *f1apMsg)
                }         
                break;
             }
+
          case ProtocolIE_ID_id_RRCDeliveryStatusRequest:
             {
                if(duUeCb->f1UeDb->dlRrcMsg->rrcMsgPdu)
@@ -10037,6 +12123,7 @@ uint8_t procF1UeContextSetupReq(F1AP_PDU_t *f1apMsg)
                }
                break;
             }
+
          case ProtocolIE_ID_id_GNB_DU_UE_AMBR_UL:
             {
                /* MaximumBitRate Uplink */
@@ -10060,19 +12147,23 @@ uint8_t procF1UeContextSetupReq(F1AP_PDU_t *f1apMsg)
                   ret = RFAILED;
                break;
             }
+
          default:
             {
                break;
             }
+      } /* End of switch */
+
+      /* In case of any failure in any IE */
+      if(ret == RFAILED)
+      {
+         // BuildAndSendUeContextSetupRsp(cellId,ueId);
+         DU_LOG("\nERROR  -->  F1AP: Failed to process UE CNTXT SETUP REQ at procF1UeContextSetupReq()"); 
+         break;
       }
-   }
-   if(ret == RFAILED)
-   {
-      /*TODO : Negative case*/
-      // BuildAndSendUeContextSetupRsp(ueIdx, cellId);
-      DU_LOG("\nERROR  -->  F1AP: Failed to process UE CNTXT SETUP REQ at procF1UeContextSetupReq()"); 
-   }
-   else
+   } /* End of for loop of IEs */
+
+   if(ret == ROK)
       ret = duProcUeContextSetupRequest(duUeCb);
 
    freeAperDecodeF1UeContextSetupReq(ueSetReq); 
@@ -10098,9 +12189,18 @@ void freeDlTnlInfo(DLUPTNLInformation_ToBeSetup_List_t *tnlInfo)
 {
    uint8_t arrIdx = 0;
 
-   for(arrIdx=0; arrIdx < tnlInfo->list.count; arrIdx++)
+   if(tnlInfo)
    {
-      DU_FREE(tnlInfo->list.array[arrIdx]->dLUPTNLInformation.choice.gTPTunnel, sizeof(GTPTunnel_t));
+      for(arrIdx=0; arrIdx < tnlInfo->list.count; arrIdx++)
+      {
+         DU_FREE(tnlInfo->list.array[arrIdx]->dLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf,\
+               tnlInfo->list.array[arrIdx]->dLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.size);
+         DU_FREE(tnlInfo->list.array[arrIdx]->dLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf,\
+               tnlInfo->list.array[arrIdx]->dLUPTNLInformation.choice.gTPTunnel->gTP_TEID.size);
+         DU_FREE(tnlInfo->list.array[arrIdx]->dLUPTNLInformation.choice.gTPTunnel, sizeof(GTPTunnel_t));
+         DU_FREE(tnlInfo->list.array[arrIdx], sizeof(DLUPTNLInformation_ToBeSetup_Item_t));
+      }
+      DU_FREE(tnlInfo->list.array, tnlInfo->list.size);
    }
 }
 
@@ -10127,7 +12227,9 @@ void freeDrbSetupList(DRBs_Setup_List_t *drbSetupList)
    {
       drbItemIe = ((DRBs_Setup_ItemIEs_t *)drbSetupList->list.array[arrIdx]);
       freeDlTnlInfo(&drbItemIe->value.choice.DRBs_Setup_Item.dLUPTNLInformation_ToBeSetup_List);
+      DU_FREE(drbSetupList->list.array[arrIdx],  sizeof(DRBs_Setup_Item_t));
    }
+   DU_FREE(drbSetupList->list.array, drbSetupList->list.size);
 }
 
 /*******************************************************************
@@ -10416,13 +12518,13 @@ uint8_t fillDrbSetupList(DRBs_Setup_List_t *drbSetupList, DuUeCfg *ueCfg)
  *    Functionality: Constructs the UE Setup Response and sends
  *                   it to the DU through SCTP.
  *
- * @params[in] 
+ * @params[in] uint8_t cellId,uint8_t ueId
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildAndSendUeContextSetupRsp(uint8_t ueIdx, uint8_t cellId)
+uint8_t BuildAndSendUeContextSetupRsp(uint8_t cellId,uint8_t ueId)
 {
    uint8_t   idx, ret, cellIdx, elementCnt;
    uint32_t  gnbCuUeF1apId;   /* gNB-CU UE F1AP Id */
@@ -10430,129 +12532,107 @@ uint8_t BuildAndSendUeContextSetupRsp(uint8_t ueIdx, uint8_t cellId)
    asn_enc_rval_t  encRetVal;        /* Encoder return value */
    F1AP_PDU_t               *f1apMsg = NULLP;
    UEContextSetupResponse_t *ueSetRsp = NULLP;
-   CellGroupConfigRrc_t     *cellGrpCfg = NULLP;
    DuUeCb                   *ueCb = NULLP;
 
-   DU_LOG("\n INFO   -->  F1AP : Building UE Context Setup Response for cellId %d, ueIdx %d\n", cellId, ueIdx);
+   DU_LOG("\n INFO   -->  F1AP : Building UE Context Setup Response for cellId %d, ueId %d\n", cellId, ueId);
 
    while(true)
    {
       DU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t));
       if(f1apMsg == NULLP)
       {
-        DU_LOG(" ERROR  -->  F1AP : Memory allocation for F1AP-PDU failed");
-        ret = RFAILED;
-        break;
+         DU_LOG(" ERROR  -->  F1AP : Memory allocation for F1AP-PDU failed");
+         ret = RFAILED;
+         break;
       }
 
       f1apMsg->present = F1AP_PDU_PR_successfulOutcome;
       DU_ALLOC(f1apMsg->choice.successfulOutcome,
-           sizeof(SuccessfulOutcome_t));
+            sizeof(SuccessfulOutcome_t));
       if(f1apMsg->choice.successfulOutcome == NULLP)
       {
-        DU_LOG(" ERROR  -->  F1AP : Memory allocation for      F1AP-PDU failed");
-        ret = RFAILED;
-        break;
+         DU_LOG(" ERROR  -->  F1AP : Memory allocation for     F1AP-PDU failed");
+         ret = RFAILED;
+         break;
       }
 
       f1apMsg->choice.successfulOutcome->procedureCode = \
-                                                        ProcedureCode_id_UEContextSetup;
+                                                         ProcedureCode_id_UEContextSetup;
       f1apMsg->choice.successfulOutcome->criticality = Criticality_reject;
       f1apMsg->choice.successfulOutcome->value.present = \
-                                                        SuccessfulOutcome__value_PR_UEContextSetupResponse;
+                                                         SuccessfulOutcome__value_PR_UEContextSetupResponse;
 
       ueSetRsp =
-        &f1apMsg->choice.successfulOutcome->value.choice.UEContextSetupResponse;
+         &f1apMsg->choice.successfulOutcome->value.choice.UEContextSetupResponse;
       elementCnt = 4;
       ueSetRsp->protocolIEs.list.count = elementCnt;
       ueSetRsp->protocolIEs.list.size = \
-                                       elementCnt * sizeof(UEContextSetupResponse_t *);
+                                        elementCnt * sizeof(UEContextSetupResponse_t *);
 
       /* Initialize the UESetup members */
       DU_ALLOC(ueSetRsp->protocolIEs.list.array, \
-           ueSetRsp->protocolIEs.list.size);
+            ueSetRsp->protocolIEs.list.size);
       if(ueSetRsp->protocolIEs.list.array == NULLP)
       {
-        DU_LOG(" ERROR  -->  F1AP : Memory allocation for UE Setup Response failed");
-        ret = RFAILED;
-        break;
+         DU_LOG(" ERROR  -->  F1AP : Memory allocation for UE Setup Response failed");
+         ret = RFAILED;
+         break;
       }
 
       for(idx=0; idx<elementCnt; idx++)
       {
-        DU_ALLOC(ueSetRsp->protocolIEs.list.array[idx],\
-              sizeof(UEContextSetupResponseIEs_t));
-        if(ueSetRsp->protocolIEs.list.array[idx] == NULLP)
-        {
-           DU_LOG(" ERROR  -->  F1AP : Memory allocation for UE Setup Response failed");
-           ret = RFAILED;
-           break;
-        }
+         DU_ALLOC(ueSetRsp->protocolIEs.list.array[idx],\
+               sizeof(UEContextSetupResponseIEs_t));
+         if(ueSetRsp->protocolIEs.list.array[idx] == NULLP)
+         {
+            DU_LOG(" ERROR  -->  F1AP : Memory allocation for UE Setup Response failed");
+            ret = RFAILED;
+            break;
+         }
       }
       /* Fetching Ue Cb Info*/
       GET_CELL_IDX(cellId, cellIdx);
-      gnbDuUeF1apId = duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].gnbDuUeF1apId;
-      gnbCuUeF1apId = duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].gnbCuUeF1apId;
-      ueCb = &duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1];
+      gnbDuUeF1apId = duCb.actvCellLst[cellIdx]->ueCb[ueId-1].gnbDuUeF1apId;
+      gnbCuUeF1apId = duCb.actvCellLst[cellIdx]->ueCb[ueId-1].gnbCuUeF1apId;
+      ueCb = &duCb.actvCellLst[cellIdx]->ueCb[ueId-1];
 
       idx = 0;
       /*GNB CU UE F1AP ID*/
       ueSetRsp->protocolIEs.list.array[idx]->id        = \
-                                                 ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID;
+                                                  ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID;
       ueSetRsp->protocolIEs.list.array[idx]->criticality = Criticality_reject;
       ueSetRsp->protocolIEs.list.array[idx]->value.present = \
-                                                            UEContextSetupResponseIEs__value_PR_GNB_CU_UE_F1AP_ID;
+                                                             UEContextSetupResponseIEs__value_PR_GNB_CU_UE_F1AP_ID;
       ueSetRsp->protocolIEs.list.array[idx]->value.choice.GNB_CU_UE_F1AP_ID = gnbCuUeF1apId;
 
       /*GNB DU UE F1AP ID*/
       idx++;
       ueSetRsp->protocolIEs.list.array[idx]->id        = \
-                                                 ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID;
+                                                  ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID;
       ueSetRsp->protocolIEs.list.array[idx]->criticality = Criticality_reject;
       ueSetRsp->protocolIEs.list.array[idx]->value.present = \
-                                                            UEContextSetupResponseIEs__value_PR_GNB_DU_UE_F1AP_ID;
+                                                             UEContextSetupResponseIEs__value_PR_GNB_DU_UE_F1AP_ID;
       ueSetRsp->protocolIEs.list.array[idx]->value.choice.GNB_DU_UE_F1AP_ID = gnbDuUeF1apId;
 
 
       /*DUtoCURRC Information */
       idx++;
       ueSetRsp->protocolIEs.list.array[idx]->id  = \
-                                                  ProtocolIE_ID_id_DUtoCURRCInformation;
+                                                   ProtocolIE_ID_id_DUtoCURRCInformation;
       ueSetRsp->protocolIEs.list.array[idx]->criticality = Criticality_reject;
       ueSetRsp->protocolIEs.list.array[idx]->value.present =\
-                                                           UEContextSetupResponseIEs__value_PR_DUtoCURRCInformation;
-      if(ueCb->f1UeDb)
-      {
-         if(ueCb->f1UeDb->duUeCfg.cellGrpCfg)
-        {
-           cellGrpCfg = (CellGroupConfigRrc_t*)ueCb->f1UeDb->duUeCfg.cellGrpCfg;
-           ret = EncodeUeCntxtDuToCuInfo(&ueSetRsp->protocolIEs.list.array[idx]->value.\
-                    choice.DUtoCURRCInformation.cellGroupConfig, cellGrpCfg);
-            if(ret == RFAILED)
-           {
-               DU_LOG("\nERROR  -->  F1AP : Failed to EncodeUeCntxtDuToCuInfo in BuildAndSendUeContextSetupRsp()");
-               freeF1UeDb(ueCb->f1UeDb);
-               ueCb->f1UeDb = NULLP;
-               break;
-           }
-         }
-      }
-      else
-      {
-         DU_LOG("\nERROR  -->  F1AP : Failed to form DUtoCU RRCInfo at BuildAndSendUeContextSetupRsp()");
-         ret = RFAILED;
-         break;
-      }
+                                                            UEContextSetupResponseIEs__value_PR_DUtoCURRCInformation;
+      BuildCellGroupConfigRrc(ueCb, &ueSetRsp->protocolIEs.list.array[idx]->value.choice.DUtoCURRCInformation.cellGroupConfig);
 
       /* Drb Setup List */
       idx++;
       ueSetRsp->protocolIEs.list.array[idx]->id  = \
-                                ProtocolIE_ID_id_DRBs_Setup_List;
+                                                   ProtocolIE_ID_id_DRBs_Setup_List;
       ueSetRsp->protocolIEs.list.array[idx]->criticality = Criticality_reject;
       ueSetRsp->protocolIEs.list.array[idx]->value.present =\
-                                UEContextSetupResponseIEs__value_PR_DRBs_Setup_List;
+                                                            UEContextSetupResponseIEs__value_PR_DRBs_Setup_List;
       ret = fillDrbSetupList(&ueSetRsp->protocolIEs.list.array[idx]->value.choice.DRBs_Setup_List,\
-               &ueCb->f1UeDb->duUeCfg);
+            &ueCb->f1UeDb->duUeCfg);
       if(ret == RFAILED)
       {
          DU_LOG("\nERROR  -->  F1AP : Failed to fillDrbSetupList in BuildAndSendUeContextSetupRsp()");
@@ -10561,9 +12641,9 @@ uint8_t BuildAndSendUeContextSetupRsp(uint8_t ueIdx, uint8_t cellId)
          break;
       }
 
-       /* Free UeContext Db created during Ue context Req */
-       freeF1UeDb(ueCb->f1UeDb);
-       ueCb->f1UeDb = NULLP;
+      /* Free UeContext Db created during Ue context Req */
+      freeF1UeDb(ueCb->f1UeDb);
+      ueCb->f1UeDb = NULLP;
 
       /* TODO: To send Drb list */
       xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
@@ -10572,30 +12652,30 @@ uint8_t BuildAndSendUeContextSetupRsp(uint8_t ueIdx, uint8_t cellId)
       memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
       encBufSize = 0;
       encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\
-           encBuf);
+            encBuf);
       /* Encode results */
       if(encRetVal.encoded == ENCODE_FAIL)
-      {
-        DU_LOG( "\nERROR  -->  F1AP : Could not encode UE Context Setup Response structure (at %s)\n",\
-              encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
-        ret = RFAILED;
-        break;
+      {
+         DU_LOG( "\nERROR  -->  F1AP : Could not encode UE Context Setup Response structure (at %s)\n",\
+               encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+         ret = RFAILED;
+         break;
       }
       else
       {
-        DU_LOG("\nDEBUG   -->  F1AP : Created APER encoded buffer for UE Context Setup Response\n");
-        for(int i=0; i< encBufSize; i++)
-        {
-           printf("%x",encBuf[i]);
-        }
+         DU_LOG("\nDEBUG   -->  F1AP : Created APER encoded buffer for UE Context Setup Response\n");
+         for(int i=0; i< encBufSize; i++)
+         {
+            printf("%x",encBuf[i]);
+         }
       }
 
       /* Sending  msg  */
-      if(SendF1APMsg(DU_APP_MEM_REGION,DU_POOL)        != ROK)
+      if(sendF1APMsg() != ROK)
       {
-        DU_LOG("\nERROR  -->  F1AP : Sending UE Context Setup Response failed");
-        ret = RFAILED;
-        break;
+         DU_LOG("\nERROR  -->  F1AP : Sending UE Context Setup Response failed");
+         ret = RFAILED;
+         break;
       }
       break;
    }
@@ -10617,21 +12697,25 @@ uint8_t BuildAndSendUeContextSetupRsp(uint8_t ueIdx, uint8_t cellId)
 *         failure = RFAILED
 *
 * ****************************************************************/
-uint8_t BuildAndSendUeCtxtRsp(uint8_t ueIdx, uint8_t cellId)
+uint8_t BuildAndSendUeCtxtRsp(uint8_t cellId, uint8_t ueId)
 {
    uint8_t cellIdx = 0, actionType = 0; 
 
    GET_CELL_IDX(cellId, cellIdx);
-   actionType = duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].f1UeDb->actionType;
+   actionType = duCb.actvCellLst[cellIdx]->ueCb[ueId-1].f1UeDb->actionType;
 
    switch(actionType)
    {
       case UE_CTXT_SETUP:
-         BuildAndSendUeContextSetupRsp(ueIdx, cellId);
-         break;
+         {
+            BuildAndSendUeContextSetupRsp(cellId,ueId);
+            break;
+         }
       case UE_CTXT_MOD:
-         BuildAndSendUeContextModResp(ueIdx, cellId);
-         break;
+         {
+            BuildAndSendUeContextModRsp(&duCb.actvCellLst[cellIdx]->ueCb[ueId-1]);
+            break;
+         }
       default:
          DU_LOG("ERROR  -->  F1AP: Invalid Action Type %d at BuildAndSendUeCtxtRsp()", actionType);
          break;
@@ -10793,7 +12877,7 @@ uint8_t BuildAndSendF1ResetReq()
         }
       }
 
-      if(SendF1APMsg(DU_APP_MEM_REGION, DU_POOL) != ROK)
+      if(sendF1APMsg() != ROK)
       {
         DU_LOG("\nERROR  -->  F1AP : Sending F1 Reset request failed");
         break;
@@ -10946,7 +13030,7 @@ uint8_t BuildAndSendF1ResetAck()
         }
       }
       /* Sending msg */
-      if(SendF1APMsg(DU_APP_MEM_REGION, DU_POOL) != ROK)
+      if(sendF1APMsg() != ROK)
       {
         DU_LOG("\nERROR  -->  F1AP : Sending F1 Reset Acknowledgement failed");
         break;
@@ -11213,7 +13297,7 @@ uint8_t BuildAndSendRrcDeliveryReport(uint32_t gnbCuUeF1apId, \
       }
 
       /* Sending msg */
-      if(SendF1APMsg(DU_APP_MEM_REGION, DU_POOL) != ROK)
+      if(sendF1APMsg() != ROK)
       {
         DU_LOG("\nERROR  -->  F1AP : Sending RRC delivery  msg request failed");
         break;
@@ -11361,932 +13445,1870 @@ void freeAperDecodeF1SetupRsp(F1SetupResponse_t *f1SetRspMsg)
                     }
                     break;
 
-                 }
-              default:
+                 }
+              default:
+                 {
+                    DU_LOG("\nERROR  -->  DU_APP : Invalid IE received in F1SetupRsp:%ld",
+                          f1SetRspMsg->protocolIEs.list.array[ieIdx]->id);
+                 }
+           }
+           free(f1SetRspMsg->protocolIEs.list.array[ieIdx]);
+        }
+      }
+      free(f1SetRspMsg->protocolIEs.list.array);
+   }
+}
+/******************************************************************
+ *
+ * @brief Processes F1 Setup Response sent by CU
+ *
+ * @details
+ *
+ *    Function : procF1SetupRsp
+ *
+ *    Functionality: Processes F1 Setup Response sent by CU
+ *
+ * @params[in] F1AP_PDU_t ASN decoded F1AP message
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t procF1SetupRsp(F1AP_PDU_t *f1apMsg, MsgLen recvBufLen, char *recvBuf)
+{
+   uint8_t ret = ROK;
+   uint16_t idx =0;
+   F1SetupResponse_t *f1SetRspMsg = NULLP;
+   GNB_CU_Name_t     *cuName = NULLP;
+   F1SetupRsp  f1SetRspDb;
+   RRC_Version_t      *rrcVer =NULLP;
+   
+   memset(&f1SetRspDb, 0, sizeof(F1SetupRsp));
+
+   DU_LOG("\nINFO   -->  F1AP : F1 Setup Response received");
+   f1SetRspMsg = &f1apMsg->choice.successfulOutcome->value.choice.F1SetupResponse;
+
+   for(idx=0; idx<f1SetRspMsg->protocolIEs.list.count; idx++)
+   {
+      switch(f1SetRspMsg->protocolIEs.list.array[idx]->id)
+      {
+        case ProtocolIE_ID_id_Cells_to_be_Activated_List:
+           {
+              extractCellsToBeActivated(f1SetRspMsg->protocolIEs.list.array[idx]->\
+                    value.choice.Cells_to_be_Activated_List);
+              break;
+           }
+        case ProtocolIE_ID_id_TransactionID:
+           {
+              f1SetRspDb.transId = f1SetRspMsg->protocolIEs.list.array[idx]->\
+                                   value.choice.TransactionID;
+              break;
+           }
+        case ProtocolIE_ID_id_gNB_CU_Name:
+           {
+              cuName = &f1SetRspMsg->protocolIEs.list.array[idx]->\
+                       value.choice.GNB_CU_Name;
+              strcpy(f1SetRspDb.cuName, (const char*)cuName->buf);
+              break;
+           }
+        case ProtocolIE_ID_id_GNB_CU_RRC_Version:
+           {
+              rrcVer = &f1SetRspMsg->protocolIEs.list.array[idx]->value.choice.RRC_Version;
+              strcpy(f1SetRspDb.rrcVersion.rrcVer,
+                    (const char*)rrcVer->latest_RRC_Version.buf);
+              break;
+           }
+        default:
+           DU_LOG("\nERROR  -->  DU_APP : Invalid IE received in F1SetupRsp:%ld",
+                 f1SetRspMsg->protocolIEs.list.array[idx]->id);
+      }
+      duProcF1SetupRsp();
+   }
+   
+   freeAperDecodeF1SetupRsp(f1SetRspMsg);
+
+   duCb.f1SetupReqAndRspMsg.f1MsgRspBufSize = recvBufLen;
+   DU_ALLOC(duCb.f1SetupReqAndRspMsg.f1MsgRspBuf, duCb.f1SetupReqAndRspMsg.f1MsgRspBufSize);
+   if(duCb.f1SetupReqAndRspMsg.f1MsgReqBuf == NULLP)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed to store the buf of F1setup response");
+      return RFAILED;
+   }
+   memcpy(duCb.f1SetupReqAndRspMsg.f1MsgRspBuf, recvBuf, recvBufLen);
+   
+   if(BuildAndSendE2SetupReq() != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Failed to build and send E2 setup request ");
+      return RFAILED;
+   }
+   return ret;
+}
+/*******************************************************************
+*
+* @brief free GNB DU config update ack
+*
+* @details
+*
+*    Function : freeAperDecodeGnbDuAck 
+*
+*    Functionality: Processes GNB DU config update ack And
+*                     added free part for the memory allocated by aper_decoder
+*
+* @params[in] F1AP_PDU_t ASN decoded F1AP message
+* @return ROK     - success
+*         RFAILED - failure
+*
+* ****************************************************************/
+
+void freeAperDecodeGnbDuAck(GNBDUConfigurationUpdateAcknowledge_t *gnbDuAck)
+{
+   uint8_t ieIdx = 0;
+
+   if(gnbDuAck->protocolIEs.list.array)
+   {
+      for(ieIdx=0; ieIdx < gnbDuAck->protocolIEs.list.count; ieIdx++)
+      {
+        if(gnbDuAck->protocolIEs.list.array[ieIdx])
+        {
+           free(gnbDuAck->protocolIEs.list.array[ieIdx]);
+        }
+      }
+      free(gnbDuAck->protocolIEs.list.array);
+   }
+}
+
+/*******************************************************************
+*
+* @brief Building  result of gnb-du config update ack output
+*
+* @details
+*
+*    Function : duProcGnbDuCfgUpdAckMsg 
+*
+*    Functionality: 
+*        Building output of gnb-du config update ack 
+*
+* @params[in] transId
+* @return void
+*
+* ****************************************************************/
+
+uint8_t duProcGnbDuCfgUpdAckMsg(uint8_t transId)
+{
+   uint8_t  ieIdx=0, arrIdx=0,ret=ROK;
+   uint8_t  ueId =0 , ueIdx =0, totalActiveUe = 0;
+   uint16_t cellId =0, cellIdx =0, crnti=0;
+   CmLList *f1apPduNode = NULLP;
+   ReservedF1apPduInfo *f1apPduInfo =NULLP;
+   F1AP_PDU_t *f1apMsgPdu = NULLP;
+   GNBDUConfigurationUpdate_t *gnbDuConfigUpdate = NULLP;
+   BIT_STRING_t *cellIdentity=NULLP;
+   struct Served_Cells_To_Delete_ItemIEs *deleteItemIe=NULLP;
+   Served_Cells_To_Delete_List_t *cellsToDelete=NULLP;
+   Served_Cells_To_Delete_Item_t *deleteItem=NULLP;
+
+   DU_LOG("\nINFO   -->  DU APP: GNB-DU config update Ack received ");
+   f1apPduNode = searchFromReservedF1apPduList(transId);
+   f1apPduInfo = (ReservedF1apPduInfo *)f1apPduNode->node;
+   f1apMsgPdu = (F1AP_PDU_t *)f1apPduInfo->f1apMsg;
+
+   if(f1apMsgPdu)
+   {
+      if(f1apMsgPdu->choice.initiatingMessage)
+      {
+         gnbDuConfigUpdate = &f1apMsgPdu->choice.initiatingMessage->value.choice.GNBDUConfigurationUpdate;
+         for(ieIdx=0; ieIdx < gnbDuConfigUpdate->protocolIEs.list.count; ieIdx++)
+         {
+            switch(gnbDuConfigUpdate->protocolIEs.list.array[ieIdx]->id)
+            {
+               case ProtocolIE_ID_id_Served_Cells_To_Delete_List:
+                  {
+                     cellsToDelete = &gnbDuConfigUpdate->protocolIEs.list.array[ieIdx]->value.choice.\
+                                     Served_Cells_To_Delete_List;
+                     if(cellsToDelete->list.array)
+                     {
+                        if(cellsToDelete->list.array[arrIdx])
+                        {
+                           deleteItemIe = (Served_Cells_To_Delete_ItemIEs_t*)cellsToDelete->list.array[arrIdx];
+                           deleteItem=&deleteItemIe->value.choice.Served_Cells_To_Delete_Item;
+                           if(deleteItem->oldNRCGI.nRCellIdentity.buf)
+                           {
+                              cellIdentity = &deleteItem->oldNRCGI.nRCellIdentity;
+                              bitStringToInt(cellIdentity, &cellId);
+
+                              GET_CELL_IDX(cellId, cellIdx);
+                              if(duCb.actvCellLst[cellIdx] != NULLP)
+                              {
+                                 duCb.actvCellLst[cellId-1]->cellStatus = DELETION_IN_PROGRESS;
+                              }
+                           }
+                        }
+                     }
+
+                     if(duCb.actvCellLst[cellIdx] != NULLP)
+                     {
+                        if(duCb.actvCellLst[cellIdx]->numActvUes == 0)
+                        {
+                           ret = duSendCellDeletReq(cellId);
+                           if(ret == RFAILED)
+                           {
+                              DU_LOG("\nERROR  --> DU_APP : duProcGnbDuCfgUpdAckMsg(): Failed to send cell delete\
+                              request for cellId[%d]", cellId);
+                           }
+                        }
+                        else
+                        {
+                           totalActiveUe = duCb.actvCellLst[cellIdx]->numActvUes;
+                           while(totalActiveUe)
+                           {
+                              if(duCb.actvCellLst[cellIdx]->ueCb[ueIdx].ueState != UE_ACTIVE)
+                              {
+                                 ueIdx++;
+                                 continue;
+                              }
+
+                              crnti = duCb.actvCellLst[cellIdx]->ueCb[ueIdx].crnti;
+                              GET_UE_ID(crnti,ueId);
+                              /* Sending Ue Context release request only for maximum supporting UEs */
+                              ret = BuildAndSendUeContextReleaseReq(cellId, ueId);
+                              if(ret == RFAILED)
+                              {
+                                 DU_LOG("\nERROR  --> DU_APP : duProcGnbDuCfgUpdAckMsg(): Failed to build and send UE delete\
+                                 request for cellId[%d]", cellId);
+                              }
+                              ueIdx++;
+                              totalActiveUe--;
+                           }
+                        }
+                     }
+                     else
+                     {
+                        DU_LOG("\nERROR  --> DU_APP : duProcGnbDuCfgUpdAckMsg(): CellId [%d] not found", cellId);
+                        ret = RFAILED;
+                     }
+                     break;
+                  }
+
+               default:
+                  break;
+            }
+         }
+      }
+   }
+   
+   FreeDUConfigUpdate(f1apMsgPdu);
+   deleteFromReservedF1apPduList(f1apPduNode);
+   return ret;
+}
+
+/*******************************************************************
+*
+* @brief Processes GNB DU config update ack
+*
+* @details
+*
+*    Function : procF1GNBDUCfgUpdAck
+*
+*    Functionality: added free part for the memory allocated by aper_decoder
+*
+* @params[in] F1AP_PDU_t *f1apMsg 
+* @return void 
+*
+* ****************************************************************/
+uint8_t procF1GNBDUCfgUpdAck(F1AP_PDU_t *f1apMsg)
+{
+   uint8_t ieIdx=0,transId=0;
+   GNBDUConfigurationUpdateAcknowledge_t *gnbDuAck = NULLP;
+
+   DU_LOG("\nINFO   -->  F1AP : GNB-DU config update acknowledgment");
+   gnbDuAck = &f1apMsg->choice.successfulOutcome->value.choice.GNBDUConfigurationUpdateAcknowledge;
+
+   for(ieIdx=0; ieIdx < gnbDuAck->protocolIEs.list.count; ieIdx++)
+   {
+      switch(gnbDuAck->protocolIEs.list.array[ieIdx]->id)
+      {
+         case ProtocolIE_ID_id_TransactionID:
+            {
+               transId = gnbDuAck->protocolIEs.list.array[ieIdx]->value.choice.TransactionID;
+               break;
+            }
+         case ProtocolIE_ID_id_Cells_to_be_Activated_List:
+            {
+               break;
+            }
+         default :
+            {
+               DU_LOG("\nERROR  -->  F1AP: procF1GNBDUCfgUpdAck(): Invalid IE Received: %ld", \
+                     gnbDuAck->protocolIEs.list.array[ieIdx]->id);
+               break;
+            }
+      }
+   }
+   
+   duProcGnbDuCfgUpdAckMsg(transId);
+    
+#if 0
+   /* presently we are not supporting F1 Reset from DU to CU , we are only
+    * supporting F1 Reset from CU to DU */
+
+   if(BuildAndSendF1ResetReq() != ROK)
+   {
+      return RFAILED;
+   }
+#endif
+
+   freeAperDecodeGnbDuAck(gnbDuAck);
+   return ROK;
+}
+/******************************************************************
+*
+* @brief free DL RRC Message Transfer allocated by aper_decoder 
+*
+* @details
+*
+*    Function : freeAperDecodef1DlRrcMsg 
+*
+*    Functionality: free DL RRC Message Transfer allocated by aper_decoder 
+*
+* @params[in] DLRRCMessageTransfer_t *f1DlRrcMsg 
+* @return ROK     - success
+*         RFAILED - failure
+*
+* ****************************************************************/
+
+void freeAperDecodef1DlRrcMsg(DLRRCMessageTransfer_t *f1DlRrcMsg)
+{
+   uint8_t ieIdx =0;
+   RRCContainer_t *rrcContainer = NULLP;
+
+   if(f1DlRrcMsg->protocolIEs.list.array)
+   {
+      for(ieIdx=0; ieIdx<f1DlRrcMsg->protocolIEs.list.count; ieIdx++)
+      {
+        if(f1DlRrcMsg->protocolIEs.list.array[ieIdx])
+        {
+           switch(f1DlRrcMsg->protocolIEs.list.array[ieIdx]->id)
+           {
+              case ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID:
+                 break;
+              case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
+                 break;
+              case ProtocolIE_ID_id_SRBID:
+                 break;
+              case ProtocolIE_ID_id_RRCContainer:
                  {
-                    DU_LOG("\nERROR  -->  DU_APP : Invalid IE received in F1SetupRsp:%ld",
-                          f1SetRspMsg->protocolIEs.list.array[ieIdx]->id);
+                    rrcContainer =&f1DlRrcMsg->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer;
+                    free(rrcContainer->buf);
                  }
+              case ProtocolIE_ID_id_ExecuteDuplication:
+                 break;
+              case ProtocolIE_ID_id_RRCDeliveryStatusRequest:
+                 break;
+                 break;
            }
-           free(f1SetRspMsg->protocolIEs.list.array[ieIdx]);
+           free(f1DlRrcMsg->protocolIEs.list.array[ieIdx]);
         }
       }
-      free(f1SetRspMsg->protocolIEs.list.array);
+      free(f1DlRrcMsg->protocolIEs.list.array);
    }
 }
 /******************************************************************
  *
- * @brief Processes F1 Setup Response sent by CU
+ * @brief Processes DL RRC Message Transfer  sent by CU
  *
  * @details
  *
- *    Function : procF1SetupRsp
+ *    Function : procF1DlRrcMsgTrans
  *
- *    Functionality: Processes F1 Setup Response sent by CU
+ *    Functionality: Processes DL RRC Message Transfer sent by CU
  *
  * @params[in] F1AP_PDU_t ASN decoded F1AP message
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t procF1SetupRsp(F1AP_PDU_t *f1apMsg)
+uint8_t procF1DlRrcMsgTrans(F1AP_PDU_t *f1apMsg)
 {
-   uint8_t ret = ROK;
-   uint16_t idx =0;
-   F1SetupResponse_t *f1SetRspMsg = NULLP;
-   GNB_CU_Name_t     *cuName = NULLP;
-   F1SetupRsp  f1SetRspDb;
-   RRC_Version_t      *rrcVer =NULLP;
-   
-   memset(&f1SetRspDb, 0, sizeof(F1SetupRsp));
+   uint8_t  idx, ret;
+   DLRRCMessageTransfer_t *f1DlRrcMsg = NULLP;
+   F1DlRrcMsg dlMsg;
+   memset(&dlMsg, 0, sizeof(F1DlRrcMsg));
 
-   DU_LOG("\nINFO   -->  F1AP : F1 Setup Response received");
-   f1SetRspMsg = &f1apMsg->choice.successfulOutcome->value.choice.F1SetupResponse;
+   DU_LOG("\nINFO   -->  DU_APP : DL RRC message transfer Recevied");
+   f1DlRrcMsg = &f1apMsg->choice.initiatingMessage->value.choice.DLRRCMessageTransfer;
 
-   for(idx=0; idx<f1SetRspMsg->protocolIEs.list.count; idx++)
+   ret = ROK;
+
+   for(idx=0; idx<f1DlRrcMsg->protocolIEs.list.count; idx++)
    {
-      switch(f1SetRspMsg->protocolIEs.list.array[idx]->id)
+      switch(f1DlRrcMsg->protocolIEs.list.array[idx]->id)
       {
-        case ProtocolIE_ID_id_Cells_to_be_Activated_List:
+        case ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID:
            {
-              extractCellsToBeActivated(f1SetRspMsg->protocolIEs.list.array[idx]->\
-                    value.choice.Cells_to_be_Activated_List);
+              dlMsg.gnbCuUeF1apId = f1DlRrcMsg->protocolIEs.list.array[idx]->value.choice.GNB_CU_UE_F1AP_ID;
               break;
            }
-        case ProtocolIE_ID_id_TransactionID:
+        case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
            {
-              f1SetRspDb.transId = f1SetRspMsg->protocolIEs.list.array[idx]->\
-                                   value.choice.TransactionID;
+              dlMsg.gnbDuUeF1apId = f1DlRrcMsg->protocolIEs.list.array[idx]->value.choice.GNB_DU_UE_F1AP_ID;
               break;
            }
-        case ProtocolIE_ID_id_gNB_CU_Name:
+        case ProtocolIE_ID_id_SRBID:
            {
-              cuName = &f1SetRspMsg->protocolIEs.list.array[idx]->\
-                       value.choice.GNB_CU_Name;
-              strcpy(f1SetRspDb.cuName, (const char*)cuName->buf);
+              dlMsg.srbId = f1DlRrcMsg->protocolIEs.list.array[idx]->value.choice.SRBID;
               break;
            }
-        case ProtocolIE_ID_id_GNB_CU_RRC_Version:
+        case ProtocolIE_ID_id_ExecuteDuplication:
+           dlMsg.execDup = true;
+           break;
+
+        case ProtocolIE_ID_id_RRCContainer:
            {
-              rrcVer = &f1SetRspMsg->protocolIEs.list.array[idx]->value.choice.RRC_Version;
-              strcpy(f1SetRspDb.rrcVersion.rrcVer,
-                    (const char*)rrcVer->latest_RRC_Version.buf);
+              if(f1DlRrcMsg->protocolIEs.list.array[idx]->value.choice.RRCContainer.size > 0)
+              {
+                 dlMsg.rrcMsgSize = f1DlRrcMsg->protocolIEs.list.array[idx]->value.choice.RRCContainer.size;
+                 DU_ALLOC_SHRABL_BUF(dlMsg.rrcMsgPdu, dlMsg.rrcMsgSize);
+                 if(dlMsg.rrcMsgPdu)
+                 {
+                    memcpy(dlMsg.rrcMsgPdu, f1DlRrcMsg->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf,\
+                       dlMsg.rrcMsgSize);
+                 }
+                 else
+                 {
+                    DU_LOG("\nERROR  -->  DU APP : Memory alloc Failed at RRC Container at procF1DlRrcMsgTrans()");
+                     return RFAILED;
+                 }
+              }
+              else
+              {
+                 DU_LOG("\nERROR  -->  DU_APP : RRC Container Size is invalid:%ld",\
+                 f1DlRrcMsg->protocolIEs.list.array[idx]->value.choice.RRCContainer.size);
+                 return RFAILED;
+              }
+              break;
+           }
+         case ProtocolIE_ID_id_RRCDeliveryStatusRequest:
+           {
+              dlMsg.deliveryStatRpt = true;
               break;
            }
         default:
-           DU_LOG("\nERROR  -->  DU_APP : Invalid IE received in F1SetupRsp:%ld",
-                 f1SetRspMsg->protocolIEs.list.array[idx]->id);
+           DU_LOG("\nERROR  -->  DU_APP : Invalid IE received in DL RRC Msg Transfer:%ld",
+                 f1DlRrcMsg->protocolIEs.list.array[idx]->id);
       }
-      duProcF1SetupRsp();
    }
-   
-   freeAperDecodeF1SetupRsp(f1SetRspMsg);
+
+   ret = duProcDlRrcMsg(&dlMsg);
+
+   freeAperDecodef1DlRrcMsg(f1DlRrcMsg);
    return ret;
 }
 /*******************************************************************
+ *
+* @brief Builds the DRB to be Setup Mod list
 *
-* @brief free GNB DU config update ack
+* @details
+*
+*    Function : 
+*
+*    Functionality: Constructs the DRB to be Setup Mod list
+*
+* @params[in] DRBs_SetupMod_List_t *drbSet
+*
+* @return ROK     - success
+*         RFAILED - failure
+*
+* ****************************************************************/
+uint8_t BuildSrbSetupModList(SRBs_SetupMod_List_t *srbList, DuUeCfg *ueCfg)
+{
+   uint8_t srbIdx = 0;
+   struct SRBs_SetupMod_ItemIEs *srbItemIe;
+
+   srbList->list.count = ueCfg->numRlcLcs;
+   srbList->list.size = srbList->list.count * sizeof(SRBs_SetupMod_ItemIEs_t *);
+
+   DU_ALLOC(srbList->list.array, srbList->list.size);
+   if(srbList->list.array == NULLP)
+   {
+      DU_LOG("\nERROR  -->  DU APP : Memory allocation failed in BuildSrbSetupModList");
+      return RFAILED;
+   }
+
+   for(srbIdx = 0; srbIdx < srbList->list.count; srbIdx++)
+   {
+      DU_ALLOC(srbList->list.array[srbIdx], sizeof(SRBs_SetupMod_ItemIEs_t));
+      if(srbList->list.array[srbIdx] == NULLP)
+      {
+         DU_LOG("\nERROR  -->  DU APP : Memory allocation failed in BuildSrbSetupModList");
+         return RFAILED;
+      }
+   } 
+
+   for(srbIdx=0; srbIdx < srbList->list.count; srbIdx++)
+   {
+      srbItemIe = (struct SRBs_SetupMod_ItemIEs *)srbList->list.array[srbIdx];
+      srbItemIe->id = ProtocolIE_ID_id_SRBs_SetupMod_Item;
+      srbItemIe->criticality = Criticality_reject;
+      srbItemIe->value.present = SRBs_SetupMod_ItemIEs__value_PR_SRBs_SetupMod_Item;
+      srbItemIe->value.choice.SRBs_SetupMod_Item.sRBID = ueCfg->rlcLcCfg[srbIdx].rbId;
+      srbItemIe->value.choice.SRBs_SetupMod_Item.lCID = ueCfg->rlcLcCfg[srbIdx].lcId;
+   }
+   return ROK;
+}
+
+/*******************************************************************
+ *
+* @brief Builds the DRB to be Setup Mod list
 *
 * @details
 *
-*    Function : freeAperDecodeGnbDuAck 
+*    Function : 
 *
-*    Functionality: Processes GNB DU config update ack And
-*                     added free part for the memory allocated by aper_decoder
+*    Functionality: Constructs the DRB to be Setup Mod list
+*
+* @params[in] DRBs_SetupMod_List_t *drbSet
 *
-* @params[in] F1AP_PDU_t ASN decoded F1AP message
 * @return ROK     - success
 *         RFAILED - failure
 *
 * ****************************************************************/
 
-void freeAperDecodeGnbDuAck(GNBDUConfigurationUpdateAcknowledge_t *gnbDuAck)
+uint8_t BuildDrbSetupModList(DRBs_SetupMod_List_t *drbSet , DuUeCfg *ueCfg)
 {
-   uint8_t ieIdx = 0;
+   uint8_t arrIdx =0;
+   uint8_t drbCnt =0;
+   struct DRBs_SetupMod_ItemIEs *drbItemIe;
 
-   if(gnbDuAck->protocolIEs.list.array)
+   drbCnt = ueCfg->numDrbSetupMod;
+
+   if(!drbCnt)
    {
-      for(ieIdx=0; ieIdx < gnbDuAck->protocolIEs.list.count; ieIdx++)
+      DU_LOG("\nINFO  -->  F1AP : BuildDrbToBeSetupModList(): No DRB information to avaialble to add");
+      return ROK;
+   }
+
+   drbSet->list.count = drbCnt;
+   drbSet->list.size = drbCnt * sizeof(DRBs_SetupMod_ItemIEs_t *);
+   DU_ALLOC(drbSet->list.array, drbSet->list.size);
+   if(drbSet->list.array == NULLP)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDrbToBeSetupModList");
+      return  RFAILED;
+   }
+   for(arrIdx=0; arrIdx<drbCnt; arrIdx++)
+   {
+      DU_ALLOC(drbSet->list.array[arrIdx], sizeof(DRBs_SetupMod_ItemIEs_t));
+      if(drbSet->list.array[arrIdx] == NULLP)
       {
-        if(gnbDuAck->protocolIEs.list.array[ieIdx])
-        {
-           free(gnbDuAck->protocolIEs.list.array[ieIdx]);
-        }
+             DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDrbToBeSetupModList");
+             return  RFAILED;
       }
-      free(gnbDuAck->protocolIEs.list.array);
+
+      drbItemIe = (struct DRBs_SetupMod_ItemIEs *)drbSet->list.array[arrIdx];
+      drbItemIe->id = ProtocolIE_ID_id_DRBs_SetupMod_Item;
+      drbItemIe->criticality = Criticality_reject;
+      drbItemIe->value.present = DRBs_SetupMod_ItemIEs__value_PR_DRBs_SetupMod_Item;
+      drbItemIe->value.choice.DRBs_SetupMod_Item.dRBID = ueCfg->upTnlInfo[arrIdx].drbId;
+      if(fillDlTnlSetupList(&drbItemIe->value.choice.DRBs_SetupMod_Item.dLUPTNLInformation_ToBeSetup_List,\
+      &ueCfg->upTnlInfo[arrIdx])!= ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Failed to fill DlTnl SetupList in BuildDrbToBeSetupModList");
+         return RFAILED;
+      }
+      
+   }
+
+   return ROK;
+}
+/*******************************************************************
+* @brief Free the memory allocated for DRB setup List
+*
+* @details
+*
+*    Function : FreeDrbSetupModList 
+*
+*    Functionality:
+*       Free the memory allocated for DRB setup list
+*
+* @params[in] DRBs_Setup_List_t *
+* @return void
+*
+* ****************************************************************/
+void FreeDrbSetupModList(DRBs_SetupMod_List_t *drbSetupList)
+{
+   uint8_t arrIdx = 0;
+   DRBs_SetupMod_ItemIEs_t *drbItemIe = NULLP;
+
+   for(arrIdx = 0; arrIdx < drbSetupList->list.count; arrIdx++)
+   {
+      drbItemIe = ((DRBs_SetupMod_ItemIEs_t *)drbSetupList->list.array[arrIdx]);
+      freeDlTnlInfo(&drbItemIe->value.choice.DRBs_SetupMod_Item.dLUPTNLInformation_ToBeSetup_List);
+      DU_FREE(drbSetupList->list.array[arrIdx], sizeof(DRBs_SetupMod_ItemIEs_t));
    }
+   DU_FREE(drbSetupList->list.array, drbSetupList->list.size);
 }
+
 /*******************************************************************
+* @brief Free the memory allocated for SRB setup List
 *
-* @brief Processes GNB DU config update ack
+* @details
+*
+*    Function : FreeSrbSetupModList 
+*
+*    Functionality:
+*       Free the memory allocated for SRB setup list
+*
+* @params[in] SRBs_Setup_List_t *
+* @return void
+*
+* ****************************************************************/
+void FreeSrbSetupModList(SRBs_SetupMod_List_t *srbSetupList)
+{
+   uint8_t srbIdx = 0;
+   
+   for(srbIdx = 0; srbIdx < srbSetupList->list.count; srbIdx++)
+      DU_FREE(srbSetupList->list.array[srbIdx], sizeof(SRBs_SetupMod_ItemIEs_t));
+   DU_FREE(srbSetupList->list.array, srbSetupList->list.size);
+}
+
+/*******************************************************************
+* @brief Free the memory allocated for UE Context Mod Response
 *
 * @details
 *
-*    Function : procF1GNBDUCfgUpdAck
+*    Function : FreeUeContextModResp 
 *
-*    Functionality: added free part for the memory allocated by aper_decoder
+*    Functionality:
+*       Free the memory allocated for UE Context Mod Response
 *
-* @params[in] F1AP_PDU_t *f1apMsg 
-* @return void 
+* @params[in] F1AP_PDU_t *f1apMsg
+* @return void
 *
 * ****************************************************************/
-uint8_t procF1GNBDUCfgUpdAck(F1AP_PDU_t *f1apMsg)
+
+void FreeUeContextModResp(F1AP_PDU_t *f1apMsg)
 {
    uint8_t ieIdx;
-   GNBDUConfigurationUpdateAcknowledge_t *gnbDuAck = NULLP;
-   
-   DU_LOG("\nINFO   -->  F1AP : GNB-DU config update acknowledgment");
-   gnbDuAck = &f1apMsg->choice.successfulOutcome->value.choice.GNBDUConfigurationUpdateAcknowledge;
-   
-   for(ieIdx=0; ieIdx < gnbDuAck->protocolIEs.list.count; ieIdx++)
+   UEContextModificationResponse_t *ueContextModifyRes = NULLP;
+   if(f1apMsg)
    {
-      switch(gnbDuAck->protocolIEs.list.array[ieIdx]->id)
+      if(f1apMsg->choice.successfulOutcome)
       {
-         case ProtocolIE_ID_id_TransactionID:
-           break;
-         case ProtocolIE_ID_id_Cells_to_be_Activated_List:
-           break;
-         default :
-            DU_LOG("\nERROR  -->  F1AP: Invalid IE Received: %ld, at procF1GNBDUCfgUpdAck()", \
-           gnbDuAck->protocolIEs.list.array[ieIdx]->id);
-           break;
+         ueContextModifyRes =&f1apMsg->choice.successfulOutcome->value.choice.UEContextModificationResponse;
+         if(ueContextModifyRes->protocolIEs.list.array)
+         {
+            for(ieIdx=0 ; ieIdx<ueContextModifyRes->protocolIEs.list.count; ieIdx++)
+            {
+               if(ueContextModifyRes->protocolIEs.list.array[ieIdx])
+               {
+                  switch(ueContextModifyRes->protocolIEs.list.array[ieIdx]->id)
+                  {
+                     case ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID:
+                        break;
+                     case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
+                        break;
+                     case ProtocolIE_ID_id_DRBs_SetupMod_List:
+                        {
+                            FreeDrbSetupModList(&(ueContextModifyRes->protocolIEs.list.array[ieIdx]->\
+                            value.choice.DRBs_SetupMod_List));
+                            break;
+                        }
+                     case ProtocolIE_ID_id_SRBs_SetupMod_List:
+                        {
+                           FreeSrbSetupModList(&(ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.choice.\
+                              SRBs_SetupMod_List));
+                           break; 
+                        }
+                  }
+                  DU_FREE(ueContextModifyRes->protocolIEs.list.array[ieIdx], sizeof(UEContextModificationResponse_t));
+               }
+
+            }
+            DU_FREE(ueContextModifyRes->protocolIEs.list.array, ueContextModifyRes->protocolIEs.list.size);
+         }
+         DU_FREE(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t));
       }
+      DU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
    }
-   duProcGnbDuCfgUpdAckMsg();
-#if 0
-   if(BuildAndSendF1ResetReq() != ROK)
-   {
-      return RFAILED;
-   }
-#endif
-
-   freeAperDecodeGnbDuAck(gnbDuAck);
-   return ROK;
 }
-/******************************************************************
+
+/*****************************************************************i
 *
-* @brief free DL RRC Message Transfer allocated by aper_decoder 
+* @brief Creating the ue context modifcation response and sending
 *
 * @details
 *
-*    Function : freeAperDecodef1DlRrcMsg 
+*    Function : BuildAndSendUeContextModRsp 
 *
-*    Functionality: free DL RRC Message Transfer allocated by aper_decoder 
+*    Functionality:
+*         - Creating the ue context modifcation response 
 *
-* @params[in] DLRRCMessageTransfer_t *f1DlRrcMsg 
+* @params[in] uint8_t cellId,uint8_t ueId
 * @return ROK     - success
 *         RFAILED - failure
 *
 * ****************************************************************/
+uint8_t BuildAndSendUeContextModRsp(DuUeCb *ueCb)
+{
+   uint8_t   ieIdx = 0, tnlIdx = 0, rbIdx = 0;
+   uint8_t   elementCnt = 0;
+   uint8_t   ret = RFAILED;
+   F1AP_PDU_t *f1apMsg = NULLP;
+   asn_enc_rval_t  encRetVal;
+   UEContextModificationResponse_t *ueContextModifyRes = NULLP;
 
-void freeAperDecodef1DlRrcMsg(DLRRCMessageTransfer_t *f1DlRrcMsg)
+   DU_LOG("\nINFO  -->  F1AP : Building UE context modification response\n");
+
+   while(1)
+   {
+      DU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t));
+      if(f1apMsg == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation for F1AP-PDU failed Ue context modification");
+         break;
+      }
+
+      f1apMsg->present =  F1AP_PDU_PR_successfulOutcome;
+
+      DU_ALLOC(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t));
+      if(f1apMsg->choice.successfulOutcome == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation for F1AP-PDU failed Ue context modification");
+         break;
+      }
+      f1apMsg->choice.successfulOutcome->procedureCode = ProcedureCode_id_UEContextModification;
+      f1apMsg->choice.successfulOutcome->criticality = Criticality_reject;
+      f1apMsg->choice.successfulOutcome->value.present = SuccessfulOutcome__value_PR_UEContextModificationResponse;
+
+      ueContextModifyRes =&f1apMsg->choice.successfulOutcome->value.choice.UEContextModificationResponse;
+  
+      if(ueCb->f1UeDb->actionType == UE_CTXT_MOD)
+      {
+         if(ueCb->f1UeDb->duUeCfg.numDrbSetupMod)
+            elementCnt =3;
+         else
+            elementCnt =2;
+      }
+      if(ueCb->f1UeDb->actionType == UE_CTXT_CFG_QUERY)
+         elementCnt = 5;
+      if(ueCb->f1UeDb->actionType == UE_CTXT_RRC_RECFG_COMPLETE)
+         elementCnt = 2;
+      ueContextModifyRes->protocolIEs.list.count = elementCnt;
+      ueContextModifyRes->protocolIEs.list.size = elementCnt*sizeof(UEContextModificationResponse_t*);
+
+      /* Initialize the UE context modification members */
+      DU_ALLOC(ueContextModifyRes->protocolIEs.list.array, ueContextModifyRes->protocolIEs.list.size);
+      if(ueContextModifyRes->protocolIEs.list.array == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation for UE context modifcation Request failed");
+         break;
+      }
+
+      for(ieIdx=0 ; ieIdx<elementCnt; ieIdx++)
+      {
+         DU_ALLOC(ueContextModifyRes->protocolIEs.list.array[ieIdx], sizeof(UEContextModificationResponse_t));
+         if(ueContextModifyRes->protocolIEs.list.array[ieIdx] == NULLP)
+         {
+            DU_LOG("\nERROR  -->  F1AP : Memory allocation for UE context modifcation Request failed");
+            break;
+         }
+      }
+
+      ieIdx=0;
+      ueContextModifyRes->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID;
+      ueContextModifyRes->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
+      ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.present =\
+      UEContextModificationResponseIEs__value_PR_GNB_CU_UE_F1AP_ID;
+      ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.choice.GNB_CU_UE_F1AP_ID = ueCb->gnbCuUeF1apId;
+
+      ieIdx++;
+      ueContextModifyRes->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID;
+      ueContextModifyRes->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
+      ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.present=\
+      UEContextModificationResponseIEs__value_PR_GNB_DU_UE_F1AP_ID;
+      ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_UE_F1AP_ID = ueCb->gnbDuUeF1apId;
+
+      if(ueCb->f1UeDb->actionType == UE_CTXT_CFG_QUERY)
+      {
+         ieIdx++;
+         ueContextModifyRes->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_DUtoCURRCInformation;
+         ueContextModifyRes->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
+         ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.present = \
+         UEContextModificationResponseIEs__value_PR_DUtoCURRCInformation;
+         BuildCellGroupConfigRrc(ueCb, &ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.choice.DUtoCURRCInformation.cellGroupConfig);
+      }
+
+      if((ueCb->f1UeDb->actionType == UE_CTXT_CFG_QUERY) || (ueCb->f1UeDb->actionType == UE_CTXT_MOD))
+      { 
+         if(ueCb->f1UeDb->duUeCfg.numDrbSetupMod)
+         {
+            ieIdx++;
+            ueContextModifyRes->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_DRBs_SetupMod_List;
+            ueContextModifyRes->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
+            ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.present =\
+                                                                              UEContextModificationResponseIEs__value_PR_DRBs_SetupMod_List;
+            if(ueCb->f1UeDb->actionType == UE_CTXT_CFG_QUERY)
+            {
+               for(tnlIdx = 0; tnlIdx < duCb.numTeId; tnlIdx++)
+               {
+                  if(duCb.upTnlCfg[tnlIdx]->ueId == ueCb->gnbDuUeF1apId)
+                  {
+                     memcpy(&ueCb->f1UeDb->duUeCfg.upTnlInfo[ueCb->f1UeDb->duUeCfg.numDrbSetupMod++], duCb.upTnlCfg[tnlIdx], sizeof(UpTnlCfg));
+                  }
+               }
+            }
+            ret = BuildDrbSetupModList(&(ueContextModifyRes->protocolIEs.list.array[ieIdx]->\
+                     value.choice.DRBs_SetupMod_List) , &ueCb->f1UeDb->duUeCfg);
+            if(ret != ROK)
+            {
+               DU_LOG( "\nERROR  -->  F1AP : Failed to build DRB setupmod List ");
+               break;
+            }
+         }
+      }
+
+      if(ueCb->f1UeDb->actionType == UE_CTXT_CFG_QUERY)
+      {
+         ieIdx++;
+         ueContextModifyRes->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_SRBs_SetupMod_List;
+         ueContextModifyRes->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
+         ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.present = \
+                                                                            UEContextModificationResponseIEs__value_PR_SRBs_SetupMod_List;
+         for(rbIdx = 0; rbIdx < ueCb->rlcUeCfg.numLcs; rbIdx++)
+         {
+            if(ueCb->rlcUeCfg.rlcLcCfg[rbIdx].rbType == RB_TYPE_SRB)
+            {
+               memcpy(&ueCb->f1UeDb->duUeCfg.rlcLcCfg[ueCb->f1UeDb->duUeCfg.numRlcLcs++], &ueCb->rlcUeCfg.rlcLcCfg[rbIdx],\
+                     sizeof(RlcBearerCfg));
+            }
+         }
+         ret = BuildSrbSetupModList(&ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.choice.SRBs_SetupMod_List, \
+               &ueCb->f1UeDb->duUeCfg);
+         if(ret != ROK)
+         {
+            DU_LOG( "\nERROR  -->  F1AP : Failed to build SRB setupmod List ");
+            break;
+         }
+      }
+
+      freeF1UeDb(ueCb->f1UeDb);
+      ueCb->f1UeDb = NULLP;
+
+      xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
+
+      /* Encode the F1SetupRequest type as APER */
+      memset(encBuf, 0, ENC_BUF_MAX_LEN);
+      encBufSize = 0;
+      encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,encBuf);
+
+      /* Encode results */
+      if(encRetVal.encoded == ENCODE_FAIL)
+      {
+         DU_LOG( "\nERROR  -->  F1AP : Could not encode UE Context Setup Request structure (at %s)\n",\
+               encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+         ret = RFAILED;
+         break;
+      }
+      else
+      {
+         DU_LOG("\nDEBUG   -->  F1AP : Created APER encoded buffer for UE Context Modification Response\n");
+         for(int i=0; i< encBufSize; i++)
+         {
+            printf("%x",encBuf[i]);
+         }
+      }
+
+      /* Sending  msg  */
+      if(sendF1APMsg() != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Sending UE Context Setup Res Failed");
+         ret = RFAILED;
+         break;
+      }
+
+      ret = ROK;
+      break;
+   }
+   FreeUeContextModResp(f1apMsg);
+   return ret;
+}
+/*******************************************************************
+ *
+ * @brief Deallocating the memory allocated by the aper decoder
+ *          for QOSInfo
+ *
+ * @details
+ *
+ *    Function : freeAperDecodeQosInfo
+ *
+ *    Functionality:  Deallocating the memory allocated for QOSInfo
+ *
+ * @params[in] QoSFlowLevelQoSParameters_t *drbQos
+ *
+ * @return void
+ *
+ * ****************************************************************/
+
+void freeAperDecodeQosInfo(QoSFlowLevelQoSParameters_t *drbQos)
+{
+   if(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI != NULLP)
+   {
+      if(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow!=NULLP)
+      {
+         if(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume!=NULLP)
+         {
+            free(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume);
+         }
+         free(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow);
+      }
+      free(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI);
+   }
+}
+/*******************************************************************
+ *
+ * @brief Deallocating the memory allocated by the aper decoder
+ *          for UlTnlInfoforDrb
+ *
+ * @details
+ *
+ *    Function : freeAperDecodeUlTnlInfoforDrbSetupMod 
+ *
+ *    Functionality:  Deallocating memory allocated for UlTnlInfoforDrb
+ *
+ * @params[in] ULUPTNLInformation_ToBeSetup_List_t *ulInfo
+ *
+ * @return void
+ *
+ * ****************************************************************/
+void freeAperDecodeUlTnlInfoforDrbSetupMod(ULUPTNLInformation_ToBeSetup_List_t *ulInfo)
 {
-   uint8_t ieIdx =0;
-   RRCContainer_t *rrcContainer = NULLP;
+   uint8_t arrIdx =0;
 
-   if(f1DlRrcMsg->protocolIEs.list.array)
+   if(ulInfo->list.array)
    {
-      for(ieIdx=0; ieIdx<f1DlRrcMsg->protocolIEs.list.count; ieIdx++)
+      for(arrIdx=0; arrIdx<ulInfo->list.count ; arrIdx++)
       {
-        if(f1DlRrcMsg->protocolIEs.list.array[ieIdx])
-        {
-           switch(f1DlRrcMsg->protocolIEs.list.array[ieIdx]->id)
-           {
-              case ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID:
-                 break;
-              case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
-                 break;
-              case ProtocolIE_ID_id_SRBID:
-                 break;
-              case ProtocolIE_ID_id_RRCContainer:
-                 {
-                    rrcContainer =&f1DlRrcMsg->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer;
-                    free(rrcContainer->buf);
-                 }
-              case ProtocolIE_ID_id_ExecuteDuplication:
-                 break;
-              case ProtocolIE_ID_id_RRCDeliveryStatusRequest:
-                 break;
-                 break;
-           }
-           free(f1DlRrcMsg->protocolIEs.list.array[ieIdx]);
-        }
+         if(ulInfo->list.array[arrIdx])
+         {
+            if(ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel )
+            {
+               if(ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf)
+               {
+                  if(ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf)
+                  {
+                     free(ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->\
+                           gTP_TEID.buf);
+                  }
+                  free(ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->\
+                        transportLayerAddress.buf);
+               }
+               free(ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel);
+            }
+            free(ulInfo->list.array[arrIdx]);
+         }
       }
-      free(f1DlRrcMsg->protocolIEs.list.array);
+      free(ulInfo->list.array);
    }
 }
-/******************************************************************
+/*******************************************************************
  *
- * @brief Processes DL RRC Message Transfer  sent by CU
+ * @brief Deallocating the memory allocated by the aper decoder
+ *          for DrbSetupModItem  
  *
  * @details
  *
- *    Function : procF1DlRrcMsgTrans
+ *    Function : freeAperDecodeDrbSetupModItem 
  *
- *    Functionality: Processes DL RRC Message Transfer sent by CU
+ *    Functionality:  Deallocating memory allocated for DrbSetupModItem
  *
- * @params[in] F1AP_PDU_t ASN decoded F1AP message
- * @return ROK     - success
- *         RFAILED - failure
+ * @params[in] DRBs_ToBeSetupMod_Item_t *drbItem
+ *
+ * @return void
  *
  * ****************************************************************/
-uint8_t procF1DlRrcMsgTrans(F1AP_PDU_t *f1apMsg)
+
+void freeAperDecodeDrbSetupModItem(DRBs_ToBeSetupMod_Item_t *drbItem)
 {
-   uint8_t  idx, ret;
-   DLRRCMessageTransfer_t *f1DlRrcMsg = NULLP;
-   F1DlRrcMsg dlMsg;
-   memset(&dlMsg, 0, sizeof(F1DlRrcMsg));
+   uint8_t arrIdx =0;
+   SNSSAI_t *snssai =NULLP;
+   Flows_Mapped_To_DRB_List_t *flowMap = NULLP;
 
-   DU_LOG("\nINFO   -->  DU_APP : DL RRC message transfer Recevied");
-   f1DlRrcMsg = &f1apMsg->choice.initiatingMessage->value.choice.DLRRCMessageTransfer;
+   drbItem->qoSInformation.present = QoSInformation_PR_choice_extension;
+   switch(drbItem->qoSInformation.present)
+   {
+      case QoSInformation_PR_NOTHING:
+         break;
+      case QoSInformation_PR_eUTRANQoS:
+         {
+            if(drbItem->qoSInformation.choice.eUTRANQoS)
+            {
+               free(drbItem->qoSInformation.choice.eUTRANQoS);
+            }
+            break;
+         }
+      case QoSInformation_PR_choice_extension:
+         {
+            if(drbItem->qoSInformation.choice.choice_extension)
+            {
+               freeAperDecodeQosInfo(&drbItem->qoSInformation.choice.choice_extension->value.choice.\
+                     DRB_Information.dRB_QoS);
+               snssai = &drbItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.sNSSAI;
+               if(snssai->sST.buf)
+               {
+                  free(snssai->sST.buf);
+               }
+               if(snssai->sD)
+               {
+                  if(snssai->sD->buf)
+                  {
+                     free(snssai->sD->buf);
+                  }
+                  free(snssai->sD);
+               }
 
-   ret = ROK;
+               flowMap = &drbItem->qoSInformation.choice.choice_extension->value.choice.\
+                         DRB_Information.flows_Mapped_To_DRB_List;
+               if(flowMap->list.array)
+               {
+                  for(arrIdx=0; arrIdx<flowMap->list.count; arrIdx++)
+                  {
+                     if(flowMap->list.array[arrIdx] )
+                     {
+                        freeAperDecodeQosInfo(&flowMap->list.array[arrIdx]->qoSFlowLevelQoSParameters);
+                        free(flowMap->list.array[arrIdx]);
+                     }
+                  }
+                  free(flowMap->list.array);
+               }
 
-   for(idx=0; idx<f1DlRrcMsg->protocolIEs.list.count; idx++)
+               free(drbItem->qoSInformation.choice.choice_extension);
+            }
+            break;
+         }
+
+   }
+   freeAperDecodeUlTnlInfoforDrbSetupMod(&drbItem->uLUPTNLInformation_ToBeSetup_List);
+   if(drbItem->uLConfiguration)
    {
-      switch(f1DlRrcMsg->protocolIEs.list.array[idx]->id)
+      free(drbItem->uLConfiguration);
+   }
+}
+
+/*******************************************************************
+ *
+ * @brief Deallocating the memory allocated by the aper decoder
+ *          for DrbToBeSetupModList
+ *
+ * @details
+ *
+ *    Function : freeAperDecodeDrbToBeSetupModList
+ *
+ *    Functionality:  Deallocating memory allocated for DrbToBeSetupModList
+ *
+ * @params[in] DRBs_ToBeSetupMod_List_t *drbSet
+ *
+ * @return void
+ *
+ * ****************************************************************/
+
+void freeAperDecodeDrbToBeSetupModList(DRBs_ToBeSetupMod_List_t *drbSet)
+{
+   uint8_t arrIdx =0;
+   struct DRBs_ToBeSetupMod_ItemIEs *drbItemIe;
+
+   if(drbSet->list.array)
+   {
+      for(arrIdx=0; arrIdx<drbSet->list.count ; arrIdx++)
       {
-        case ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID:
-           {
-              dlMsg.gnbCuUeF1apId = f1DlRrcMsg->protocolIEs.list.array[idx]->value.choice.GNB_CU_UE_F1AP_ID;
-              break;
-           }
-        case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
-           {
-              dlMsg.gnbDuUeF1apId = f1DlRrcMsg->protocolIEs.list.array[idx]->value.choice.GNB_DU_UE_F1AP_ID;
-              break;
-           }
-        case ProtocolIE_ID_id_SRBID:
-           {
-              dlMsg.srbId = f1DlRrcMsg->protocolIEs.list.array[idx]->value.choice.SRBID;
-              break;
-           }
-        case ProtocolIE_ID_id_ExecuteDuplication:
-           dlMsg.execDup = true;
-           break;
+         if(drbSet->list.array[arrIdx] != NULLP)
+         {
+            if(arrIdx == 0)
+            {
+               drbItemIe = (DRBs_ToBeSetupMod_ItemIEs_t *)drbSet->list.array[arrIdx];
+               freeAperDecodeDrbSetupModItem(&(drbItemIe->value.choice.DRBs_ToBeSetupMod_Item));
+            }
+            free(drbSet->list.array[arrIdx]);
+         }
+      }
+      free(drbSet->list.array);
+   }
 
-        case ProtocolIE_ID_id_RRCContainer:
-           {
-              if(f1DlRrcMsg->protocolIEs.list.array[idx]->value.choice.RRCContainer.size > 0)
-              {
-                 dlMsg.rrcMsgSize = f1DlRrcMsg->protocolIEs.list.array[idx]->value.choice.RRCContainer.size;
-                 DU_ALLOC(dlMsg.rrcMsgPdu, dlMsg.rrcMsgSize);
-                 if(dlMsg.rrcMsgPdu)
-                 {
-                    memcpy(dlMsg.rrcMsgPdu, f1DlRrcMsg->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf,\
-                       dlMsg.rrcMsgSize);
-                 }
-                 else
-                 {
-                    DU_LOG("\nERROR  -->  DU APP : Memory alloc Failed at RRC Container at procF1DlRrcMsgTrans()");
-                     return RFAILED;
-                 }
-              }
-              else
-              {
-                 DU_LOG("\nERROR  -->  DU_APP : RRC Container Size is invalid:%ld",\
-                 f1DlRrcMsg->protocolIEs.list.array[idx]->value.choice.RRCContainer.size);
-                 return RFAILED;
-              }
-              break;
-           }
-         case ProtocolIE_ID_id_RRCDeliveryStatusRequest:
-           {
-              dlMsg.deliveryStatRpt = true;
-              break;
-           }
-        default:
-           DU_LOG("\nERROR  -->  DU_APP : Invalid IE received in DL RRC Msg Transfer:%ld",
-                 f1DlRrcMsg->protocolIEs.list.array[idx]->id);
+}
+/*******************************************************************
+ *
+ * @brief Deallocating the memory allocated by the aper decoder
+ *          for UeContextModificationReqMsg
+ *
+ * @details
+ *
+ *    Function : freeAperDecodeUeContextModificationReqMsg
+ *
+ *    Functionality:  Deallocating memory allocated for
+ *                  UeContextModificationReqMsg
+ *
+ * @params[in] UEContextModificationRequest_t *UeContextModifyReq
+ *
+ * @return void
+ *
+ * ****************************************************************/
+void freeAperDecodeUeContextModificationReqMsg(UEContextModificationRequest_t *ueContextModifyReq )
+{
+   uint8_t arrIdx, ieId;
+
+   if(ueContextModifyReq->protocolIEs.list.array)
+   {
+      for( arrIdx = 0 ; arrIdx<ueContextModifyReq->protocolIEs.list.count ; arrIdx++)
+      {
+         if(ueContextModifyReq->protocolIEs.list.array[arrIdx])
+         {
+            ieId = ueContextModifyReq->protocolIEs.list.array[arrIdx]->id;
+            switch(ieId)
+            {
+               case ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID:
+                  break;
+               case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
+                  break;
+               case ProtocolIE_ID_id_DRBs_ToBeSetupMod_List:
+                  {
+                     freeAperDecodeDrbToBeSetupModList(&ueContextModifyReq->protocolIEs.list.array[arrIdx]->\
+                           value.choice.DRBs_ToBeSetupMod_List);
+                     break;
+                  }
+               case ProtocolIE_ID_id_TransmissionActionIndicator:
+                  break;
+               case ProtocolIE_ID_id_RRCContainer:
+                  {
+                     free(ueContextModifyReq->protocolIEs.list.array[arrIdx]->value.choice.RRCContainer.buf);
+                  }
+            }
+            free(ueContextModifyReq->protocolIEs.list.array[arrIdx]);
+         }
       }
+      free(ueContextModifyReq->protocolIEs.list.array);
    }
-
-   ret = duProcDlRrcMsg(&dlMsg);
-
-   freeAperDecodef1DlRrcMsg(f1DlRrcMsg);
-   return ret;
 }
 /*******************************************************************
  *
-* @brief Builds the DRB to be Setup Mod list
-*
-* @details
-*
-*    Function : 
-*
-*    Functionality: Constructs the DRB to be Setup Mod list
-*
-* @params[in] DRBs_SetupMod_List_t *drbSet
-*
-* @return ROK     - success
-*         RFAILED - failure
-*
-* ****************************************************************/
-
-uint8_t BuildDrbSetupModList(DRBs_SetupMod_List_t *drbSet , DuUeCfg *ueCfg)
+ * @brief processing the F1 UeContextModificationReq
+ *
+ * @details
+ *
+ *    Function : procF1UeContextModificationReq
+ *
+ *    Functionality:  processing the F1 UeContextModificationReq
+ *
+ * @params[in] F1AP_PDU_t *f1apMsg
+ *
+ * @return
+ * ****************************************************************/
+uint8_t procF1UeContextModificationReq(F1AP_PDU_t *f1apMsg)
 {
-   uint8_t arrIdx =0;
-   uint8_t drbCnt =0;
-   struct DRBs_SetupMod_ItemIEs *drbItemIe;
+   UEContextModificationRequest_t *ueContextModifyReq = NULLP;
+   uint8_t  ret = ROK, ieIdx = 0, cellIdx=0;
+   DuUeCb   *duUeCb = NULLP;
+   DRBs_ToBeSetupMod_List_t *drbSetupModCfg;
+   DRBs_ToBeModified_List_t *drbModifiedCfg;
+   uint32_t gnbCuUeF1apId, gnbDuUeF1apId;
 
-   drbCnt = 1;
-   drbSet->list.count = drbCnt;
-   drbSet->list.size = drbCnt * sizeof(DRBs_SetupMod_ItemIEs_t *);
-   DU_ALLOC(drbSet->list.array, drbSet->list.size);
-   if(drbSet->list.array == NULLP)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDrbToBeSetupModList");
-      return  RFAILED;
-   }
-   for(arrIdx=0; arrIdx<drbCnt; arrIdx++)
+   ueContextModifyReq = &f1apMsg->choice.initiatingMessage->value.choice.UEContextModificationRequest;
+   for(ieIdx=0; (ieIdx < ueContextModifyReq->protocolIEs.list.count && ret == ROK); ieIdx++)
    {
-      DU_ALLOC(drbSet->list.array[arrIdx], sizeof(DRBs_SetupMod_ItemIEs_t));
-      if(drbSet->list.array[arrIdx] == NULLP)
+      switch(ueContextModifyReq->protocolIEs.list.array[ieIdx]->id)
       {
-             DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDrbToBeSetupModList");
-             return  RFAILED;
-      }
+         case ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID:
+            {
+               gnbCuUeF1apId = ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.choice.GNB_CU_UE_F1AP_ID;
+               break;
+            }
+         case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
+            {
+               gnbDuUeF1apId = ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_UE_F1AP_ID;
+               for(cellIdx = 0; cellIdx < MAX_NUM_CELL; cellIdx++)
+               {
+                  if(duCb.actvCellLst[cellIdx])
+                  {
+                     if((duCb.actvCellLst[cellIdx]->ueCb[gnbDuUeF1apId-1].gnbDuUeF1apId == gnbDuUeF1apId)&&\
+                           (duCb.actvCellLst[cellIdx]->ueCb[gnbDuUeF1apId-1].gnbCuUeF1apId == gnbCuUeF1apId))
+                     {
+                        duUeCb = &duCb.actvCellLst[cellIdx]->ueCb[gnbDuUeF1apId-1];
+                        if(duUeCb->f1UeDb == NULLP)
+                        {
+                           DU_ALLOC(duUeCb->f1UeDb, sizeof(F1UeContextSetupDb));
+                           duUeCb->f1UeDb->cellIdx = cellIdx;
+                           duUeCb->f1UeDb->actionType = UE_CTXT_MOD;
+                        }
+                        break;
+                     }
+                  }
+               }
+               if(duUeCb == NULLP)
+               {
+                  DU_LOG("\nERROR  -->  DU APP : wrong values of gnbCuUeF1apId and gnbDuUeF1apId ");
+                  ret = RFAILED;
+               }
+               break;
+            }
 
-      drbItemIe = (struct DRBs_SetupMod_ItemIEs *)drbSet->list.array[arrIdx];
-      drbItemIe->id = ProtocolIE_ID_id_DRBs_SetupMod_Item;
-      drbItemIe->criticality = Criticality_reject;
-      drbItemIe->value.present = DRBs_SetupMod_ItemIEs__value_PR_DRBs_SetupMod_Item;
-      drbItemIe->value.choice.DRBs_SetupMod_Item.dRBID = ueCfg->upTnlInfo[arrIdx].drbId;
-      if(fillDlTnlSetupList(&drbItemIe->value.choice.DRBs_SetupMod_Item.dLUPTNLInformation_ToBeSetup_List,\
-      &ueCfg->upTnlInfo[arrIdx])!= ROK)
-      {
-         DU_LOG("\nERROR  -->  F1AP : Failed to fill DlTnl SetupList in BuildDrbToBeSetupModList");
-         return RFAILED;
+         case ProtocolIE_ID_id_RRCContainer:
+            {
+               /* Filling Dl RRC Msg Info */
+               DU_ALLOC_SHRABL_BUF(duUeCb->f1UeDb->dlRrcMsg, sizeof(F1DlRrcMsg));
+               if(!duUeCb->f1UeDb->dlRrcMsg)
+               {
+                  DU_LOG("\nERROR  -->  DU APP : procF1UeContextReleaseCommand(): \
+                        Memory allocation failed ");
+                  ret = RFAILED;
+               }
+               else
+               {
+                  duUeCb->f1UeDb->dlRrcMsgPres = true;
+                  memset(duUeCb->f1UeDb->dlRrcMsg, 0, sizeof(F1DlRrcMsg));
+                  ret = extractDlRrcMsg(gnbDuUeF1apId, gnbCuUeF1apId, duUeCb->f1UeDb->dlRrcMsg,\
+                        &ueContextModifyReq->protocolIEs.list.array[ieIdx]->\
+                        value.choice.RRCContainer);
+               }
+
+               break;
+            }
+
+         case ProtocolIE_ID_id_DRBs_ToBeSetupMod_List:
+         case ProtocolIE_ID_id_DRBs_ToBeModified_List:
+            {
+               if(duUeCb->f1UeDb)
+               {
+                  if(ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.present ==\
+                        UEContextModificationRequestIEs__value_PR_DRBs_ToBeSetupMod_List)
+                  {
+                     drbSetupModCfg = &ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.\
+                                      choice.DRBs_ToBeSetupMod_List;
+
+                     if(extractDrbListToSetupMod(NULL, drbSetupModCfg, NULL, drbSetupModCfg->list.count,\
+                              &duUeCb->f1UeDb->duUeCfg, &duUeCb->drbBitMap, NULL))
+                     {
+                        DU_LOG("\nERROR  -->  DU APP : Failed at extractDrbListToSetupMod() for DrbSetupModList");
+                        ret = RFAILED;
+                     }
+                  }
+
+                  if(ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.present == \
+                        UEContextModificationRequestIEs__value_PR_DRBs_ToBeModified_List)
+
+                  {
+                     drbModifiedCfg = &ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.\
+                                      choice.DRBs_ToBeModified_List;
+                     if(extractDrbListToSetupMod(NULL, NULL, drbModifiedCfg, drbModifiedCfg->list.count,\
+                              &duUeCb->f1UeDb->duUeCfg, &duUeCb->drbBitMap, &duUeCb->rlcUeCfg))
+                     {
+                        DU_LOG("\nERROR  -->  DU APP : Failed at extractDrbListToSetupMod() for DrbModifiedList");
+                        ret = RFAILED;
+                     }
+                  }
+               }
+               break;
+            }
+
+         case ProtocolIE_ID_id_GNB_DUConfigurationQuery:
+            {
+               DU_LOG("\nINFO  -->  DU APP : Received GNB DU Configuration Query in UE Context Modification Request from CU");
+               if(duUeCb->f1UeDb)
+               {
+                  duUeCb->f1UeDb->actionType = UE_CTXT_CFG_QUERY;
+               }
+               break;
+            }
+
+         case ProtocolIE_ID_id_RRCReconfigurationCompleteIndicator:
+            {
+               if(ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.choice.RRCReconfigurationCompleteIndicator == \
+                  RRCReconfigurationCompleteIndicator_true)
+               {
+                  duUeCb->f1UeDb->actionType = UE_CTXT_RRC_RECFG_COMPLETE;
+               }
+               break;
+            }
+         case ProtocolIE_ID_id_TransmissionActionIndicator:
+            {
+               if(duUeCb->f1UeDb)
+               {
+                  if(ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.choice.TransmissionActionIndicator  == TransmissionActionIndicator_stop)
+                  {
+                     duUeCb->f1UeDb->duUeCfg.dataTransmissionAction = STOP_TRANSMISSION; 
+                  }
+                  else 
+                  {
+                     duUeCb->f1UeDb->duUeCfg.dataTransmissionAction = RESTART_TRANSMISSION; 
+                  }
+               }
+               break;
+            }
+
+         case ProtocolIE_ID_id_RRCDeliveryStatusRequest:
+            {
+               if(duUeCb->f1UeDb->dlRrcMsg->rrcMsgPdu)
+               {
+                  duUeCb->f1UeDb->dlRrcMsg->deliveryStatRpt = true;
+               }
+               break;
+            }
+              
       }
-      
    }
 
-   return ROK;
-}
-/*******************************************************************
-* @brief Free the memory allocated for DRB setup List
-*
-* @details
-*
-*    Function : FreeDrbSetupModList 
-*
-*    Functionality:
-*       Free the memory allocated for DRB setup list
-*
-* @params[in] DRBs_Setup_List_t *
-* @return void
-*
-* ****************************************************************/
-void FreeDrbSetupModList(DRBs_SetupMod_List_t *drbSetupList)
-{
-   uint8_t arrIdx = 0;
-   DRBs_SetupMod_ItemIEs_t *drbItemIe = NULLP;
-
-   for(arrIdx = 0; arrIdx < drbSetupList->list.count; arrIdx++)
+   if(ret != RFAILED) 
    {
-      drbItemIe = ((DRBs_SetupMod_ItemIEs_t *)drbSetupList->list.array[arrIdx]);
-      freeDlTnlInfo(&drbItemIe->value.choice.DRBs_SetupMod_Item.dLUPTNLInformation_ToBeSetup_List);
+      ret = duProcUeContextModReq(duUeCb);
    }
+   freeAperDecodeUeContextModificationReqMsg(ueContextModifyReq);
+   return ret; 
 }
-/*******************************************************************
-* @brief Free the memory allocated for UE Context Mod Response
+
+/*****************************************************************i
+*
+* @brief Free memory allocated for UE Context Release Request
 *
 * @details
 *
-*    Function : FreeUeContextModResp 
+*    Function : FreeUeContextReleaseReq
 *
 *    Functionality:
-*       Free the memory allocated for UE Context Mod Response
+*         - Free memory allocated for UE Context Release Request
 *
 * @params[in] F1AP_PDU_t *f1apMsg
-* @return void
+* @return void 
 *
-* ****************************************************************/
-
-void FreeUeContextModResp(F1AP_PDU_t *f1apMsg)
+* *************************************************************/
+void FreeUeContextReleaseReq(F1AP_PDU_t *f1apMsg)
 {
    uint8_t ieIdx;
-   UEContextModificationResponse_t *ueContextModifyRes = NULLP;
+   UEContextReleaseRequest_t *ueReleaseReq = NULLP;
+   
    if(f1apMsg)
    {
-      if(f1apMsg->choice.successfulOutcome)
+      if(f1apMsg->choice.initiatingMessage)
       {
-         ueContextModifyRes =&f1apMsg->choice.successfulOutcome->value.choice.UEContextModificationResponse;
-         if(ueContextModifyRes->protocolIEs.list.array)
+         ueReleaseReq =&f1apMsg->choice.initiatingMessage->value.choice.UEContextReleaseRequest;
+         if(ueReleaseReq->protocolIEs.list.array)
          {
-            for(ieIdx=0 ; ieIdx<ueContextModifyRes->protocolIEs.list.count; ieIdx++)
+            for(ieIdx=0 ; ieIdx<ueReleaseReq->protocolIEs.list.count; ieIdx++)
             {
-               if(ueContextModifyRes->protocolIEs.list.array[ieIdx])
-               {
-                  switch(ueContextModifyRes->protocolIEs.list.array[ieIdx]->id)
-                  {
-                     case ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID:
-                        break;
-                     case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
-                        break;
-                     case ProtocolIE_ID_id_DRBs_SetupMod_List:
-                        {
-                            FreeDrbSetupModList(&(ueContextModifyRes->protocolIEs.list.array[ieIdx]->\
-                            value.choice.DRBs_SetupMod_List));
-                            break; 
-                        }
-                  }
-                  DU_FREE(ueContextModifyRes->protocolIEs.list.array[ieIdx], sizeof(UEContextModificationResponse_t));
-               }
-
+               DU_FREE(ueReleaseReq->protocolIEs.list.array[ieIdx], sizeof(UEContextReleaseRequest_t));
             }
-            DU_FREE(ueContextModifyRes->protocolIEs.list.array, ueContextModifyRes->protocolIEs.list.size);
+            DU_FREE(ueReleaseReq->protocolIEs.list.array, ueReleaseReq->protocolIEs.list.size);
          }
-         DU_FREE(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t));
+         DU_FREE(f1apMsg->choice.initiatingMessage, sizeof(InitiatingMessage_t));
       }
       DU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
    }
-}
 
+}
 /*****************************************************************i
 *
-* @brief Creating the ue context modifcation response and sending
+* @brief Build and Send UE Context Release Request  
 *
 * @details
 *
-*    Function : BuildAndSendUeContextModResp 
+*    Function : BuildAndSendUeContextReleaseReq
 *
 *    Functionality:
-*         - Creating the ue context modifcation response 
+*         - Build and Send UE Context Release Request 
 *
 * @params[in]
 * @return ROK     - success
 *         RFAILED - failure
 *
-* ****************************************************************/
-uint8_t BuildAndSendUeContextModResp(uint8_t ueIdx, uint8_t cellId)
+* *************************************************************/
+uint8_t BuildAndSendUeContextReleaseReq(uint16_t cellId, uint8_t ueId)
 {
-   uint8_t   ieIdx = 0;
-   uint8_t   cellIdx =0;
-   uint8_t   elementCnt = 0;
-   uint8_t   ret = RFAILED;
-   uint32_t  gnbCuUeF1apId;   /* gNB-CU UE F1AP Id */
-   uint32_t  gnbDuUeF1apId;   /* gNB-DU UE F1AP Id */
+   bool memAllocFail = false;
+   uint8_t ieIdx =0;
+   uint8_t ret = RFAILED;
+   uint16_t cellIdx =0;
+   uint16_t crnti = 0;
+   uint8_t  elementCnt = 0;
+   uint32_t  gnbCuUeF1apId =0;   /* gNB-CU UE F1AP Id */
+   uint32_t  gnbDuUeF1apId =0;   /* gNB-DU UE F1AP Id */
+   asn_enc_rval_t encRetVal; 
    F1AP_PDU_t *f1apMsg = NULLP;
-   asn_enc_rval_t         encRetVal;
-   UEContextModificationResponse_t *ueContextModifyRes = NULLP;
-   DuUeCb                   *ueCb = NULLP;
+   UEContextReleaseRequest_t *ueReleaseReq = NULLP;
 
-   DU_LOG("\nINFO  -->  F1AP : Building Ue context modification response\n");
-
-   while(1)
+   DU_LOG("\nINFO  --> Building the UE Context Release Request");
+   do
    {
       DU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t));
       if(f1apMsg == NULLP)
       {
-         DU_LOG("\nERROR  -->  F1AP : Memory allocation for F1AP-PDU failed Ue context modification");
+         DU_LOG("\nERROR  -->  F1AP : BuildAndSendUeContextReleaseReq(): Memory allocation failed for f1apMsg");
          break;
       }
 
-      f1apMsg->present =  F1AP_PDU_PR_successfulOutcome;
-
-      DU_ALLOC(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t));
-      if(f1apMsg->choice.successfulOutcome == NULLP)
+      f1apMsg->present = F1AP_PDU_PR_initiatingMessage;
+      DU_ALLOC(f1apMsg->choice.initiatingMessage, sizeof(InitiatingMessage_t));
+      if(f1apMsg->choice.initiatingMessage == NULLP)
       {
-         DU_LOG("\nERROR  -->  F1AP : Memory allocation for F1AP-PDU failed Ue context modification");
+         DU_LOG("\nERROR  -->  F1AP : BuildAndSendUeContextReleaseReq(): Memory allocation failed for\
+         initiatingMessage");   
          break;
       }
-      f1apMsg->choice.successfulOutcome->procedureCode = ProcedureCode_id_UEContextModification;
-      f1apMsg->choice.successfulOutcome->criticality = Criticality_reject;
-      f1apMsg->choice.successfulOutcome->value.present = SuccessfulOutcome__value_PR_UEContextModificationResponse;
+      f1apMsg->choice.initiatingMessage->procedureCode = ProcedureCode_id_UEContextReleaseRequest;
+      f1apMsg->choice.initiatingMessage->criticality = Criticality_reject;
+      f1apMsg->choice.initiatingMessage->value.present = \
+      InitiatingMessage__value_PR_UEContextReleaseRequest;
 
-      ueContextModifyRes =&f1apMsg->choice.successfulOutcome->value.choice.UEContextModificationResponse;
+      ueReleaseReq = &f1apMsg->choice.initiatingMessage->value.choice.UEContextReleaseRequest;
 
-      elementCnt = 3;
-      ueContextModifyRes->protocolIEs.list.count = elementCnt;
-      ueContextModifyRes->protocolIEs.list.size = elementCnt*sizeof(UEContextModificationResponse_t*);
+      elementCnt = 2;
 
-      /* Initialize the UE context modification members */
-      DU_ALLOC(ueContextModifyRes->protocolIEs.list.array, ueContextModifyRes->protocolIEs.list.size);
-      if(ueContextModifyRes->protocolIEs.list.array == NULLP)
+      ueReleaseReq->protocolIEs.list.count = elementCnt;
+      ueReleaseReq->protocolIEs.list.size = elementCnt * sizeof(UEContextReleaseRequest_t *);
+
+      /* Initialize the F1Setup members */
+      DU_ALLOC(ueReleaseReq->protocolIEs.list.array,ueReleaseReq->protocolIEs.list.size);
+      if(ueReleaseReq->protocolIEs.list.array == NULLP)
       {
-         DU_LOG("\nERROR  -->  F1AP : Memory allocation for UE context modifcation Request failed");
+         DU_LOG("\nERROR  -->  F1AP : BuildAndSendUeContextReleaseReq(): Memory allocation failed for IE array");
          break;
       }
-
-      for(ieIdx=0 ; ieIdx<elementCnt; ieIdx++)
+      for(ieIdx=0; ieIdx<elementCnt; ieIdx++)
       {
-         DU_ALLOC(ueContextModifyRes->protocolIEs.list.array[ieIdx], sizeof(UEContextModificationResponse_t));
-         if(ueContextModifyRes->protocolIEs.list.array[ieIdx] == NULLP)
+         DU_ALLOC(ueReleaseReq->protocolIEs.list.array[ieIdx],\
+               sizeof(UEContextReleaseRequest_t));
+         if(ueReleaseReq->protocolIEs.list.array[ieIdx] == NULLP)
          {
-            DU_LOG("\nERROR  -->  F1AP : Memory allocation for UE context modifcation Request failed");
+            DU_LOG("\nERROR  -->  F1AP : BuildAndSendUeContextReleaseReq(): Memory allocation failed for IE elements");
+            memAllocFail = true;  
             break;
          }
       }
+      if(memAllocFail == true)
+         break;
 
       /* Fetching Ue Cb Info*/
       GET_CELL_IDX(cellId, cellIdx);
-      gnbDuUeF1apId = duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].gnbDuUeF1apId;
-      gnbCuUeF1apId = duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].gnbCuUeF1apId;
-      ueCb = &duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1];
-
-      ieIdx=0;
-      ueContextModifyRes->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID;
-      ueContextModifyRes->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
-      ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.present =\
-      UEContextModificationResponseIEs__value_PR_GNB_CU_UE_F1AP_ID;
-      ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.choice.GNB_CU_UE_F1AP_ID = gnbCuUeF1apId;
-
-      ieIdx++;
-      ueContextModifyRes->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID;
-      ueContextModifyRes->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
-      ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.present=\
-      UEContextModificationResponseIEs__value_PR_GNB_DU_UE_F1AP_ID;
-      ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_UE_F1AP_ID = gnbDuUeF1apId;
-
-      ieIdx++;
-      ueContextModifyRes->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_DRBs_SetupMod_List;
-      ueContextModifyRes->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
-      ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.present =\
-      UEContextModificationResponseIEs__value_PR_DRBs_SetupMod_List;
-      if(ueCb->f1UeDb)
+      if(duCb.actvCellLst[cellIdx] == NULLP)
       {
-         ret = BuildDrbSetupModList(&(ueContextModifyRes->protocolIEs.list.array[ieIdx]->\
-                  value.choice.DRBs_SetupMod_List) , &ueCb->f1UeDb->duUeCfg);
-         if(ret != ROK)
+         DU_LOG("\nERROR  -->  F1AP : BuildAndSendUeContextReleaseReq(): CellId[%d] does not exist", cellId);
+         break;
+      }
+      else
+      {
+         GET_CRNTI(crnti, ueId);
+         if(duCb.actvCellLst[cellIdx]->ueCb[ueId-1].crnti != crnti)
          {
-            DU_LOG( "\nERROR  -->  F1AP : Failed to build drb setupmod List ");
+            DU_LOG("\nERROR  -->  F1AP : BuildAndSendUeContextReleaseReq(): crnti[%d] does not exist", crnti);
             break;
          }
-         freeF1UeDb(ueCb->f1UeDb);
-         ueCb->f1UeDb = NULLP;
+         gnbDuUeF1apId = duCb.actvCellLst[cellIdx]->ueCb[ueId-1].gnbDuUeF1apId;
+         gnbCuUeF1apId = duCb.actvCellLst[cellIdx]->ueCb[ueId-1].gnbCuUeF1apId;
       }
+
+      ieIdx=0; 
+      ueReleaseReq->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID; 
+      ueReleaseReq->protocolIEs.list.array[ieIdx]->criticality= Criticality_reject;
+      ueReleaseReq->protocolIEs.list.array[ieIdx]->value.present = \
+      UEContextReleaseRequestIEs__value_PR_GNB_CU_UE_F1AP_ID;
+      ueReleaseReq->protocolIEs.list.array[ieIdx]->value.choice.GNB_CU_UE_F1AP_ID =gnbCuUeF1apId;
+      
+      ieIdx++;
+      ueReleaseReq->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID;
+      ueReleaseReq->protocolIEs.list.array[ieIdx]->criticality= Criticality_reject;
+      ueReleaseReq->protocolIEs.list.array[ieIdx]->value.present =\
+      UEContextReleaseRequestIEs__value_PR_GNB_DU_UE_F1AP_ID;
+      ueReleaseReq->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_UE_F1AP_ID =gnbDuUeF1apId;
+      
       xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
 
       /* Encode the F1SetupRequest type as APER */
       memset(encBuf, 0, ENC_BUF_MAX_LEN);
       encBufSize = 0;
-      encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,encBuf);
-
+      encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf, encBuf);
       /* Encode results */
-      if(encRetVal.encoded == ENCODE_FAIL)
-      {
-         DU_LOG( "\nERROR  -->  F1AP : Could not encode UE Context Setup Request structure (at %s)\n",\
-               encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
-         ret = RFAILED;
-         break;
-      }
-      else
-      {
-         DU_LOG("\nDEBUG   -->  F1AP : Created APER encoded buffer for UE Context Modification Response\n");
-         for(int i=0; i< encBufSize; i++)
-         {
-            printf("%x",encBuf[i]);
-         }
-      }
-
-      /* Sending  msg  */
-      if(SendF1APMsg(DU_APP_MEM_REGION,DU_POOL) != ROK)
-      {
-         DU_LOG("\nERROR  -->  F1AP : Sending UE Context Setup Res Failed");
-         ret = RFAILED;
-         break;
-      }
-      break;
-   }
-   FreeUeContextModResp(f1apMsg);
-   return ret;
-
-}
-/*******************************************************************
- *
- * @brief Deallocating the memory allocated by the aper decoder
- *          for QOSInfo
- *
- * @details
- *
- *    Function : freeAperDecodeQosInfo
- *
- *    Functionality:  Deallocating the memory allocated for QOSInfo
- *
- * @params[in] QoSFlowLevelQoSParameters_t *drbQos
- *
- * @return void
- *
- * ****************************************************************/
-
-void freeAperDecodeQosInfo(QoSFlowLevelQoSParameters_t *drbQos)
-{
-   if(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI != NULLP)
-   {
-      if(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow!=NULLP)
-      {
-         if(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume!=NULLP)
-         {
-            free(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume);
-         }
-         free(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow);
-      }
-      free(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI);
-   }
-}
-/*******************************************************************
- *
- * @brief Deallocating the memory allocated by the aper decoder
- *          for UlTnlInfoforDrb
- *
- * @details
- *
- *    Function : freeAperDecodeUlTnlInfoforDrbSetupMod 
- *
- *    Functionality:  Deallocating memory allocated for UlTnlInfoforDrb
- *
- * @params[in] ULUPTNLInformation_ToBeSetup_List_t *ulInfo
- *
- * @return void
- *
- * ****************************************************************/
-void freeAperDecodeUlTnlInfoforDrbSetupMod(ULUPTNLInformation_ToBeSetup_List_t *ulInfo)
-{
-   uint8_t arrIdx =0;
-
-   if(ulInfo->list.array)
-   {
-      for(arrIdx=0; arrIdx<ulInfo->list.count ; arrIdx++)
-      {
-         if(ulInfo->list.array[arrIdx])
-         {
-            if(ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel )
-            {
-               if(ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf)
-               {
-                  if(ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf)
-                  {
-                     free(ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->\
-                           gTP_TEID.buf);
-                  }
-                  free(ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->\
-                        transportLayerAddress.buf);
-               }
-               free(ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel);
-            }
-            free(ulInfo->list.array[arrIdx]);
-         }
-      }
-      free(ulInfo->list.array);
-   }
-}
-/*******************************************************************
- *
- * @brief Deallocating the memory allocated by the aper decoder
- *          for DrbSetupModItem  
- *
- * @details
- *
- *    Function : freeAperDecodeDrbSetupModItem 
- *
- *    Functionality:  Deallocating memory allocated for DrbSetupModItem
- *
- * @params[in] DRBs_ToBeSetupMod_Item_t *drbItem
- *
- * @return void
- *
- * ****************************************************************/
-
-void freeAperDecodeDrbSetupModItem(DRBs_ToBeSetupMod_Item_t *drbItem)
-{
-   uint8_t arrIdx =0;
-   SNSSAI_t *snssai =NULLP;
-   Flows_Mapped_To_DRB_List_t *flowMap = NULLP;
-
-   drbItem->qoSInformation.present = QoSInformation_PR_choice_extension;
-   switch(drbItem->qoSInformation.present)
-   {
-      case QoSInformation_PR_NOTHING:
-         break;
-      case QoSInformation_PR_eUTRANQoS:
-         {
-            if(drbItem->qoSInformation.choice.eUTRANQoS)
-            {
-               free(drbItem->qoSInformation.choice.eUTRANQoS);
-            }
-            break;
-         }
-      case QoSInformation_PR_choice_extension:
-         {
-            if(drbItem->qoSInformation.choice.choice_extension)
-            {
-               freeAperDecodeQosInfo(&drbItem->qoSInformation.choice.choice_extension->value.choice.\
-                     DRB_Information.dRB_QoS);
-               snssai = &drbItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.sNSSAI;
-               if(snssai->sST.buf)
-               {
-                  free(snssai->sST.buf);
-               }
-               if(snssai->sD)
-               {
-                  if(snssai->sD->buf)
-                  {
-                     free(snssai->sD->buf);
-                  }
-                  free(snssai->sD);
-               }
-
-               flowMap = &drbItem->qoSInformation.choice.choice_extension->value.choice.\
-                         DRB_Information.flows_Mapped_To_DRB_List;
-               if(flowMap->list.array)
-               {
-                  for(arrIdx=0; arrIdx<flowMap->list.count; arrIdx++)
-                  {
-                     if(flowMap->list.array[arrIdx] )
-                     {
-                        freeAperDecodeQosInfo(&flowMap->list.array[arrIdx]->qoSFlowLevelQoSParameters);
-                        free(flowMap->list.array[arrIdx]);
-                     }
-                  }
-                  free(flowMap->list.array);
-               }
-
-               free(drbItem->qoSInformation.choice.choice_extension);
-            }
-            break;
+      if(encRetVal.encoded == ENCODE_FAIL)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Could not encode UEContextReleaseRequest structure (at %s)\n",\
+               encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+         break;
+      }
+      else
+      {
+         DU_LOG("\nDEBUG   -->  F1AP : Created APER encoded buffer for UEContextReleaseRequest\n");
+         for(ieIdx=0; ieIdx< encBufSize; ieIdx++)
+         {
+            printf("%x",encBuf[ieIdx]);
          }
+      }
 
-   }
-   freeAperDecodeUlTnlInfoforDrbSetupMod(&drbItem->uLUPTNLInformation_ToBeSetup_List);
-   if(drbItem->uLConfiguration)
-   {
-      free(drbItem->uLConfiguration);
-   }
-}
+      /* Sending msg */
+      if(sendF1APMsg() != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Sending UE Context Release Request failed");
+         break;
+      }
+      ret = ROK;
+      break;
+   }while(true);
 
-/*******************************************************************
+   FreeUeContextReleaseReq(f1apMsg);
+   return ret;
+}
+/*****************************************************************i
  *
- * @brief Deallocating the memory allocated by the aper decoder
- *          for DrbToBeSetupModList
+ * @brief Free memory allocated for UE Context Release Complete
  *
  * @details
  *
- *    Function : freeAperDecodeDrbToBeSetupModList
- *
- *    Functionality:  Deallocating memory allocated for DrbToBeSetupModList
+ *    Function : FreeUeContextReleaseComplete
  *
- * @params[in] DRBs_ToBeSetupMod_List_t *drbSet
+ *    Functionality:
+ *         - Free memory allocated for UE Context Release Complete
  *
+ * @params[in] F1AP_PDU_t *f1apMsg
  * @return void
  *
- * ****************************************************************/
-
-void freeAperDecodeDrbToBeSetupModList(DRBs_ToBeSetupMod_List_t *drbSet)
+ * *************************************************************/
+void FreeUeContextReleaseComplete(F1AP_PDU_t *f1apMsg)
 {
-   uint8_t arrIdx =0;
-   struct DRBs_ToBeSetupMod_ItemIEs *drbItemIe;
+   uint8_t ieIdx;
+   UEContextReleaseComplete_t *ueReleaseComplete = NULLP;
 
-   if(drbSet->list.array)
+   if(f1apMsg)
    {
-      for(arrIdx=0; arrIdx<drbSet->list.count ; arrIdx++)
+      if(f1apMsg->choice.successfulOutcome)
       {
-         if(drbSet->list.array[arrIdx] != NULLP)
+         ueReleaseComplete =&f1apMsg->choice.successfulOutcome->value.choice.UEContextReleaseComplete;
+         if(ueReleaseComplete->protocolIEs.list.array)
          {
-            if(arrIdx == 0)
+            for(ieIdx=0 ; ieIdx<ueReleaseComplete->protocolIEs.list.count; ieIdx++)
             {
-               drbItemIe = (DRBs_ToBeSetupMod_ItemIEs_t *)drbSet->list.array[arrIdx];
-               freeAperDecodeDrbSetupModItem(&(drbItemIe->value.choice.DRBs_ToBeSetupMod_Item));
+               DU_FREE(ueReleaseComplete->protocolIEs.list.array[ieIdx], sizeof(UEContextReleaseComplete_t));
             }
-            free(drbSet->list.array[arrIdx]);
+            DU_FREE(ueReleaseComplete->protocolIEs.list.array, ueReleaseComplete->protocolIEs.list.size);
          }
+         DU_FREE(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t));
       }
-      free(drbSet->list.array);
+      DU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
    }
 
 }
-/*******************************************************************
+/*****************************************************************i
  *
- * @brief Deallocating the memory allocated by the aper decoder
- *          for UeContextModificationReqMsg
+ * @brief Build and Send UE Context Release Complete
  *
  * @details
  *
- *    Function : freeAperDecodeUeContextModificationReqMsg
- *
- *    Functionality:  Deallocating memory allocated for
- *                  UeContextModificationReqMsg
+ *    Function : BuildAndSendUeContextReleaseComplete
  *
- * @params[in] UEContextModificationRequest_t *UeContextModifyReq
+ *    Functionality:
+ *         - Build and Send UE Context Release Complete
  *
- * @return void
+ * @params[in]  cellId,  gnbCuUeF1apId, gnbDuUeF1apId
+ * @return ROK     - success
+ *         RFAILED - failure
  *
- * ****************************************************************/
-void freeAperDecodeUeContextModificationReqMsg(UEContextModificationRequest_t *UeContextModifyReq )
+ * *************************************************************/
+uint8_t BuildAndSendUeContextReleaseComplete(uint16_t cellId, uint32_t gnbCuUeF1apId, uint32_t gnbDuUeF1apId)
 {
-   uint8_t arrIdx, ieId;
+   bool memAllocFail = false;
+   uint8_t ieIdx =0, ret = RFAILED, elementCnt = 0;
+   asn_enc_rval_t encRetVal;
+   F1AP_PDU_t *f1apMsg = NULLP;
+   UEContextReleaseComplete_t *ueReleaseComplete = NULLP;
 
-   if(UeContextModifyReq->protocolIEs.list.array)
+   DU_LOG("\nINFO  --> Building the UE Context Release Complete");
+   do
    {
-      for( arrIdx = 0 ; arrIdx<UeContextModifyReq->protocolIEs.list.count ; arrIdx++)
+      DU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t));
+      if(f1apMsg == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildAndSendUeContextReleaseComplete(): Memory allocation failed for f1apMsg");
+         break;
+      }
+
+      f1apMsg->present = F1AP_PDU_PR_successfulOutcome;
+      DU_ALLOC(f1apMsg->choice.successfulOutcome, sizeof(SuccessfulOutcome_t));
+      if(f1apMsg->choice.successfulOutcome == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildAndSendUeContextReleaseComplete(): Memory allocation failed for\
+               successfulOutcome");
+         break;
+      }
+      f1apMsg->choice.successfulOutcome->procedureCode = ProcedureCode_id_UEContextRelease;
+      f1apMsg->choice.successfulOutcome->criticality = Criticality_reject;
+      f1apMsg->choice.successfulOutcome->value.present = \
+      SuccessfulOutcome__value_PR_UEContextReleaseComplete;
+
+      ueReleaseComplete = &f1apMsg->choice.successfulOutcome->value.choice.UEContextReleaseComplete;
+
+      elementCnt = 2;
+      ueReleaseComplete->protocolIEs.list.count = elementCnt;
+      ueReleaseComplete->protocolIEs.list.size = elementCnt * sizeof(UEContextReleaseComplete_t *);
+
+      /* Initialize the UE Release Complete members */
+      DU_ALLOC(ueReleaseComplete->protocolIEs.list.array,ueReleaseComplete->protocolIEs.list.size);
+      if(ueReleaseComplete->protocolIEs.list.array == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildAndSendUeContextReleaseComplete(): Memory allocation failed for IE array");
+         break;
+      }
+      for(ieIdx=0; ieIdx<elementCnt; ieIdx++)
       {
-         if(UeContextModifyReq->protocolIEs.list.array[arrIdx])
+         DU_ALLOC(ueReleaseComplete->protocolIEs.list.array[ieIdx],\
+               sizeof(UEContextReleaseComplete_t));
+         if(ueReleaseComplete->protocolIEs.list.array[ieIdx] == NULLP)
          {
-            ieId = UeContextModifyReq->protocolIEs.list.array[arrIdx]->id;
-            switch(ieId)
+            DU_LOG("\nERROR  -->  F1AP : BuildAndSendUeContextReleaseComplete(): Memory allocation failed for IE\
+            elements");
+            memAllocFail = true;
+            break;
+         }
+      }
+      if(memAllocFail == true)
+         break;
+
+
+      ieIdx=0;
+      ueReleaseComplete->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID;
+      ueReleaseComplete->protocolIEs.list.array[ieIdx]->criticality= Criticality_reject;
+      ueReleaseComplete->protocolIEs.list.array[ieIdx]->value.present = \
+      UEContextReleaseCompleteIEs__value_PR_GNB_CU_UE_F1AP_ID;
+      ueReleaseComplete->protocolIEs.list.array[ieIdx]->value.choice.GNB_CU_UE_F1AP_ID =gnbCuUeF1apId;
+
+      ieIdx++;
+      ueReleaseComplete->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID;
+      ueReleaseComplete->protocolIEs.list.array[ieIdx]->criticality= Criticality_reject;
+      ueReleaseComplete->protocolIEs.list.array[ieIdx]->value.present =\
+      UEContextReleaseCompleteIEs__value_PR_GNB_DU_UE_F1AP_ID;
+      ueReleaseComplete->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_UE_F1AP_ID =gnbDuUeF1apId;
+
+      xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
+
+      /* Encode the F1SetupComplete type as APER */
+      memset(encBuf, 0, ENC_BUF_MAX_LEN);
+      encBufSize = 0;
+      encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf, encBuf);
+      /* Encode results */
+      if(encRetVal.encoded == ENCODE_FAIL)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Could not encode UEContextReleaseComplete structure (at %s)\n",\
+               encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+         break;
+      }
+      else
+      {
+         DU_LOG("\nDEBUG   -->  F1AP : Created APER encoded buffer for UEContextReleaseComplete\n");
+         for(ieIdx=0; ieIdx< encBufSize; ieIdx++)
+         {
+            printf("%x",encBuf[ieIdx]);
+         }
+      }
+
+      /* Sending msg */
+      if(sendF1APMsg() != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Sending UE Context Release Complete failed");
+         break;
+      }
+      ret = ROK;
+      break;
+   }while(true);
+   
+   if((ret == ROK) && (duCb.actvCellLst[cellId-1]) && (duCb.actvCellLst[cellId-1]->cellStatus == DELETION_IN_PROGRESS) 
+         && (duCb.actvCellLst[cellId-1]->numActvUes == 0))
+   {
+      ret = duSendCellDeletReq(cellId);
+      if(ret != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP: BuildAndSendUeContextReleaseComplete(): Failed to process cell\
+               Delete req for CellId");
+      }
+   }
+   FreeUeContextReleaseComplete(f1apMsg);
+   return ret;
+
+}
+
+/*******************************************************************
+*
+* @brief added free part for the memory allocated by aper_decoder 
+*
+* @details
+*
+*    Function : freeAperDecodeUeContextReleaseCommand 
+*
+*    Functionality: added free part for the memory allocated by aper_decoder
+*
+* @params[in] F1AP_PDU_t *f1apMsg
+* @return void
+*
+* ****************************************************************/
+void freeAperDecodeUeContextReleaseCommand(F1AP_PDU_t *f1apMsg)
+{
+   uint8_t ieIdx=0;
+   UEContextReleaseCommand_t *ueContextReleaseCommand = NULLP;
+
+   ueContextReleaseCommand = &f1apMsg->choice.initiatingMessage->value.choice.UEContextReleaseCommand;
+   
+   if(ueContextReleaseCommand->protocolIEs.list.array)
+   {
+      for(ieIdx=0; ieIdx < ueContextReleaseCommand->protocolIEs.list.count; ieIdx++)
+      {
+         if(ueContextReleaseCommand->protocolIEs.list.array[ieIdx])
+         {
+            switch(ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->id)
             {
                case ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID:
                   break;
                case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
                   break;
-               case ProtocolIE_ID_id_DRBs_ToBeSetupMod_List:
+               case ProtocolIE_ID_id_Cause:
+                  break;
+               case ProtocolIE_ID_id_RRCContainer:
+               {
+                  if(ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.buf)
                   {
-                     freeAperDecodeDrbToBeSetupModList(&UeContextModifyReq->protocolIEs.list.array[arrIdx]->\
-                           value.choice.DRBs_ToBeSetupMod_List);
-                     break;
+                     free(ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.buf);
                   }
+                  break;
+               }
+               default :
+                  DU_LOG("\nERROR  -->  F1AP: freeAperDecodeUeContextReleaseCommand():Invalid IE Received: %ld"\
+                       ,ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->id);
+                  break;
             }
-            free(UeContextModifyReq->protocolIEs.list.array[arrIdx]);
          }
+         free(ueContextReleaseCommand->protocolIEs.list.array[ieIdx]);
       }
-      free(UeContextModifyReq->protocolIEs.list.array);
+      free(ueContextReleaseCommand->protocolIEs.list.array);
    }
 }
 /*******************************************************************
- *
- * @brief processing the F1 UeContextModificationReq
- *
- * @details
- *
- *    Function : procF1UeContextModificationReq
- *
- *    Functionality:  processing the F1 UeContextModificationReq
- *
- * @params[in] F1AP_PDU_t *f1apMsg
- *
- * @return
- * ****************************************************************/
-uint8_t procF1UeContextModificationReq(F1AP_PDU_t *f1apMsg)
+*
+* @brief processing of UE Context Release Command
+*
+* @details
+*
+*    Function : procF1UeContextReleaseCommand 
+*
+*    Functionality: processing of UE Context Release Command
+*
+* @params[in] F1AP_PDU_t *f1apMsg
+* @return void
+*
+* ****************************************************************/
+uint8_t procF1UeContextReleaseCommand(F1AP_PDU_t *f1apMsg)
 {
-   UEContextModificationRequest_t *ueContextModifyReq = NULLP;
-   uint8_t  ret = ROK, ieIdx = 0, lcId =0,cellIdx=0, ueIdx=0;
+   uint8_t  ieIdx=0, ret=ROK, ueIdx=0;
+   uint16_t cellIdx =0, cellId = 0;
+   bool ueIdxFound = false;
+   uint32_t gnbCuUeF1apId=0, gnbDuUeF1apId=0;
    DuUeCb   *duUeCb = NULLP;
-   DRBs_ToBeSetupMod_List_t *drbSetupModCfg;
-   uint32_t gnbCuUeF1apId, gnbDuUeF1apId;
+   UEContextReleaseCommand_t *ueContextReleaseCommand = NULLP;
 
-   ueContextModifyReq = &f1apMsg->choice.initiatingMessage->value.choice.UEContextModificationRequest;
-   for(ieIdx=0; (ieIdx < ueContextModifyReq->protocolIEs.list.count && ret == ROK); ieIdx++)
+   ueContextReleaseCommand = &f1apMsg->choice.initiatingMessage->value.choice.UEContextReleaseCommand;
+
+   if(ueContextReleaseCommand->protocolIEs.list.array)
    {
-      switch(ueContextModifyReq->protocolIEs.list.array[ieIdx]->id)
+      for(ieIdx=0; ieIdx < ueContextReleaseCommand->protocolIEs.list.count; ieIdx++)
       {
-         case ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID:
-            {
-               gnbCuUeF1apId = ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.choice.GNB_CU_UE_F1AP_ID;
-               break;
-            }
-         case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
-            {
-               gnbDuUeF1apId = ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_UE_F1AP_ID;
-               break;
-            }
-         case ProtocolIE_ID_id_DRBs_ToBeSetupMod_List:
+         if(ueContextReleaseCommand->protocolIEs.list.array[ieIdx])
+         {
+            switch(ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->id)
             {
-               for(cellIdx = 0; cellIdx < duCb.numActvCells; cellIdx++)
-               {
-                  for(ueIdx = 0; ueIdx < duCb.numUe; ueIdx++)
+               case ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID:
                   {
-                     if((duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbDuUeF1apId == gnbDuUeF1apId)&&\
-                           (duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbCuUeF1apId == gnbCuUeF1apId))
-                     {
+                     gnbCuUeF1apId= ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->\
+                                    value.choice.GNB_CU_UE_F1AP_ID;
+                     break;
+                  }
+
+               case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
+                  {
+                     gnbDuUeF1apId = ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->\
+                                     value.choice.GNB_DU_UE_F1AP_ID;
+                     break;
+                  }
 
-                        duUeCb = &duCb.actvCellLst[cellIdx]->ueCb[ueIdx];
-                        lcId = getDrbLcId(&duUeCb->drbBitMap);
-                        if(lcId != RFAILED)
+               case ProtocolIE_ID_id_Cause:
+                  {
+                     for(cellIdx = 0; cellIdx < MAX_NUM_CELL; cellIdx++)
+                     {
+                        for(ueIdx = 0; ueIdx < MAX_NUM_UE; ueIdx++)
                         {
-                           DU_ALLOC(duUeCb->f1UeDb, sizeof(F1UeContextSetupDb));
-                           if(duUeCb->f1UeDb)
+                           if(duCb.actvCellLst[cellIdx] && (duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbDuUeF1apId == gnbDuUeF1apId)&&\
+                                 (duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbCuUeF1apId == gnbCuUeF1apId))
                            {
-                              duUeCb->f1UeDb->actionType = UE_CTXT_MOD;
-                              drbSetupModCfg = &ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.\
-                              choice.DRBs_ToBeSetupMod_List;
-                              if(extractDrbListToSetup(lcId, NULL, drbSetupModCfg ,drbSetupModCfg->list.count, \
-                              &duUeCb->f1UeDb->duUeCfg))
-                              {
-                                 DU_LOG("\nERROR  -->  DU APP : Failed at extractDrbListToSetup()");
-                                 ret = RFAILED;
-                              }
+                              cellId = duCb.actvCellLst[cellIdx]->cellId;
+                              duUeCb = &duCb.actvCellLst[cellIdx]->ueCb[ueIdx];
+                              ueIdxFound = true;
+                              break;
                            }
                         }
+                        if(ueIdxFound == true)
+                        {
+                           break;
+                        }
                      }
-                     else
+                     
+                     if(!ueIdxFound)
                      {
-                        DU_LOG("\nERROR  -->  DU APP : wrong values of gnbCuUeF1apId and gnbDuUeF1apId ");
+                        DU_LOG("\nERROR  -->  F1AP: procF1UeContextReleaseCommand(): Ue Information is not available");
                         ret = RFAILED;
                      }
+                     break;
                   }
-               }
-               break;
+
+               case ProtocolIE_ID_id_RRCContainer:
+                  {
+                     if(ueIdxFound == true)  
+                     {
+                        DU_ALLOC(duUeCb->f1UeDb, sizeof(F1UeContextSetupDb));
+                        if(duUeCb->f1UeDb)
+                        {
+                           memset(duUeCb->f1UeDb, 0, sizeof(F1UeContextSetupDb));
+                           duUeCb->f1UeDb->actionType = UE_CTXT_RELEASE;
+                           duUeCb->f1UeDb->cellIdx = cellIdx;
+                           /* Filling Dl RRC Msg Info */
+                           DU_ALLOC_SHRABL_BUF(duUeCb->f1UeDb->dlRrcMsg, sizeof(F1DlRrcMsg));
+                           if(!duUeCb->f1UeDb->dlRrcMsg)
+                           {
+                              DU_LOG("\nERROR  -->  DU APP : procF1UeContextReleaseCommand(): \
+                                    Memory allocation failed ");
+                              ret = RFAILED;
+                           }
+                           else
+                           {
+                              duUeCb->f1UeDb->dlRrcMsgPres = true;
+                              memset(duUeCb->f1UeDb->dlRrcMsg, 0, sizeof(F1DlRrcMsg));
+                              ret = extractDlRrcMsg(gnbDuUeF1apId, gnbCuUeF1apId, duUeCb->f1UeDb->dlRrcMsg,\
+                                    &ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->\
+                                    value.choice.RRCContainer);
+                           }
+
+                        }
+                        else
+                        {
+                           DU_LOG("\nERROR  -->  DU APP : procF1UeContextReleaseCommand(): \
+                                 Memory allocation failed ");
+                           ret = RFAILED;
+
+                        }
+                     }
+                     break;
+                  }
+               default :
+                  DU_LOG("\nERROR  -->  F1AP: freeAperDecodeUeContextReleaseCommand():Invalid IE Received: %ld"\
+                        ,ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->id);
+                  break;
             }
+         }
       }
    }
    if(ret != RFAILED)
    {
-      ret = duProcUeContextModReq(duUeCb);
+      duProcUeContextReleaseCommand(cellId, duUeCb);
    }
-   freeAperDecodeUeContextModificationReqMsg(ueContextModifyReq);
-   return ret; 
+   freeAperDecodeUeContextReleaseCommand(f1apMsg);
+   return ret;
 }
-/*****************************************************************i
+/**************************************************************
  *
  * @brief Handles received F1AP message and sends back response  
  *
@@ -12341,7 +15363,6 @@ void F1APMsgHdlr(Buffer *mBuf)
    memset(f1apMsg, 0, sizeof(F1AP_PDU_t));
 
    rval = aper_decode(0, &asn_DEF_F1AP_PDU, (void **)&f1apMsg, recvBuf, recvBufLen, 0, 0);
-   DU_FREE(recvBuf, (Size)recvBufLen);
 
    if(rval.code == RC_FAIL || rval.code == RC_WMORE)
    {
@@ -12365,7 +15386,7 @@ void F1APMsgHdlr(Buffer *mBuf)
                case SuccessfulOutcome__value_PR_F1SetupResponse:
                   {                            
 #ifndef ODU_TEST_STUB
-                     procF1SetupRsp(f1apMsg);
+                     procF1SetupRsp(f1apMsg, recvBufLen, recvBuf);
 #endif
                      break;
                   }
@@ -12410,6 +15431,11 @@ void F1APMsgHdlr(Buffer *mBuf)
                      procF1UeContextModificationReq(f1apMsg);
                      break;
                   }
+               case InitiatingMessage__value_PR_UEContextReleaseCommand:
+                  {
+                      procF1UeContextReleaseCommand(f1apMsg);
+                      break;
+                  }
                default:
                   {
                      DU_LOG("\nERROR  -->  F1AP : Invalid type of F1AP_PDU_PR_initiatingMessage [%d]",
@@ -12429,7 +15455,8 @@ void F1APMsgHdlr(Buffer *mBuf)
          free(f1apMsg);
 
    }/* End of switch(f1apMsg->present) */
-
+   
+   DU_FREE(recvBuf, (Size)recvBufLen);
 } /* End of F1APMsgHdlr */
 
 /**********************************************************************