[Epic-ID: ODUHIGH-462][Task-ID: ODUHIGH-472] Implementation of onduration timer
[o-du/l2.git] / src / cu_stub / cu_f1ap_msg_hdl.c
index b913055..1c4eb0a 100644 (file)
 /* This file contains F1AP message handler functions */
 #include "common_def.h"
 #include "OCTET_STRING.h"
-#include "cu_stub_sctp.h"
-#include "cu_stub_egtp.h"
-#include "cu_f1ap_msg_hdl.h"
-#include "cu_stub.h"
-
 #include "BIT_STRING.h"
 #include "odu_common_codec.h"
 #include "ProtocolIE-Field.h"
 #include "ProtocolExtensionField.h"
 #include "ProtocolIE-SingleContainer.h"
+#include "F1SetupResponse.h"
+#include "SuccessfulOutcome.h"
+#include "InitiatingMessage.h"
+#include "NonDynamic5QIDescriptor.h"
+#include "AveragingWindow.h"
+#include "MaxDataBurstVolume.h"
+#include "Flows-Mapped-To-DRB-Item.h"
+#include "SliceSupportItem.h"
+#include "ServedPLMNs-Item.h"
 #include "F1AP-PDU.h"
+#include "ULUPTNLInformation-ToBeSetup-Item.h"
+#include "ULConfiguration.h"
 #include "ModulationOrder.h"
 #include "BandNR.h"
 #include "UE-CapabilityRAT-Container.h"
 #include "UE-CapabilityRAT-ContainerList.h"
 #include "UE-CapabilityRAT-ContainerListRRC.h"
+#include "HandoverPreparationInformationRrc-IEs.h"
+#include "HandoverPreparationInformationRrc.h"
 #include "SupportedBandwidth.h"
 #include "FeatureSetUplinkPerCC.h"
 #include "FeatureSetDownlinkPerCC.h"
 #include "DRB-ToAddModList.h"
 #include "DRB-ToAddMod.h"
 #include "SDAP-Config.h"
+#include "SSB-MTC.h"
+#include "MeasTiming.h"
+#include "MeasTimingList.h"
+#include "MeasurementTimingConfigurationRrc-IEs.h"
+#include "MeasurementTimingConfigurationRrc.h"
+#include "PDCP-Config.h"
+#include "RSRP-Range.h"
+#include "RSRQ-Range.h"
+#include "SINR-Range.h"
+#include "ThresholdNR.h"
+#include "MeasObjectToAddMod.h"
+#include "MeasObjectNR.h"
+#include "MeasObjectToAddModList.h"
+#include "EventTriggerConfig.h"
+#include "ReportConfigNR.h"
+#include "ReportConfigToAddMod.h"
+#include "ReportConfigToAddModList.h"
+#include "MeasIdToAddMod.h"
+#include "MeasIdToAddModList.h"
+#include "FilterCoefficient.h"
+#include "QuantityConfigNR.h"
+#include "QuantityConfig.h"
+#include "MeasConfigRrc.h"
+#include "AS-Config.h"
+#include "RRCReconfiguration-v1530-IEs.h"
+#include "CNUEPagingIdentity.h"
+#include "PagingCell-Item.h"
+#include "UL-DCCH-Message.h"
+#include "DRX-ConfigRrc.h"
+
+#include "cu_stub_sctp.h"
+#include "cu_stub_egtp.h"
+#include "cu_f1ap_msg_hdl.h"
+#include "cu_stub.h"
 
-/* MACRO for CUtoDURRCInformation */
-#define CELL_GRP_ID 1
-#define FREQ_DOM_RSRC_SIZE 6
-#define CORESET0_END_PRB   48
-#define CORESET1_NUM_PRB   24
-#define PDCCH_CTRL_RSRC_SET_ONE_ID  1
-#define PDCCH_CTRL_RSRC_SET_ONE_DURATION 2  /* Duration for control resource set id i */
-#define PDCCH_CTRL_RSRC_SET_ONE_PRECOD_GRANULARITY 1   /* Precoded granularity */
-#define PDCCH_SRCH_SPC_TWO_ID 2
-#define NR_PCI 1
-#define SCRAMBLING_ID  NR_PCI
-#define DMRS_ADDITIONAL_POS  0          /* DMRS Additional poistion */
-#define PDCCH_SYMBOL_WITHIN_SLOT 128     /* Symbol within Slot Value */
-#define PDCCH_SRCH_SPC_TWO_AGG_LVL1_CANDIDATE 7   /* Num of candidate at aggregation level 1 */
-#define PDCCH_SRCH_SPC_TWO_AGG_LVL2_CANDIDATE 7   /* Num of candidate at aggregation level 2 */
-#define PDCCH_SRCH_SPC_TWO_AGG_LVL4_CANDIDATE 4   /* Num of candidate at aggregation level 4 */
-#define PDCCH_SRCH_SPC_TWO_AGG_LVL8_CANDIDATE 2   /* Num of candidate at aggregation level 8 */
-#define PDCCH_SRCH_SPC_TWO_AGG_LVL16_CANDIDATE 1  /* Num of candidate at aggregation level 16 */
-#define PDCCH_SRCH_SPC_TWO_UE_SPEC_DCI_FORMAT  0  /* format 0-0 and 1-0 */
-#define PDCCH_SERACH_SPACE_DCI_FORMAT 0
-
-/* MACRO Ddefine for PDSCH Configuration */
-#define PDSCH_K0  0
-#define PDSCH_RES_ALLOC_TYPE       1          /* Resource allocation type */
-#define PDSCH_MAX_CODEWORD_SCH_BY_DCI 0       /* Max num of codewords scheduled by DCI */
-#define PDSCH_RBG_SIZE   0                    /* 0: config1 */
-#define PDSCH_NUM_HARQ_PROC 5
-#define PDSCH_MAPPING_TYPE_A 0
-#define PDSCH_MAPPING_TYPE_B 1
-
-/* MACRO Define for PUSCH Configuration */
-#define PUSCH_K2_CFG1  1
-#define PUSCH_K2_CFG2  2
-#define PUSCH_START_SYMBOL 3
-
-#define PUSCH_MSG3_DELTA_PREAMBLE 0
-#define PUSCH_P0_NOMINAL_WITH_GRANT -70
-#define PUSCH_TRANSFORM_PRECODER    1      /* 1: Disabled */
-#define PUSCH_MAX_MIMO_LAYERS       1
-#define PUSCH_PROCESS_TYPE2_ENABLED false
-#define PUSCH_MAPPING_TYPE_A        0
-#define PUSCH_MAPPING_TYPE_B        1
-
-/* MACRO defines for SRC config */
-#define SRS_RSRC_ID  1
-#define SRS_RSET_ID  1
-#define SRS_COMB_OFFSET_N2   0
-#define SRS_CYCLIC_SHIFT_N2  0
-#define SRS_FREQ_DOM_POS     0
-#define SRS_FREQ_DOM_SHIFT   0
-#define C_SRS 0
-#define B_SRS 0
-#define B_HOP 0
-#define SRS_SEQ_ID 0
-#define APERIODIC_SRS_RESRC_TRIGGER 1 
-
-/* Macro definitions for DUtoCuRrcContainer */
-#define CELL_GRP_ID 1
-#define SCH_REQ_ID  0
-#define SR_PROHIBIT_TMR 5
-#define SR_TRANS_MAX 2
-#define PERIODIC_BSR_TMR 2
-#define RETX_BSR_TMR     5
-#define SR_DELAY_TMR     6
-#define TAG_ID 0
-#define TIME_ALIGNMENT_TMR 7
-#define PHR_PERIODIC_TMR 7
-#define PHR_PROHIBHIT_TMR 0
-#define PHR_PWR_FACTOR_CHANGE 3
-#define PHR_MODE_OTHER_CG 0
-#define RLC_LCID 1 
-#define SRB_ID_1 1
-#define SN_FIELD_LEN 0
-#define T_POLL_RETRANSMIT 8 
-#define POLL_PDU 0
-#define POLL_BYTE 43
-#define MAX_RETX_THRESHOLD 5
-#define T_REASSEMBLY 8
-#define T_STATUS_PROHIBHIT 7
-#define MAC_LC_PRIORITY 1
-#define PRIORTISIED_BIT_RATE 15
-#define BUCKET_SIZE_DURATION 5
-#define LC_GRP 0
-#define P_NR_FR1 0
-#define PDSCH_HARQ_ACK_CODEBOOK 1
-#define SERV_CELL_IDX 0
-#define RLM_SYNC_OUT_SYNC_THRESHOLD 0
-#define ACTIVE_DL_BWP_ID 0
-#define ACTIVE_UL_BWP_ID 0
-#define SCRAMBLING_ID  NR_PCI
-#define DMRS_ADDITIONAL_POS  0          /* DMRS Additional poistion */
-#define RES_ALLOC_TYPE       1          /* Resource allocation type */
-#define FIVE_QI_VALUE9 9  /*spec 23.501, Table 5.7.4-1*/
-#define FIVE_QI_VALUE8 8  /*spec 23.501, Table 5.7.4-1*/
-#define PDU_SESSION_ID_1 1
-#define PDU_SESSION_ID_2 2
-#define INVALID_PDU_SESSION_ID -1
+uint8_t fillCellGrpCfg(CuUeCb *ueCb, OCTET_STRING_t *cellGrp, bool updateAllRbCfg);
+uint8_t fillRrcReconfig(CuUeCb *ueCb, RRCReconfiguration_t *rrcReconfig, bool updateAllRbCfg);
 
 /*******************************************************************
  *
@@ -254,31 +201,6 @@ S16 SendF1APMsg(Region region, Pool pool, uint32_t duId)
    return ROK;
 } /* SendF1APMsg */
 
-/*******************************************************************
- *
- * @brief Builds NRCell ID 
- *
- * @details
- *
- *    Function : BuildNrCellId
- *
- *    Functionality: Building the NR Cell ID
- *
- * @params[in] BIT_STRING_t *nrcell
- * @return ROK     - success
- *         RFAILED - failure
- *
- * ****************************************************************/
-
-S16 BuildNrCellId(BIT_STRING_t *nrcell)
-{
-   memset(nrcell->buf, 0, nrcell->size);
-   nrcell->buf[4]   = 16; 
-   nrcell->bits_unused = 4;
-   nrcell->size = 5 * sizeof(uint8_t);
-   return ROK;
-}
-
 /********************************************************************
  *
  * @brief Builds and sends the F1SetupResponse
@@ -484,10 +406,11 @@ uint8_t BuildAndSendF1SetupRsp(uint32_t duId, BIT_STRING_t *nrcellId)
    buildPlmnId(cuCb.cuCfgParams.plmn , cellToActivate->list.array[0]->value.choice.\
          Cells_to_be_Activated_List_Item.nRCGI.pLMN_Identity.buf);
    cellToActivate->list.array[0]->value.choice.Cells_to_be_Activated_List_Item.\
-      nRCGI.nRCellIdentity.size = 5;
+      nRCGI.nRCellIdentity.size = 5*sizeof(uint8_t);
    CU_ALLOC(cellToActivate->list.array[0]->value.choice.\
          Cells_to_be_Activated_List_Item.nRCGI.nRCellIdentity.buf,\
-         5*sizeof(uint8_t));
+         cellToActivate->list.array[0]->value.choice.Cells_to_be_Activated_List_Item.\
+        nRCGI.nRCellIdentity.size);
    if(cellToActivate->list.array[0]->value.choice.\
          Cells_to_be_Activated_List_Item.nRCGI.nRCellIdentity.buf == NULLP)
    {
@@ -1000,39 +923,50 @@ uint8_t BuildAndSendF1ResetReq()
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t fillSrbCfg(uint8_t srbId, SRB_ToAddModList_t *bearerCfg)
+uint8_t fillSrbCfg(CuUeCb *ueCb, SRB_ToAddModList_t *bearerCfg)
 {
-   uint8_t elementCnt;
-   uint8_t idx, ieId;
+   uint8_t elementCnt = 0;
+   uint8_t idx, ieId, srbIdx = 0;
+
+   for(srbIdx=0; srbIdx < ueCb->numSrb; srbIdx++)
+   {
+      if(ueCb->srbList[srbIdx].cfgSentToUe == false)
+         elementCnt++;
+   }
+
    if(bearerCfg != NULLP)
    {
-      elementCnt = 1;
       bearerCfg->list.count = elementCnt;
-      bearerCfg->list.size =\
-                           elementCnt * sizeof(SRB_ToAddMod_t *);
+      bearerCfg->list.size = elementCnt * sizeof(SRB_ToAddMod_t *);
       CU_ALLOC(bearerCfg->list.array, bearerCfg->list.size);
       if(bearerCfg->list.array != NULLP)
       {
-        for(idx = 0; idx < elementCnt; idx++)
-        {
-           CU_ALLOC(bearerCfg->list.array[idx], sizeof(SRB_ToAddMod_t));
-           if(bearerCfg->list.array[idx] == NULLP)
-           {
-              for(ieId = 0; ieId < idx; ieId++)
-              {
-                 CU_FREE(bearerCfg->list.array[ieId], sizeof(SRB_ToAddMod_t));
-              }
-              CU_FREE(bearerCfg->list.array, bearerCfg->list.size);
-              return RFAILED;
-           }
-        }
+         for(idx = 0; idx < elementCnt; idx++)
+         {
+            CU_ALLOC(bearerCfg->list.array[idx], sizeof(SRB_ToAddMod_t));
+            if(bearerCfg->list.array[idx] == NULLP)
+            {
+               for(ieId = 0; ieId < idx; ieId++)
+               {
+                  CU_FREE(bearerCfg->list.array[ieId], sizeof(SRB_ToAddMod_t));
+               }
+               CU_FREE(bearerCfg->list.array, bearerCfg->list.size);
+               return RFAILED;
+            }
+         }
       }
       else
       {
-        return RFAILED;
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed for bearer list arry in fillSrbCfg");
+         return RFAILED;
       }
+
       idx = 0;
-      bearerCfg->list.array[idx]->srb_Identity = srbId;
+      for(srbIdx=0; srbIdx < ueCb->numSrb; srbIdx++)
+      {
+         if(ueCb->srbList[srbIdx].cfgSentToUe == false)
+            bearerCfg->list.array[idx++]->srb_Identity = ueCb->srbList[srbIdx].srbId;
+      }
    }
    return ROK;
 }
@@ -1098,23 +1032,31 @@ uint8_t fillMasterCellGroup(CuUeCb *ueCb, OCTET_STRING_t *masterCellGroup)
 
 uint8_t fillRRCSetupIE(CuUeCb *ueCb, RRCSetup_IEs_t *rrcSetupIE)
 {
-   uint8_t ret = ROK;
+   uint8_t ret = ROK, srbIdx = 0;
    if(rrcSetupIE)
    {
       CU_ALLOC(rrcSetupIE->radioBearerConfig.srb_ToAddModList, sizeof(SRB_ToAddModList_t));
       if(rrcSetupIE->radioBearerConfig.srb_ToAddModList != NULLP)
       {
-         ret = fillSrbCfg(SRB1, rrcSetupIE->radioBearerConfig.srb_ToAddModList);
+         ret = fillSrbCfg(ueCb, rrcSetupIE->radioBearerConfig.srb_ToAddModList);
       }                
       if(ret == ROK)
       {
-         ret = fillMasterCellGroup(ueCb, &rrcSetupIE->masterCellGroup);
+         ret = fillCellGrpCfg(ueCb, &rrcSetupIE->masterCellGroup, false);
       }
       else
       {
          CU_FREE(rrcSetupIE->radioBearerConfig.srb_ToAddModList, sizeof(SRB_ToAddModList_t));
          ret = RFAILED;
       }
+      
+      /* If SRB configuration are filled successfully in RRC Setup, mark these
+       * configurartion as sent to UE */
+      for(srbIdx=0; srbIdx < ueCb->numSrb; srbIdx++)
+      {
+         if(ueCb->srbList[srbIdx].cfgSentToUe == false)
+            ueCb->srbList[srbIdx].cfgSentToUe = true;
+      }
    }
    return ret;
 }
@@ -1228,6 +1170,22 @@ uint8_t fillDlCcchRrcMsg(CuUeCb *ueCb, RRCContainer_t *rrcContainer)
    }
 }
 
+/*******************************************************************
+ *
+ * @brief Fills QOS flow configuration  
+ *
+ * @details
+ *
+ *    Function : fillQosFlowsToAdd
+ *
+ *    Functionality: Fills QOS flow configuration
+ *
+ * @params[in] struct SDAP_Config__mappedQoS_FlowsToAdd *qosFlow 
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
 uint8_t fillQosFlowsToAdd(struct SDAP_Config__mappedQoS_FlowsToAdd *qosFlow)
 {
    uint8_t idx, ied, elementCnt;
@@ -1448,10 +1406,10 @@ uint8_t fillRrcReconfigIE(RRCReconfiguration_IEs_t *rrcReconfigMsg)
  *
  * ****************************************************************/
 
-uint8_t fillDlDcchRrcMsg(RRCContainer_t *rrcContainer)
+uint8_t fillDlDcchRrcMsg(CuUeCb *ueCb, RRCContainer_t *rrcContainer)
 {
    uint8_t ret = ROK;
-   uint16_t idx2;
+   uint16_t idx2 = 0, drbIdx = 0, srbIdx = 0;
    DL_DCCH_Message_t dl_DCCH_Msg;
    memset(&dl_DCCH_Msg, 0, sizeof(DL_DCCH_Message_t));
    asn_enc_rval_t        encRetVal;
@@ -1463,76 +1421,69 @@ uint8_t fillDlDcchRrcMsg(RRCContainer_t *rrcContainer)
       CU_ALLOC(dl_DCCH_Msg.message.choice.c1 , sizeof(DL_DCCH_MessageType_t));
       if(dl_DCCH_Msg.message.choice.c1 != NULLP)
       {
-        dl_DCCH_Msg.message.choice.c1->present = DL_DCCH_MessageType__c1_PR_rrcReconfiguration;
-        CU_ALLOC(dl_DCCH_Msg.message.choice.c1->choice.rrcReconfiguration, sizeof(RRCReconfiguration_t));
-        if(dl_DCCH_Msg.message.choice.c1->choice.rrcReconfiguration != NULLP)
-        {
-           dl_DCCH_Msg.message.choice.c1->choice.rrcReconfiguration->rrc_TransactionIdentifier = 0;
-           dl_DCCH_Msg.message.choice.c1->choice.rrcReconfiguration->criticalExtensions.\
-              present = RRCReconfiguration__criticalExtensions_PR_rrcReconfiguration;
-           /* Fill RRC Reconfig IE */
-           CU_ALLOC(dl_DCCH_Msg.message.choice.c1->choice.rrcReconfiguration->\
-                 criticalExtensions.choice.rrcReconfiguration, sizeof(RRCReconfiguration_IEs_t));
-           if(dl_DCCH_Msg.message.choice.c1->choice.rrcReconfiguration->\
-                 criticalExtensions.choice.rrcReconfiguration != NULLP)
-           {
-              ret = fillRrcReconfigIE(dl_DCCH_Msg.message.choice.c1->choice.rrcReconfiguration->\
-                    criticalExtensions.choice.rrcReconfiguration);
+         dl_DCCH_Msg.message.choice.c1->present = DL_DCCH_MessageType__c1_PR_rrcReconfiguration;
+         CU_ALLOC(dl_DCCH_Msg.message.choice.c1->choice.rrcReconfiguration, sizeof(RRCReconfiguration_t));
+         if(dl_DCCH_Msg.message.choice.c1->choice.rrcReconfiguration != NULLP)
+         {
+            DU_LOG("\nDEBUG --> F1AP : Filling DL DCCH RRC Reconfiguration Message ");
+            fillRrcReconfig(ueCb, dl_DCCH_Msg.message.choice.c1->choice.rrcReconfiguration, false);
+            if(ret == ROK)
+            {
+               /* If RB configuration are filled successfully in RRC Reconfiguration, mark these
+                * configurartion as sent to UE */
+               for(srbIdx=0; srbIdx < ueCb->numSrb; srbIdx++)
+               {     
+                  if(ueCb->srbList[srbIdx].cfgSentToUe == false)
+                     ueCb->srbList[srbIdx].cfgSentToUe = true; 
+               }
+               for(drbIdx=0; drbIdx < ueCb->numDrb; drbIdx++)
+               {
+                  if(ueCb->drbList[drbIdx].cfgSentToUe == false)
+                     ueCb->drbList[drbIdx].cfgSentToUe = true;
+               }
 
-              if(ret == ROK)
-              {
-                 /* encode DL-DCCH message into RRC Container */
-                 xer_fprint(stdout, &asn_DEF_DL_DCCH_MessageType, &dl_DCCH_Msg);
-                 memset(encBuf, 0, ENC_BUF_MAX_LEN);
-                 encBufSize = 0;
-                 encRetVal = aper_encode(&asn_DEF_DL_DCCH_MessageType, 0, &dl_DCCH_Msg, PrepFinalEncBuf, encBuf);
-                 /* Encode results */
-                 if(encRetVal.encoded == ENCODE_FAIL)
-                 {
-                    DU_LOG( "\nERROR  -->  F1AP : Could not encode RRCContainer for DL-DCCH Msg (at %s)\n",\
-                          encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
-                    return RFAILED;
-                 }
-                 else
-                 {
-                    DU_LOG("\nDEBUG  -->  F1AP : Created APER encoded buffer for RRCContainer for DL-DCCH Msg\n");
-                    for(int i = 0; i< encBufSize; i++)
-                    {
-                       DU_LOG("%x",encBuf[i]);
-                    }
-                    rrcContainer->size = encBufSize;
-                    CU_ALLOC(rrcContainer->buf, rrcContainer->size);
-                    if(rrcContainer->buf != NULLP)
-                    {
-                       memset(rrcContainer->buf, 0, encBufSize);
-                       for(idx2 = 0; idx2 < encBufSize; idx2++)
-                       {
-                          rrcContainer->buf[idx2] =    encBuf[idx2];
-                       }
-                    }
-                 }
-              }
-              else
-              {
-                 DU_LOG("\nERROR  -->  F1AP: Failed to fill RrcReconfig IE at fillDlDcchRrcMsg()");
-              }
-           }
-           else
-           {
-              DU_LOG("\nERROR  -->  F1AP: Memory Alloc failed for RRC Reconfig at fillDlDcchRrcMsg()");
-              ret = RFAILED;
-           }
-        }
-        else
-        {
-           DU_LOG("\nERROR  -->  F1AP: Memory Alloc failed for RRC Msg at fillDlDcchRrcMsg()");
-           ret = RFAILED;
-        }
+               /* encode DL-DCCH message into RRC Container */
+               xer_fprint(stdout, &asn_DEF_DL_DCCH_MessageType, &dl_DCCH_Msg);
+               memset(encBuf, 0, ENC_BUF_MAX_LEN);
+               encBufSize = 0;
+               encRetVal = aper_encode(&asn_DEF_DL_DCCH_MessageType, 0, &dl_DCCH_Msg, PrepFinalEncBuf, encBuf);
+               /* Encode results */
+               if(encRetVal.encoded == ENCODE_FAIL)
+               {
+                  DU_LOG( "\nERROR  -->  F1AP : Could not encode RRCContainer for DL-DCCH Msg (at %s)\n",\
+                        encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+                  return RFAILED;
+               }
+               else
+               {
+                  DU_LOG("\nDEBUG  -->  F1AP : Created APER encoded buffer for RRCContainer for DL-DCCH Msg\n");
+                  for(int i = 0; i< encBufSize; i++)
+                  {
+                     DU_LOG("%x",encBuf[i]);
+                  }
+                  rrcContainer->size = encBufSize;
+                  CU_ALLOC(rrcContainer->buf, rrcContainer->size);
+                  if(rrcContainer->buf != NULLP)
+                  {
+                     memset(rrcContainer->buf, 0, encBufSize);
+                     for(idx2 = 0; idx2 < encBufSize; idx2++)
+                     {
+                        rrcContainer->buf[idx2] =      encBuf[idx2];
+                     }
+                  }
+               }
+            }
+         }
+         else
+         {
+            DU_LOG("\nERROR  -->  F1AP: Memory Alloc failed for RRC Msg at fillDlDcchRrcMsg()");
+            ret = RFAILED;
+         }
       }
       else
       {
-        DU_LOG("\nERROR  -->  F1AP: Memory Alloc failed for DL Dcch Msg choice at fillDlDcchRrcMsg()");
-        ret = RFAILED;
+         DU_LOG("\nERROR  -->  F1AP: Memory Alloc failed for DL Dcch Msg choice at fillDlDcchRrcMsg()");
+         ret = RFAILED;
       }
    }
    else
@@ -1572,17 +1523,36 @@ uint8_t BuildDLRRCContainer(CuUeCb *ueCb, uint8_t rrcMsgType, RRCContainer_t *rr
       if(ret == RFAILED)
          DU_LOG("\nERROR  -->  F1AP: Failed to fill DL-CCCH Msg at RRC SETUP");
    }
-   else if(rrcMsgType == REGISTRATION_ACCEPT)
+   else if(rrcMsgType == RRC_SETUP_COMPLETE)
    {
-      /*Hardcoded RRC Container from reference logs*/
-      char buf[14] ={0x00, 0x03, 0x2a, 0x80, 0xaf, 0xc0, 0x08, 0x40, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00};
-      bufLen =14;
+      DU_LOG("\nINFO --> F1AP : Sending NAS Security mode command");
+      char secModeBuf[30]={0x00, 0x02, 0x2e, 0x82, 0xaf, 0xc0, 0x7d, 0x1c, 0x4e, 0xfc, 0x80, 0x0f, 0xc0, 
+                          0x0b, 0xa0, 0x20, 0x40, 0x9e, 0x0e, 0x1e, 0x0e, 0x1c, 0x26, 0xc0, 0x20, 0x40, 0x00, 0x00, 0x00, 0x00};
+      bufLen =30;
+      rrcContainer->size = bufLen;
+      CU_ALLOC(rrcContainer->buf, rrcContainer->size);
+      if(rrcContainer->buf != NULLP)
+      {     
+         memset(rrcContainer->buf, 0, bufLen);
+         memcpy(rrcContainer->buf, secModeBuf, bufLen);
+      }
+      else
+      {     
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure for RRC Container buffer");
+         ret = RFAILED;
+      }     
+   }
+   else if(rrcMsgType == NAS_SECURITY_MODE_COMPLETE)
+   {
+      DU_LOG("\nINFO --> F1AP : Sending RRC Security mode command");
+      char secModeBuf[9]={0x00, 0x03, 0x22, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00};
+      bufLen =9;
       rrcContainer->size = bufLen;
       CU_ALLOC(rrcContainer->buf, rrcContainer->size);
       if(rrcContainer->buf != NULLP)
       {
          memset(rrcContainer->buf, 0, bufLen);
-         memcpy(rrcContainer->buf, buf, bufLen);
+         memcpy(rrcContainer->buf, secModeBuf, bufLen);
       }
       else
       {
@@ -1590,24 +1560,12 @@ uint8_t BuildDLRRCContainer(CuUeCb *ueCb, uint8_t rrcMsgType, RRCContainer_t *rr
          ret = RFAILED;
       }
    }
-   else if(rrcMsgType == RRC_RECONFIG)
+   else if(rrcMsgType == RRC_SECURITY_MODE_COMPLETE)
    {
       /*Hardcoded RRC Container from reference logs*/
-      char buf[196]= { 
-         0x00, 0x04, 0x00, 0xaa, 0x80, 0x40, 0x9a, 0x05, 0x20, 0x00, 0x05, 0xeb, 0xc0, 0x51, 0x50, 0x00,
-         0x03, 0x00, 0x03, 0xf7, 0x56, 0xec, 0x7f, 0x08, 0x42, 0x10, 0x80, 0x00, 0x10, 0x21, 0x47, 0x84,
-         0xd1, 0x00, 0x00, 0x00, 0x02, 0x81, 0x5d, 0x10, 0x0a, 0xc2, 0x44, 0x40, 0x2b, 0xb2, 0x07, 0x41,
-         0x87, 0xa8, 0x02, 0xc7, 0x00, 0x88, 0x05, 0x76, 0x40, 0xe8, 0x30, 0xf5, 0x40, 0x4c, 0x00, 0x10,
-         0x02, 0x00, 0xa5, 0x83, 0xe0, 0x60, 0x02, 0x10, 0x72, 0x01, 0x0c, 0xa0, 0xa0, 0xd8, 0x00, 0x00,
-         0x00, 0x01, 0x0f, 0x02, 0x3c, 0x01, 0x80, 0x10, 0x82, 0xb0, 0x40, 0x00, 0x00, 0x02, 0x1e, 0x04,
-         0x78, 0x07, 0x00, 0x21, 0x05, 0x61, 0x00, 0x00, 0x00, 0x04, 0x3c, 0x08, 0xf0, 0x16, 0x00, 0x42,
-         0x0a, 0xc3, 0x00, 0x00, 0x00, 0x08, 0x78, 0x11, 0xe0, 0x3c, 0x00, 0x84, 0x14, 0x00, 0x07, 0xe5,
-         0xc0, 0xa0, 0xd8, 0x42, 0x20, 0x02, 0x80, 0xa0, 0x02, 0x24, 0x47, 0xa0, 0x20, 0x27, 0xa1, 0x22,
-         0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x24, 0x41, 0x20, 0xc0, 0x80, 0x00, 0x20, 0x80,
-         0x00, 0x25, 0x20, 0xa0, 0x38, 0x00, 0x00, 0x00, 0x44, 0xa2, 0x82, 0x69, 0xee, 0x0c, 0xad, 0xca,
-         0x4c, 0x2c, 0x8d, 0x2e, 0x6f, 0x2e, 0x69, 0x2d, 0xce, 0x8c, 0xae, 0x4d, 0xcc, 0xae, 0x80, 0x00,
-         0x00, 0x00, 0x00, 0x00};
-      bufLen =196;
+      DU_LOG("\nINFO --> F1AP : Sending Registration accept");
+      char buf[14] ={0x00, 0x04, 0x2a, 0x80, 0xaf, 0xc0, 0x08, 0x40, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00};
+      bufLen =14;
       rrcContainer->size = bufLen;
       CU_ALLOC(rrcContainer->buf, rrcContainer->size);
       if(rrcContainer->buf != NULLP)
@@ -1621,6 +1579,13 @@ uint8_t  BuildDLRRCContainer(CuUeCb *ueCb, uint8_t rrcMsgType, RRCContainer_t *rr
          ret = RFAILED;
       }
    }
+   else if(rrcMsgType == UE_CONTEXT_SETUP_RSP)
+   {
+      DU_LOG("\nINFO --> F1AP : Filling DL DCCH RRC Message for RRC Reconfiguration ");
+      ret = fillDlDcchRrcMsg(ueCb, rrcContainer);
+      if(ret == RFAILED)
+         DU_LOG("\nERROR  -->  F1AP: Failed to fill DL-DCCH Msg for RRC Reconfiguration");
+   }
 
    return ret;
 }
@@ -1830,4593 +1795,7150 @@ uint8_t setDlRRCMsgType(CuUeCb *ueCb)
       case RRC_SETUP:
          rrcMsgType = RRC_SETUP;
          break;
-      case REGISTRATION_ACCEPT:
-         rrcMsgType = REGISTRATION_ACCEPT;
+      case RRC_SETUP_COMPLETE:
+         rrcMsgType = RRC_SETUP_COMPLETE;
          break;
-      case UE_CONTEXT_SETUP_REQ:
-         rrcMsgType = UE_CONTEXT_SETUP_REQ;
+      case NAS_SECURITY_MODE_COMPLETE:
+         rrcMsgType = NAS_SECURITY_MODE_COMPLETE;
          break;
-      case SECURITY_MODE_COMPLETE:
-         rrcMsgType = SECURITY_MODE_COMPLETE;
+      case RRC_SECURITY_MODE_COMPLETE:
+         rrcMsgType = RRC_SECURITY_MODE_COMPLETE;
          break;
-      case RRC_RECONFIG:
-         rrcMsgType = RRC_RECONFIG;
+      case REGISTRATION_COMPLETE:
+         rrcMsgType = REGISTRATION_COMPLETE;
+         break;
+      case UE_CONTEXT_SETUP_RSP:
+         rrcMsgType = UE_CONTEXT_SETUP_RSP;
          break;
       case RRC_RECONFIG_COMPLETE:
          rrcMsgType = RRC_RECONFIG_COMPLETE;
          break;
-      case UE_CONTEXT_MOD_REQ:
-         rrcMsgType = UE_CONTEXT_MOD_REQ;
-         break;
       default:
          break;
    }
    return rrcMsgType;   
 }
 
+#ifdef NR_DRX
 /*******************************************************************
  *
- * @brief Function to build Initial UL RRC Message
+ * @brief fill long cycle offset value of drx
  *
  * @details
  *
- *    Function : procInitULRRCMsg
+ *    Function : fillLongCycleOffsetValue
  *
- *    Functionality: Function to build Initial UL RRC Message
+ *    Functionality: fill long cycle offset value of drx
  *
- * @params[in] 
+ * @params[in] DrxLongCycleStartOffset  drxLongCycleStartOffset,
+ * struct DRX_ConfigRrc__drx_LongCycleStartOffset recvedLongCycleOffsetVal 
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-
-uint8_t procInitULRRCMsg(uint32_t duId, F1AP_PDU_t *f1apMsg)
+void fillLongCycleOffsetValue(DrxLongCycleStartOffset *drxLongCycleStartOffset, struct DRX_ConfigRrc__drx_LongCycleStartOffset *recvedLongCycleOffsetVal)
 {
-   uint8_t idx, rrcMsgType, gnbDuUeF1apId;
-   uint8_t ret =ROK;
-   uint32_t nrCellId, crnti;
-   DuDb     *duDb;
-   CuCellCb *cellCb;
-   CuUeCb   *ueCb;
-   InitialULRRCMessageTransfer_t *initULRRCMsg = NULLP;
-
-   DU_LOG("\nINFO   -->  F1AP : filling the required values in DB in procInitULRRCMsg");
-
-   duDb = getDuDb(duId);
-   initULRRCMsg = &f1apMsg->choice.initiatingMessage->value.choice.InitialULRRCMessageTransfer;
 
-   for(idx=0; idx < initULRRCMsg->protocolIEs.list.count; idx++)
+   drxLongCycleStartOffset->drxLongCycleStartOffsetChoice = recvedLongCycleOffsetVal->present;
+   switch(recvedLongCycleOffsetVal->present)
    {
-      switch(initULRRCMsg->protocolIEs.list.array[idx]->id)
-      {
-         case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
-            gnbDuUeF1apId = initULRRCMsg->protocolIEs.list.array[idx]->value.choice.GNB_DU_UE_F1AP_ID;
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms10:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = recvedLongCycleOffsetVal->choice.ms10;
             break;
-
-         case ProtocolIE_ID_id_NRCGI:
-            nrCellId = initULRRCMsg->protocolIEs.list.array[idx]->value.choice.NRCGI.nRCellIdentity.buf[4] >>
-               initULRRCMsg->protocolIEs.list.array[idx]->value.choice.NRCGI.nRCellIdentity.bits_unused;
-            cellCb = getCellCb(duDb, nrCellId);
-            if(cellCb == NULLP)
-               return RFAILED;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms20:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = recvedLongCycleOffsetVal->choice.ms20;
             break;
-
-         case ProtocolIE_ID_id_C_RNTI:
-            crnti = initULRRCMsg->protocolIEs.list.array[idx]->value.choice.C_RNTI;
-            if(duDb->ueCb[gnbDuUeF1apId-1].gnbDuUeF1apId == 0)
-            {
-               ueCb = &duDb->ueCb[gnbDuUeF1apId-1];
-               memset(ueCb, 0, sizeof(CuUeCb));
-               ueCb->cellCb = cellCb;
-               ueCb->crnti = crnti;
-               ueCb->gnbDuUeF1apId = gnbDuUeF1apId;
-               ueCb->gnbCuUeF1apId = ++cuCb.gnbCuUeF1apIdGenerator;
-               ueCb->state = ATTACH_IN_PROGRESS;
-               (duDb->numUe)++;
-
-               cellCb->ueCb[cellCb->numUe] = ueCb;
-               cellCb->numUe++;
-            }
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms32:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = recvedLongCycleOffsetVal->choice.ms32;
             break;
-
-         case ProtocolIE_ID_id_RRCContainer:
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms40:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = recvedLongCycleOffsetVal->choice.ms40;
             break;
-
-         case ProtocolIE_ID_id_DUtoCURRCContainer:
-            {
-               if((initULRRCMsg->protocolIEs.list.array[idx]->value.choice.DUtoCURRCContainer.size > 0) && \
-                  (initULRRCMsg->protocolIEs.list.array[idx]->value.choice.DUtoCURRCContainer.buf != NULLP))
-               {
-                  DU_LOG("\nINFO  -->  Received Du to Cu RRC Container ");
-                  ueCb->f1apMsgDb.duToCuContainer.size = initULRRCMsg->protocolIEs.list.array[idx]->value.choice.DUtoCURRCContainer.size;
-                  CU_ALLOC(ueCb->f1apMsgDb.duToCuContainer.buf, ueCb->f1apMsgDb.duToCuContainer.size);
-                  if(ueCb->f1apMsgDb.duToCuContainer.buf != NULLP)
-                  { 
-                     memcpy(ueCb->f1apMsgDb.duToCuContainer.buf, \
-                        initULRRCMsg->protocolIEs.list.array[idx]->value.choice.DUtoCURRCContainer.buf, \
-                        ueCb->f1apMsgDb.duToCuContainer.size);
-                  }
-               }
-               else
-               {
-                  DU_LOG("\nERROR  -->  Failed to receive Du to Cu RRC Container ");
-                  ret = RFAILED;
-               }
-               break;
-            }
-
-         default:
-            DU_LOG("\nERROR  -->  Invalid Event %ld", initULRRCMsg->protocolIEs.list.array[idx]->id);
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms60:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = recvedLongCycleOffsetVal->choice.ms60;
             break;
-      }
-   }
-
-   if(ret == ROK)
-   {
-      ueCb->f1apMsgDb.dlRrcMsgCount++;
-      rrcMsgType = setDlRRCMsgType(ueCb);
-      ret = BuildAndSendDLRRCMessageTransfer(duId, ueCb, SRB0, rrcMsgType);
-   }
-   return ret;
-}
-
-/*******************************************************************
- *
- * @brief Builds Nrcgi 
- *
- * @details
- *
- *    Function : BuildNrcgi
- *
- *    Functionality: Building the PLMN ID and NR Cell id
- *
- * @params[in] NRCGI_t *nrcgi
- * @return ROK     - success
- *         RFAILED - failure
- *
- * ****************************************************************/
-uint8_t BuildNrcgi(NRCGI_t *nrcgi, uint32_t nrCellId)
-{
-   uint8_t ret;
-   uint8_t unused_bits = 4;
-   uint8_t byteSize = 5;
-   uint8_t val = nrCellId << unused_bits;
-
-   /* Allocate Buffer Memory */
-   nrcgi->pLMN_Identity.size = 3 * sizeof(uint8_t);
-   CU_ALLOC(nrcgi->pLMN_Identity.buf, nrcgi->pLMN_Identity.size);
-   if(nrcgi->pLMN_Identity.buf == NULLP)
-   {
-      return RFAILED;
-   }
-   ret = buildPlmnId(cuCb.cuCfgParams.plmn , nrcgi->pLMN_Identity.buf);
-
-   if(ret != ROK)
-   {
-      return RFAILED;
-   }
-   nrcgi->nRCellIdentity.size = byteSize * sizeof(uint8_t);
-   CU_ALLOC(nrcgi->nRCellIdentity.buf, nrcgi->nRCellIdentity.size); 
-   if(nrcgi->nRCellIdentity.buf == NULLP)
-   {
-      return RFAILED;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms64:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = recvedLongCycleOffsetVal->choice.ms64;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms70:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = recvedLongCycleOffsetVal->choice.ms70;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms80:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = recvedLongCycleOffsetVal->choice.ms80;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms128:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = recvedLongCycleOffsetVal->choice.ms128;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms160:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = recvedLongCycleOffsetVal->choice.ms160;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms256:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = recvedLongCycleOffsetVal->choice.ms256;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms320:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = recvedLongCycleOffsetVal->choice.ms320;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms512:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = recvedLongCycleOffsetVal->choice.ms512;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms640:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = recvedLongCycleOffsetVal->choice.ms640;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms1024:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = recvedLongCycleOffsetVal->choice.ms1024;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms1280:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = recvedLongCycleOffsetVal->choice.ms1280;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms2048:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = recvedLongCycleOffsetVal->choice.ms2048;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms2560:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = recvedLongCycleOffsetVal->choice.ms2560;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms5120:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = recvedLongCycleOffsetVal->choice.ms5120;
+            break;
+         }
+      case DRX_ConfigRrc__drx_LongCycleStartOffset_PR_ms10240:
+         {
+            drxLongCycleStartOffset->drxLongCycleStartOffsetVal = recvedLongCycleOffsetVal->choice.ms10240;
+            break;
+         }
+      default :
+         break;
    }
-   fillBitString(&nrcgi->nRCellIdentity, unused_bits, byteSize, val);
-
-   return ROK;
 }
-/*******************************************************************
- *
- * @brief Builds Special cell list for UE Setup Request 
- *
- * @details
- *
- *    Function : BuildSplCellList
- *
- *    Functionality: Constructs the Special Cell list for UESetReq
- *
- * @params[in] SCell_ToBeSetup_List_t *spCellLst
- *
- * @return ROK     - success
- *         RFAILED - failure
- *
- * ****************************************************************/
-uint8_t BuildSplCellList(CuUeCb *ueCb, SCell_ToBeSetup_List_t *spCellLst)
-{
-   uint8_t  cellCnt;
-   uint8_t  idx;
-   uint8_t  ret;
-   cellCnt = 1;
-   spCellLst->list.count = cellCnt;
-   spCellLst->list.size = cellCnt * sizeof(SCell_ToBeSetup_ItemIEs_t *);
-   CU_ALLOC(spCellLst->list.array,spCellLst->list.size);
-   if(spCellLst->list.array == NULLP)
-   {
-      return RFAILED;
-   }
-   for(idx=0; idx<cellCnt; idx++)
-   {
-      CU_ALLOC(spCellLst->list.array[idx],sizeof(SCell_ToBeSetup_ItemIEs_t));
-      if(spCellLst->list.array[idx] == NULLP)
-      {
-        return RFAILED;
-      }
-   }
-   idx = 0;
-   spCellLst->list.array[idx]->id = ProtocolIE_ID_id_SCell_ToBeSetup_Item;
-   spCellLst->list.array[idx]->criticality = Criticality_ignore;
-   spCellLst->list.array[idx]->value.present = SCell_ToBeSetup_ItemIEs__value_PR_SCell_ToBeSetup_Item;
-
-   /* Special Cell ID -NRCGI */
-   ret = BuildNrcgi(&spCellLst->list.array[idx]->value.choice.SCell_ToBeSetup_Item.sCell_ID, ueCb->cellCb->nrCellId);
-   if(ret != ROK)
-   {
-      return RFAILED;
-   }
-   /*Special Cell Index*/
-   spCellLst->list.array[idx]->value.choice.SCell_ToBeSetup_Item.sCellIndex = 1;
-   return ROK; 
-}/* End of BuildSplCellList*/
 
 /*******************************************************************
  *
- * @brief Builds SRBS to be setup 
+ * @brief Extract configuration from DRX_ConfigRrc 
+ *    and store the drx configuration in UeCb
  *
  * @details
  *
- *    Function : BuildSRBSetup
- *
- *    Functionality: Constructs the SRB's for UESetReq
+ *    Function : storeDrxCfgInUeCb 
  *
- * @params[in] SRBs_ToBeSetup_List_t *srbSet
+ *    Functionality: Store drx configuration in UeCb 
  *
- * @return ROK     - success
- *         RFAILED - failure
+ * @params[in] (struct DRX_ConfigRrc *setup, DrxCfg *drxCfg) 
  *
+ * @return void 
  * ****************************************************************/
-uint8_t BuildSRBSetup(SRBs_ToBeSetup_List_t *srbSet)
+void storeDrxCfgInUeCb(struct DRX_ConfigRrc *drxSetup, DrxCfg *drxCfg)
 {
-   uint8_t idx;
-   uint8_t srbCnt;
-
-   srbCnt = 1;
-   srbSet->list.count = srbCnt;
-   srbSet->list.size = srbCnt*sizeof(SRBs_ToBeSetup_ItemIEs_t *);
-   CU_ALLOC(srbSet->list.array,srbSet->list.size);
-   if(srbSet->list.array == NULLP)
+   switch(drxSetup->drx_onDurationTimer.present)
    {
-      return RFAILED;
+      case DRX_ConfigRrc__drx_onDurationTimer_PR_NOTHING:
+         break;
+      case DRX_ConfigRrc__drx_onDurationTimer_PR_milliSeconds:
+         {
+            drxCfg->drxOnDurationTimer.onDurationTimerValInMs = true;
+            drxCfg->drxOnDurationTimer.onDurationtimerValue.milliSeconds=drxSetup->drx_onDurationTimer.choice.milliSeconds;
+            break;
+         }
+      case DRX_ConfigRrc__drx_onDurationTimer_PR_subMilliSeconds:
+         {
+            drxCfg->drxOnDurationTimer.onDurationTimerValInMs = false;
+            drxCfg->drxOnDurationTimer.onDurationtimerValue.subMilliSeconds = drxSetup->drx_onDurationTimer.choice.subMilliSeconds;
+            break;
+         }
    }
-
-   for(idx=0; idx<srbCnt; idx++)
+   fillLongCycleOffsetValue(&drxCfg->drxLongCycleStartOffset, &drxSetup->drx_LongCycleStartOffset);
+   drxCfg->drxInactivityTimer = drxSetup->drx_InactivityTimer;
+   drxCfg->drxHarqRttTimerDl = drxSetup->drx_HARQ_RTT_TimerDL;
+   drxCfg->drxHarqRttTimerUl = drxSetup->drx_HARQ_RTT_TimerUL;
+   drxCfg->drxRetransmissionTimerDl = drxSetup->drx_RetransmissionTimerDL;
+   drxCfg->drxRetransmissionTimerUl = drxSetup->drx_RetransmissionTimerUL;
+   drxCfg->drxSlotOffset = drxSetup->drx_SlotOffset;
+   if(drxSetup->shortDRX) 
    {
-      CU_ALLOC(srbSet->list.array[idx],sizeof(SRBs_ToBeSetup_ItemIEs_t));
-      if(srbSet->list.array[idx] == NULLP)
-      {
-        return RFAILED;
-      }
+      drxCfg->shortDrxPres=true;
+      drxCfg->shortDrx.drxShortCycle = drxSetup->shortDRX->drx_ShortCycle;
+      drxCfg->shortDrx.drxShortCycleTimer = drxSetup->shortDRX->drx_ShortCycleTimer;
    }
-
-   idx = 0;
-   srbSet->list.array[idx]->id = ProtocolIE_ID_id_SRBs_ToBeSetup_Item;
-   srbSet->list.array[idx]->criticality = Criticality_ignore;
-   srbSet->list.array[idx]->value.present = SRBs_ToBeSetup_ItemIEs__value_PR_SRBs_ToBeSetup_Item;
-   srbSet->list.array[idx]->value.choice.SRBs_ToBeSetup_Item.sRBID = 2;
-   return ROK;
-}/* End of BuildSRBSetup*/
+   else
+      drxCfg->shortDrxPres=false;
+}
+#endif
 
 /*******************************************************************
  *
- * @brief Builds QOS Info for DRB Setum Item 
+ * @brief Extract configuration from CellGroupConfig
  *
  * @details
  *
- *    Function : BuildQOSInfo
+ *    Function : extractCellGroupConfig
  *
- *    Functionality: Constructs the QOS Info for DRB Setup Item
+ *    Functionality: Extract configuration from CellGroupConfig
+ *        and store in local database
  *
- * @params[in] QoSInformation_t *qosinfo
- *             int16_t pduSessionID
+ * @params[in] UE control block
+ *             Cell Group Config 
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildQOSInfo(QoSFlowLevelQoSParameters_t *drbQos, uint8_t actionType, \
-                        int16_t pduSessionID)
+uint8_t extractCellGroupConfig(CuUeCb *ueCb, CellGroupConfigRrc_t *cellGrpCfg)
 {
-   uint8_t elementCnt = 0, qosCntIdx = 0;
-   ProtocolExtensionContainer_4624P74_t *qosIeExt = NULLP;
+   uint8_t rbIdx, srbIdx, drbIdx;
+   bool    srbFound, drbFound;
+   SrbInfo *srbCfgDb = NULLP;
+   DrbInfo *drbCfgDb = NULLP;
+   RlcLcCfg *rlcLcCfgDb = NULLP;
+   MacLcCfg *macLcCfgDb = NULLP;
+   RLC_BearerConfig_t *rlcCfg = NULLP;
+   RLC_Config_t *rlcLcCfg = NULLP;
+   LogicalChannelConfig_t *macLcCfg = NULLP;
+#ifdef NR_DRX
+   DrxCfg    drxCfg;
+#endif
 
-   /* NonDynamic5QIDescriptor */
-   drbQos->qoS_Characteristics.present = QoS_Characteristics_PR_non_Dynamic_5QI;
-   CU_ALLOC(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI,sizeof(NonDynamic5QIDescriptor_t));
-   if(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI == NULLP)
+   if(ueCb == NULLP)
    {
+      DU_LOG("\nERROR  -->  F1AP: extractCellGroupConfig(): UE Cb is NULL");
       return RFAILED;
    }
-   /*FiveQI*/
-   if(actionType == ProtocolIE_ID_id_DRBs_ToBeModified_Item)
-      drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->fiveQI = FIVE_QI_VALUE8;
-   else
-      drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->fiveQI = FIVE_QI_VALUE9;
 
-   /*AveragingWindow*/
-   CU_ALLOC(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow,\
-         sizeof(AveragingWindow_t));
-   if(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow == \
-         NULLP)
+   if(cellGrpCfg == NULLP)
    {
+      DU_LOG("\nERROR  -->  F1AP: extractCellGroupConfig(): cellGrpCfg is NULL");
       return RFAILED;
    }
-   *(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow) = 0;
-   /*MaxDataBurstVolume*/
-   CU_ALLOC(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume,\
-         sizeof(MaxDataBurstVolume_t));
-   if(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume == \
-         NULLP)
+
+#ifdef NR_DRX
+   if(cellGrpCfg->mac_CellGroupConfig)
    {
-      return RFAILED;
-   }
-   *(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume) = 0;
+      if(cellGrpCfg->mac_CellGroupConfig->drx_ConfigRrc)
+      {
+         switch(cellGrpCfg->mac_CellGroupConfig->drx_ConfigRrc->present)
+         {
+            case MAC_CellGroupConfig__drx_ConfigRrc_PR_NOTHING:
+               break;
 
-   /*nRGRAN Allocation Retention Priority*/
-   drbQos->nGRANallocationRetentionPriority.priorityLevel = PriorityLevel_lowest;
-   drbQos->nGRANallocationRetentionPriority.pre_emptionCapability = Pre_emptionCapability_may_trigger_pre_emption;
-   drbQos->nGRANallocationRetentionPriority.pre_emptionVulnerability = Pre_emptionVulnerability_not_pre_emptable;
+            case MAC_CellGroupConfig__drx_ConfigRrc_PR_setup:
+            {
+               if(cellGrpCfg->mac_CellGroupConfig->drx_ConfigRrc->choice.setup)
+               {
+                  ueCb->drxCfgPresent = true;  
+                  storeDrxCfgInUeCb(cellGrpCfg->mac_CellGroupConfig->drx_ConfigRrc->choice.setup, &ueCb->drxCfg);
+               }
+               break;
+            }
 
-   /*If PDU Session ID is INVALID thus not to be included in Qos IE, skip the PDU Session IE */
-   if(pduSessionID <= INVALID_PDU_SESSION_ID)
-   {
-      DU_LOG("\nINFO  --> F1AP : Invalid PDU_SESSION_ID");
-      return ROK;
+            case MAC_CellGroupConfig__drx_ConfigRrc_PR_release:
+               break;
+         }
+      }
    }
+#endif
 
-   CU_ALLOC(drbQos->iE_Extensions, sizeof(ProtocolExtensionContainer_4624P74_t));
-   qosIeExt = (ProtocolExtensionContainer_4624P74_t *)drbQos->iE_Extensions;
-
-   if(qosIeExt)
+   for(rbIdx = 0; rbIdx < cellGrpCfg->rlc_BearerToAddModList->list.count; rbIdx++)
    {
-      elementCnt = NUM_QOS_EXT;
-      qosIeExt->list.count = elementCnt;
-      qosIeExt->list.size = elementCnt * sizeof(QoSFlowLevelQoSParameters_ExtIEs_t *);
+      srbFound = false;
+      drbFound = false;
 
-      /*Initialize QoSFlowLevelQoSParameters_ExtIEs_t*/
-      CU_ALLOC(qosIeExt->list.array, qosIeExt->list.size);
+      rlcCfg = cellGrpCfg->rlc_BearerToAddModList->list.array[rbIdx];
 
-      if(qosIeExt->list.array == NULLP)
+      /* Update SRB configuration in local DB */
+      if(rlcCfg->servedRadioBearer->present == RLC_BearerConfig__servedRadioBearer_PR_srb_Identity)
       {
-         DU_LOG("\nERROR  -->  F1AP : Memory allocation for QoSFlowLevelQoSParameters_ExtIEs_t failed");
-         return  RFAILED;
+         /* Search if SRB entry is already present in DB */
+         for(srbIdx = 0; srbIdx < ueCb->numSrb; srbIdx++)
+         {
+            if(ueCb->srbList[srbIdx].srbId == rlcCfg->servedRadioBearer->choice.srb_Identity)
+            {
+              srbCfgDb = &ueCb->srbList[srbIdx];
+              srbFound = true; 
+              break;
+            }
+         }
+
+         /* If not, add SRB to UE CB's SRB list */
+         if(!srbFound)
+         {
+            ueCb->srbList[ueCb->numSrb].srbId = rlcCfg->servedRadioBearer->choice.srb_Identity;
+            srbCfgDb = &ueCb->srbList[ueCb->numSrb];
+            ueCb->numSrb++;
+         }
+
+         srbCfgDb->lcId = rlcCfg->logicalChannelIdentity;
+         srbCfgDb->cfgSentToUe = false;
+         rlcLcCfgDb = &srbCfgDb->rlcLcCfg;
+         macLcCfgDb = &srbCfgDb->macLcCfg;
       }
 
-      for(qosCntIdx=0; qosCntIdx < elementCnt; qosCntIdx++)
-      {
-         CU_ALLOC(qosIeExt->list.array[qosCntIdx], sizeof(QoSFlowLevelQoSParameters_ExtIEs_t));
-         if(qosIeExt->list.array[qosCntIdx] == NULLP)
+      /* Update DRB configuration in local DB */
+      if(rlcCfg->servedRadioBearer->present == RLC_BearerConfig__servedRadioBearer_PR_drb_Identity)
+      {     
+         /* Search if DRB entry is already present in DB */
+         for(drbIdx = 0; drbIdx < ueCb->numDrb; drbIdx++)
          {
-            DU_LOG("\nERROR  -->       F1AP : Memory allocation for QoSFlowLevelQoSParameters_ExtIEs_t array failed");
-            return  RFAILED;
+            if(ueCb->drbList[drbIdx].drbId == rlcCfg->servedRadioBearer->choice.drb_Identity)
+            {
+              drbCfgDb = &ueCb->drbList[drbIdx];
+              drbFound = true; 
+              break;
+            }
+         }
+
+         /* If not, add DRB to UE CB's SRB list */
+         if(!drbFound)
+         {
+            ueCb->drbList[ueCb->numDrb].drbId = rlcCfg->servedRadioBearer->choice.drb_Identity;
+            drbCfgDb = &ueCb->drbList[ueCb->numDrb];
+            ueCb->numDrb++;
          }
-         /*Filling QoSFlowLevelQoSParameters_ExtIEs_t*/
-         qosIeExt->list.array[qosCntIdx]->id = ProtocolIE_ID_id_PDUSessionID;
-         /*Below Criticality mentioned in Spec38.473, 15.4.1 and later*/
-         qosIeExt->list.array[qosCntIdx]->criticality = Criticality_ignore; 
-         qosIeExt->list.array[qosCntIdx]->extensionValue.present = \
-                                                                   QoSFlowLevelQoSParameters_ExtIEs__extensionValue_PR_PDUSessionID;
-         qosIeExt->list.array[qosCntIdx]->extensionValue.choice.PDUSessionID = (PDUSessionID_t)pduSessionID;
+
+         drbCfgDb->lcId = rlcCfg->logicalChannelIdentity;
+         drbCfgDb->cfgSentToUe = false;
+         rlcLcCfgDb = &drbCfgDb->rlcLcCfg;
+         macLcCfgDb = &drbCfgDb->macLcCfg;
       }
-   }
-   else
-   {
-      DU_LOG("\nERROR  -->     F1AP : Memory allocation for QosIE_extension failed");
-      return RFAILED;
-   }
 
-   return ROK;
-}/*End of BuildQOSInfo*/
+
+      /* Update RLC configuration for this RB */
+      rlcLcCfg = rlcCfg->rlc_Config;
+      rlcLcCfgDb->rlcMode = rlcLcCfg->present;
+      switch(rlcLcCfgDb->rlcMode)
+      {
+         case RLC_Config_PR_am:
+            {
+               rlcLcCfgDb->u.amCfg.ulAmCfg.snLenUl = *(rlcLcCfg->choice.am->ul_AM_RLC.sn_FieldLength);
+               rlcLcCfgDb->u.amCfg.ulAmCfg.pollRetxTmr = rlcLcCfg->choice.am->ul_AM_RLC.t_PollRetransmit ;
+               rlcLcCfgDb->u.amCfg.ulAmCfg.pollPdu = rlcLcCfg->choice.am->ul_AM_RLC.pollPDU ;
+               rlcLcCfgDb->u.amCfg.ulAmCfg.pollByte = rlcLcCfg->choice.am->ul_AM_RLC.pollByte ;
+               rlcLcCfgDb->u.amCfg.ulAmCfg.maxRetxTh = rlcLcCfg->choice.am->ul_AM_RLC.maxRetxThreshold ;
+
+               rlcLcCfgDb->u.amCfg.dlAmCfg.snLenDl = *(rlcLcCfg->choice.am->dl_AM_RLC.sn_FieldLength);
+               rlcLcCfgDb->u.amCfg.dlAmCfg.reAssemTmr = rlcLcCfg->choice.am->dl_AM_RLC.t_Reassembly;
+               rlcLcCfgDb->u.amCfg.dlAmCfg.statProhTmr = rlcLcCfg->choice.am->dl_AM_RLC.t_StatusProhibit;
+               break;
+            }
+
+         case RLC_Config_PR_um_Bi_Directional:
+            {
+               rlcLcCfgDb->u.umBiDirCfg.ulUmCfg.snLenUlUm = *(rlcLcCfg->choice.um_Bi_Directional->ul_UM_RLC.sn_FieldLength);
+
+               rlcLcCfgDb->u.umBiDirCfg.dlUmCfg.snLenDlUm = *(rlcLcCfg->choice.um_Bi_Directional->dl_UM_RLC.sn_FieldLength);
+               rlcLcCfgDb->u.umBiDirCfg.dlUmCfg.reAssemTmr = rlcLcCfg->choice.um_Bi_Directional->dl_UM_RLC.t_Reassembly;
+               break;
+            }
+      }
+
+      /* Update MAC configuration for this LC */
+      macLcCfg = rlcCfg->mac_LogicalChannelConfig;
+      macLcCfgDb->priority = macLcCfg->ul_SpecificParameters->priority ;
+      macLcCfgDb->lcGroup = *(macLcCfg->ul_SpecificParameters->logicalChannelGroup) ;
+      macLcCfgDb->schReqId = *(macLcCfg->ul_SpecificParameters->schedulingRequestID) ;
+      macLcCfgDb->pbr = macLcCfg->ul_SpecificParameters->prioritisedBitRate ;
+      macLcCfgDb->bsd = macLcCfg->ul_SpecificParameters->bucketSizeDuration ;
+   }
+   return ROK;   
+}
 
 /*******************************************************************
  *
- * @brief Builds SNSSAI  
+ * @brief Function to decode DU to CU RRC container
  *
  * @details
  *
- *    Function : BuildSNSSAI
+ *    Function : extractDuToCuRrcCont
  *
- *    Functionality: Constructs the SNSSAI For DRB list
+ *    Functionality: Function to decode DU to CU RRC container
  *
- * @params[in] SNSSAI_t *snssai
- *             Snssai  *snssaiToCopy S-NSSAI from CuCfgParam to be copied
+ * @params[in] UE Cb
+ *             RRC conatiner octect string to be decoded
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildSNSSAI(SNSSAI_t *snssai, Snssai *snssaiToCopy)
+uint8_t extractDuToCuRrcCont(CuUeCb *ueCb, OCTET_STRING_t rrcCont)
 {
-   /*SNSSAI*/
-   /*ssT*/
-   snssai->sST.size = sizeof(uint8_t);
-   CU_ALLOC(snssai->sST.buf,snssai->sST.size);
-   if(snssai->sST.buf == NULLP)
-   {
-      return RFAILED;
-   }
-   memcpy(snssai->sST.buf, &snssaiToCopy->sst, snssai->sST.size);
-   /*sD*/
-   CU_ALLOC(snssai->sD,sizeof(OCTET_STRING_t));
-   if(snssai->sD == NULLP)
+   CellGroupConfigRrc_t  cellGrpCfg, *cellGrpCfgMsg = NULLP;
+   asn_dec_rval_t rval; /* Decoder return value */
+
+   /* Copy the received container to UeCb */
+   memcpy(&ueCb->f1apMsgDb.duToCuContainer, &rrcCont, sizeof(OCTET_STRING_t));
+
+   /* Decoding DU to CU RRC container octet string to cell group config */
+   cellGrpCfgMsg = &cellGrpCfg;
+   memset(cellGrpCfgMsg, 0, sizeof(CellGroupConfigRrc_t));
+
+   rval = aper_decode(0, &asn_DEF_CellGroupConfigRrc, (void **)&cellGrpCfgMsg, rrcCont.buf, rrcCont.size, 0, 0);
+
+   if(rval.code == RC_FAIL || rval.code == RC_WMORE)
    {
+      DU_LOG("\nERROR  -->  F1AP : ASN decode failed in extractDuToCuRrcCont");
       return RFAILED;
    }
-   snssai->sD->size = 3*sizeof(uint8_t);
-   CU_ALLOC(snssai->sD->buf,snssai->sD->size);
-   if(snssai->sD->buf == NULLP)
+   printf("\n");
+   xer_fprint(stdout, &asn_DEF_CellGroupConfigRrc, cellGrpCfgMsg);
+
+   if((extractCellGroupConfig(ueCb, cellGrpCfgMsg)) != ROK)
    {
+      DU_LOG("\nERROR  -->  F1AP : Failed to extract cell group config");
       return RFAILED;
    }
-   memcpy(snssai->sD->buf, snssaiToCopy->sd, snssai->sD->size);
+  
    return ROK;
-}/*End of BuildSNSSAI*/
+}
 
 /*******************************************************************
  *
- * @brief Builds the flow map.  
+ * @brief Function to build Initial UL RRC Message
  *
  * @details
  *
- *    Function : BuildFlowsMap
+ *    Function : procInitULRRCMsg
  *
- *    Functionality: Constructs the flowmap For DRB list
+ *    Functionality: Function to build Initial UL RRC Message
  *
- * @params[in] Flows_Mapped_To_DRB_List_t *flowMap
+ * @params[in] 
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildFlowsMap(Flows_Mapped_To_DRB_List_t *flowMap , uint8_t actionType)
+
+uint8_t procInitULRRCMsg(uint32_t duId, F1AP_PDU_t *f1apMsg)
 {
-   uint8_t  ret = ROK, idx = 0, flowCnt = 0;
+   uint8_t idx = 0, duIdx=0, rrcMsgType=0, gnbDuUeF1apId=0;
+   uint8_t ret =ROK;
+   uint16_t cellIdx=0, nrCellId = 0;
+   uint32_t crnti;
+   DuDb     *duDb;
+   CuCellCb *cellCb;
+   CuUeCb   *ueCb;
+   InitialULRRCMessageTransfer_t *initULRRCMsg = NULLP;
 
-   flowCnt = 1;
-   flowMap->list.count = flowCnt;
-   flowMap->list.size = flowCnt * sizeof(Flows_Mapped_To_DRB_Item_t *);
-   CU_ALLOC(flowMap->list.array,flowMap->list.size);
-   if(flowMap->list.array == NULLP)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed for array in BuildFlowsMap()");
-      return RFAILED;
-   }
-   for(idx=0; idx<flowCnt; idx++)
+   DU_LOG("\nINFO   -->  F1AP : filling the required values in DB in procInitULRRCMsg");
+   
+   SEARCH_DU_DB(duIdx, duId, duDb); 
+   initULRRCMsg = &f1apMsg->choice.initiatingMessage->value.choice.InitialULRRCMessageTransfer;
+
+   for(idx=0; idx < initULRRCMsg->protocolIEs.list.count; idx++)
    {
-      CU_ALLOC(flowMap->list.array[idx],sizeof(Flows_Mapped_To_DRB_Item_t));
-      if(flowMap->list.array[idx] == NULLP)
+      switch(initULRRCMsg->protocolIEs.list.array[idx]->id)
       {
-         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed for arrayIdx[%d] in BuildFlowsMap()", idx);
-         return RFAILED;
+         case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
+            gnbDuUeF1apId = initULRRCMsg->protocolIEs.list.array[idx]->value.choice.GNB_DU_UE_F1AP_ID;
+            break;
+
+         case ProtocolIE_ID_id_NRCGI:
+            bitStringToInt(&initULRRCMsg->protocolIEs.list.array[idx]->value.choice.NRCGI.nRCellIdentity, &nrCellId);
+            SEARCH_CELL_DB(cellIdx, duDb, nrCellId, cellCb);
+            if(cellCb == NULLP)
+               return RFAILED;
+            break;
+
+         case ProtocolIE_ID_id_C_RNTI:
+            crnti = initULRRCMsg->protocolIEs.list.array[idx]->value.choice.C_RNTI;
+            if(duDb->ueCb[gnbDuUeF1apId-1].gnbDuUeF1apId == 0)
+            {
+               ueCb = &duDb->ueCb[gnbDuUeF1apId-1];
+               memset(ueCb, 0, sizeof(CuUeCb));
+               ueCb->cellCb = cellCb;
+               ueCb->crnti = crnti;
+               ueCb->gnbDuUeF1apId = gnbDuUeF1apId;
+               ueCb->gnbCuUeF1apId = ++cuCb.gnbCuUeF1apIdGenerator;
+               ueCb->state = UE_ATTACH_IN_PROGRESS;
+               (duDb->numUe)++;
+
+               cellCb->ueCb[cellCb->numUe] = ueCb;
+               cellCb->numUe++;
+            }
+            break;
+
+         case ProtocolIE_ID_id_RRCContainer:
+            break;
+
+         case ProtocolIE_ID_id_DUtoCURRCContainer:
+            {
+               if((initULRRCMsg->protocolIEs.list.array[idx]->value.choice.DUtoCURRCContainer.size > 0) && \
+                  (initULRRCMsg->protocolIEs.list.array[idx]->value.choice.DUtoCURRCContainer.buf != NULLP))
+               {
+                  DU_LOG("\nINFO  -->  Received Du to Cu RRC Container ");
+                  ueCb->f1apMsgDb.duToCuContainer.size = initULRRCMsg->protocolIEs.list.array[idx]->value.choice.DUtoCURRCContainer.size;
+                  CU_ALLOC(ueCb->f1apMsgDb.duToCuContainer.buf, ueCb->f1apMsgDb.duToCuContainer.size);
+                  if(ueCb->f1apMsgDb.duToCuContainer.buf != NULLP)
+                  { 
+                     memcpy(ueCb->f1apMsgDb.duToCuContainer.buf, \
+                        initULRRCMsg->protocolIEs.list.array[idx]->value.choice.DUtoCURRCContainer.buf, \
+                        ueCb->f1apMsgDb.duToCuContainer.size);
+                  }
+                  if((extractDuToCuRrcCont(ueCb, initULRRCMsg->protocolIEs.list.array[idx]->value.choice.DUtoCURRCContainer)) != ROK)
+                  {
+                     DU_LOG("\nERROR  --> F1AP : Failed to extract DU to CU RRC Container ");
+                     ret = RFAILED;
+                  }
+               }
+               else
+               {
+                  DU_LOG("\nERROR  -->  Failed to receive Du to Cu RRC Container ");
+                  ret = RFAILED;
+               }
+               break;
+            }
+
+         default:
+            DU_LOG("\nERROR  -->  Invalid Event %ld", initULRRCMsg->protocolIEs.list.array[idx]->id);
+            break;
       }
+      if(ret == RFAILED)
+         break;
    }
-   idx = 0;
-   flowMap->list.array[idx]->qoSFlowIdentifier = 0;
-   ret = BuildQOSInfo(&flowMap->list.array[idx]->qoSFlowLevelQoSParameters,\
-         actionType, INVALID_PDU_SESSION_ID);
-   if(ret != ROK)
+
+   if(ret == ROK)
    {
-      DU_LOG("\nERROR  -->  F1AP : Failed to Build QOS Info in BuildFlowsMap()");
-      return RFAILED;
+      ueCb->f1apMsgDb.dlRrcMsgCount++;
+      rrcMsgType = setDlRRCMsgType(ueCb);
+      ret = BuildAndSendDLRRCMessageTransfer(duId, ueCb, SRB0, rrcMsgType);
    }
-   return ROK;
-}/*End of BuildFlowsMap*/
+   return ret;
+}
 
 /*******************************************************************
  *
- * @brief Builds the Uplink Tunnel Info  
+ * @brief Builds Nrcgi 
  *
  * @details
  *
- *    Function : BuildULTnlInfo
- *
- *    Functionality: Constructs the UL TnlInfo For DRB list
+ *    Function : BuildNrcgi
  *
- * @params[in]  UPTNLInformation_ToBeSetup_List_t *ulInfo
+ *    Functionality: Building the PLMN ID and NR Cell id
  *
+ * @params[in] NRCGI_t *nrcgi
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildULTnlInfo(ULUPTNLInformation_ToBeSetup_List_t *ulInfo)
+uint8_t BuildNrcgi(NRCGI_t *nrcgi, uint32_t nrCellId)
 {
-   uint8_t idx;
-   uint8_t ulCnt;
-   ulCnt = 1;
-   ulInfo->list.count = ulCnt;
-   ulInfo->list.size = ulCnt * sizeof(ULUPTNLInformation_ToBeSetup_Item_t *);
-   CU_ALLOC(ulInfo->list.array,ulInfo->list.size);
-   if(ulInfo->list.array == NULLP)
-   {  
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed for array in BuildULTnlInfo()");
-      return RFAILED;
-   }
-   for(idx=0; idx<ulCnt; idx++)
-   {
-      CU_ALLOC(ulInfo->list.array[idx],sizeof(ULUPTNLInformation_ToBeSetup_Item_t));
-      if(ulInfo->list.array[idx] == NULLP)
-      {
-         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed for arrayIdx [%d] in BuildULTnlInfo()", idx);
-             return RFAILED;
-      }
-   }
-   idx = 0;
-   ulInfo->list.array[idx]->uLUPTNLInformation.present = \
-                                                        UPTransportLayerInformation_PR_gTPTunnel;
-   /*GTP TUNNEL*/
-   CU_ALLOC(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel,\
-        sizeof(GTPTunnel_t));
-   if(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel == NULLP)
+   uint8_t ret;
+   uint8_t unused_bits = 4;
+   uint8_t byteSize = 5;
+
+   /* Allocate Buffer Memory */
+   nrcgi->pLMN_Identity.size = 3 * sizeof(uint8_t);
+   CU_ALLOC(nrcgi->pLMN_Identity.buf, nrcgi->pLMN_Identity.size);
+   if(nrcgi->pLMN_Identity.buf == NULLP)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed for gTPTunnel in BuildULTnlInfo()");
       return RFAILED;
    }
-   ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-      transportLayerAddress.size       = 4*sizeof(uint8_t);
-   CU_ALLOC(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-        transportLayerAddress.buf,ulInfo->list.array[idx]->\
-        uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.size);
-   if(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-        transportLayerAddress.buf == NULLP)
+   ret = buildPlmnId(cuCb.cuCfgParams.plmn , nrcgi->pLMN_Identity.buf);
+
+   if(ret != ROK)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed for gtp tunnel arrayIdx[%d] in BuildULTnlInfo()", idx);
       return RFAILED;
    }
-   /* NOTE: Below IP address must be changed if running on different IP configuration */
-   ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-      transportLayerAddress.buf[0] = 192;
-   ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-      transportLayerAddress.buf[1] = 168;
-   ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-      transportLayerAddress.buf[2] = 130;
-   ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-      transportLayerAddress.buf[3] = 82;
-   ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-      transportLayerAddress.bits_unused = 0;
-   /*GTP TEID*/
-   ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.size\
-      = 4 * sizeof(uint8_t);
-   CU_ALLOC(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-        gTP_TEID.buf,ulInfo->list.array[idx]->uLUPTNLInformation.choice.\
-        gTPTunnel->gTP_TEID.size);
-   if(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf\
-        == NULLP)
+   nrcgi->nRCellIdentity.size = byteSize * sizeof(uint8_t);
+   CU_ALLOC(nrcgi->nRCellIdentity.buf, nrcgi->nRCellIdentity.size); 
+   if(nrcgi->nRCellIdentity.buf == NULLP)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed for gtp tunnel buffer in BuildULTnlInfo()");
       return RFAILED;
    }
-   ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-     gTP_TEID.buf[0] = 0;
-   ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-      gTP_TEID.buf[1] = 0;
-   ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-      gTP_TEID.buf[2] = 0;
-   ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->\
-      gTP_TEID.buf[3] = cuCb.cuCfgParams.egtpParams.currTunnelId++;
+   fillBitString(&nrcgi->nRCellIdentity, unused_bits, byteSize, nrCellId);
 
    return ROK;
-}/*End of BuildULTnlInfo*/
-
+}
 /*******************************************************************
  *
- * @brief Builds DRBS to be setup 
+ * @brief Builds Special cell list for UE Setup Request 
  *
  * @details
  *
- *    Function : BuildDRBSetup
+ *    Function : BuildSplCellList
  *
- *    Functionality: Constructs the DRB's for UESetReq
+ *    Functionality: Constructs the Special Cell list for UESetReq
  *
- * @params[in] DRBs_ToBeSetup_List_t *drbSet
+ * @params[in] SCell_ToBeSetup_List_t *spCellLst
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildDRBSetup(DRBs_ToBeSetup_List_t *drbSet)
+uint8_t BuildSplCellList(CuUeCb *ueCb, SCell_ToBeSetup_List_t *spCellLst)
 {
-   uint8_t BuildQOSInforet = 0,BuildSNSSAIret = 0, idx = 0;
-   uint8_t BuildFlowsMapret =0, BuildULTnlInforet =0, drbCnt = 0;
-   DRBs_ToBeSetup_Item_t *drbSetItem;
-   
-   drbCnt = MAX_DRB_SET_UE_CONTEXT_SETUP_REQ;
-   drbSet->list.count = drbCnt;
-   drbSet->list.size = drbCnt*sizeof(DRBs_ToBeSetup_ItemIEs_t *);
-   CU_ALLOC(drbSet->list.array,drbSet->list.size);
-   if(drbSet->list.array == NULLP)
+   uint8_t  cellCnt;
+   uint8_t  idx;
+   uint8_t  ret;
+   cellCnt = 1;
+   spCellLst->list.count = cellCnt;
+   spCellLst->list.size = cellCnt * sizeof(SCell_ToBeSetup_ItemIEs_t *);
+   CU_ALLOC(spCellLst->list.array,spCellLst->list.size);
+   if(spCellLst->list.array == NULLP)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDRBSetup");
       return RFAILED;
    }
-   for(idx=0; idx<drbCnt; idx++)
+   for(idx=0; idx<cellCnt; idx++)
    {
-      CU_ALLOC(drbSet->list.array[idx],sizeof(DRBs_ToBeSetup_ItemIEs_t));
-      if(drbSet->list.array[idx] == NULLP)
+      CU_ALLOC(spCellLst->list.array[idx],sizeof(SCell_ToBeSetup_ItemIEs_t));
+      if(spCellLst->list.array[idx] == NULLP)
       {
-         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDRBSetup for arry idx [%d]", idx);
-             return RFAILED;
+        return RFAILED;
       }
+   }
+   idx = 0;
+   spCellLst->list.array[idx]->id = ProtocolIE_ID_id_SCell_ToBeSetup_Item;
+   spCellLst->list.array[idx]->criticality = Criticality_ignore;
+   spCellLst->list.array[idx]->value.present = SCell_ToBeSetup_ItemIEs__value_PR_SCell_ToBeSetup_Item;
 
-      drbSet->list.array[idx]->id = ProtocolIE_ID_id_DRBs_ToBeSetup_Item;
-      drbSet->list.array[idx]->criticality = Criticality_ignore;
-      drbSet->list.array[idx]->value.present = \
-                                           DRBs_ToBeSetup_ItemIEs__value_PR_DRBs_ToBeSetup_Item;
-      drbSetItem = &drbSet->list.array[idx]->value.choice.DRBs_ToBeSetup_Item;
-      /*dRBID*/
-      drbSetItem->dRBID = idx + 1;
-      /*qoSInformation*/
-      drbSetItem->qoSInformation.present = QoSInformation_PR_choice_extension;
-      CU_ALLOC(drbSetItem->qoSInformation.choice.choice_extension,sizeof(QoSInformation_ExtIEs_t));
-      if(drbSetItem->qoSInformation.choice.choice_extension == NULLP)
-      {
-         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed for QOS choice extension in BuildDRBSetup");
-         return RFAILED;
-      }
-      drbSetItem->qoSInformation.choice.choice_extension->id = \
-                                                           ProtocolIE_ID_id_DRB_Information;
-      drbSetItem->qoSInformation.choice.choice_extension->criticality = \
-                                                                    Criticality_ignore;
-      drbSetItem->qoSInformation.choice.choice_extension->value.present = \
-                                                                      QoSInformation_ExtIEs__value_PR_DRB_Information;
-      BuildQOSInforet =  BuildQOSInfo(&drbSetItem->qoSInformation.choice.\
-                             choice_extension->value.choice.DRB_Information.dRB_QoS,\
-                         ProtocolIE_ID_id_DRBs_ToBeSetup_Item, PDU_SESSION_ID_1);
-      if(BuildQOSInforet != ROK)
-      {
-         DU_LOG("\nERROR  -->  F1AP : Failed to build QOS Info in BuildDRBSetup");
-         return RFAILED;
-      }
-      /*SNSSAI*/
-      BuildSNSSAIret = BuildSNSSAI(&drbSetItem->qoSInformation.choice.\
-                              choice_extension->value.choice.DRB_Information.sNSSAI, cuCb.snssaiList[0]);
-      if(BuildSNSSAIret != ROK)
-      {
-         DU_LOG("\nERROR  -->  F1AP : Failed to build SNSSAI Info in BuildDRBSetup");
-         return RFAILED;
-      }
-      /*Flows mapped to DRB List*/
-      BuildFlowsMapret = BuildFlowsMap(&drbSetItem->qoSInformation.choice.\
-                  choice_extension->value.choice.DRB_Information.flows_Mapped_To_DRB_List,\
-              ProtocolIE_ID_id_DRBs_ToBeSetup_Item);
-      if(BuildFlowsMapret != ROK)
-      {
-         DU_LOG("\nERROR  -->  F1AP : Failed to build Flow Map Info in BuildDRBSetup");
-         return RFAILED;
-      }
-      /*ULUPTNLInformation To Be Setup List*/
-      BuildULTnlInforet = BuildULTnlInfo(&drbSetItem->uLUPTNLInformation_ToBeSetup_List);
-      if(BuildULTnlInforet != ROK)
-      {
-         DU_LOG("\nERROR  -->  F1AP : Failed to build tunnel Info in BuildDRBSetup");
-         return RFAILED;
-      }
-      /*RLCMode*/
-      drbSetItem->rLCMode = RLCMode_rlc_um_bidirectional;
-  }
-   return ROK;
-}/* End of BuildDRBSetup*/
+   /* Special Cell ID -NRCGI */
+   ret = BuildNrcgi(&spCellLst->list.array[idx]->value.choice.SCell_ToBeSetup_Item.sCell_ID, ueCb->cellCb->nrCellId);
+   if(ret != ROK)
+   {
+      return RFAILED;
+   }
+   /*Special Cell Index*/
+   spCellLst->list.array[idx]->value.choice.SCell_ToBeSetup_Item.sCellIndex = 1;
+   return ROK; 
+}/* End of BuildSplCellList*/
 
 /*******************************************************************
  *
- * @brief Deallocating memory of function BuildAndSendUESetReq
+ * @brief Builds SRBS to be setup 
  *
  * @details
  *
- *    Function : FreeNrcgi
+ *    Function : BuildSRBSetup
  *
- *    Functionality: Deallocating memory for function BuildNrcgi
+ *    Functionality: Constructs the SRB's for UESetReq
  *
- * @params[in] NRCGI_t *nrcgi
+ * @params[in] SRBs_ToBeSetup_List_t *srbSet
  *
- * @return void
+ * @return ROK     - success
+ *         RFAILED - failure
  *
- *******************************************************************/
-void FreeNrcgi(NRCGI_t *nrcgi)
+ * ****************************************************************/
+uint8_t BuildSRBSetup(CuUeCb *ueCb, SRBs_ToBeSetup_List_t *srbSet)
 {
-   if(nrcgi->pLMN_Identity.buf != NULLP)
+   uint8_t idx;
+   uint8_t srbCnt;
+
+   if(ueCb->state == UE_HANDOVER_IN_PROGRESS)
+      srbCnt = ueCb->numSrb;
+   else
+      srbCnt = 1;
+   srbSet->list.count = srbCnt;
+   srbSet->list.size = srbCnt*sizeof(SRBs_ToBeSetup_ItemIEs_t *);
+   CU_ALLOC(srbSet->list.array,srbSet->list.size);
+   if(srbSet->list.array == NULLP)
    {
-      if(nrcgi->nRCellIdentity.buf != NULLP)
+      DU_LOG("\nERROR  --> F1AP : BuildSRBSetup() : Memory allocation failed for SRB to be setup list's array");
+      return RFAILED;
+   }
+
+   for(idx=0; idx<srbCnt; idx++)
+   {
+      CU_ALLOC(srbSet->list.array[idx],sizeof(SRBs_ToBeSetup_ItemIEs_t));
+      if(srbSet->list.array[idx] == NULLP)
       {
-        CU_FREE(nrcgi->nRCellIdentity.buf, nrcgi->nRCellIdentity.size); 
+         DU_LOG("\nERROR  --> F1AP : BuildSRBSetup() : Memory allocation failed for SRB to be setup list's array element");
+         return RFAILED;
       }
-      CU_FREE(nrcgi->pLMN_Identity.buf, nrcgi->pLMN_Identity.size);
    }
-}
+
+   if(ueCb->state != UE_HANDOVER_IN_PROGRESS)
+   {
+      idx = 0;
+      srbSet->list.array[idx]->id = ProtocolIE_ID_id_SRBs_ToBeSetup_Item;
+      srbSet->list.array[idx]->criticality = Criticality_ignore;
+      srbSet->list.array[idx]->value.present = SRBs_ToBeSetup_ItemIEs__value_PR_SRBs_ToBeSetup_Item;
+      srbSet->list.array[idx]->value.choice.SRBs_ToBeSetup_Item.sRBID = 2;
+      ueCb->srbList[ueCb->numSrb].srbId = srbSet->list.array[idx]->value.choice.SRBs_ToBeSetup_Item.sRBID;
+      ueCb->numSrb++;
+   }
+   else
+   {
+      for(idx=0; idx<srbCnt; idx++)
+      {
+         srbSet->list.array[idx]->id = ProtocolIE_ID_id_SRBs_ToBeSetup_Item;
+         srbSet->list.array[idx]->criticality = Criticality_ignore;
+         srbSet->list.array[idx]->value.present = SRBs_ToBeSetup_ItemIEs__value_PR_SRBs_ToBeSetup_Item;
+         srbSet->list.array[idx]->value.choice.SRBs_ToBeSetup_Item.sRBID = ueCb->srbList[idx].srbId; 
+      }
+   }
+   return ROK;
+}/* End of BuildSRBSetup*/
+
 /*******************************************************************
  *
- * @brief  Deallocating memory of function BuildAndSendUESetReq
+ * @brief Builds QOS Info for DRB Setum Item 
  *
  * @details
  *
- *    Function : FreeSplCellList
+ *    Function : BuildQOSInfo
  *
- *    Functionality: Deallocating memory for function BuildSplCellList
+ *    Functionality: Constructs the QOS Info for DRB Setup Item
  *
- * @params[in] SCell_ToBeSetup_List_t *spCellLst
+ * @params[in] QoSInformation_t *qosinfo
+ *             int16_t pduSessionID
  *
- * @return void
- *      
+ * @return ROK     - success
+ *         RFAILED - failure
  *
- * *****************************************************************/
-void FreeSplCellList(SCell_ToBeSetup_List_t *spCellLst)
+ * ****************************************************************/
+uint8_t BuildQOSInfo(QosInfo *qosInfo, QoSFlowLevelQoSParameters_t *drbQos, uint8_t actionType, int16_t pduSessionID, bool hoInProgress)
 {
-   uint8_t  cellidx;
-   if(spCellLst->list.array != NULLP)
+   uint8_t elementCnt = 0, qosCntIdx = 0;
+   ProtocolExtensionContainer_4624P74_t *qosIeExt = NULLP;
+
+   /* NonDynamic5QIDescriptor */
+   drbQos->qoS_Characteristics.present = QoS_Characteristics_PR_non_Dynamic_5QI;
+   CU_ALLOC(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI,sizeof(NonDynamic5QIDescriptor_t));
+   if(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI == NULLP)
    {
-      for(cellidx=0; cellidx<spCellLst->list.count; cellidx++)
+      return RFAILED;
+   }
+   
+   if(hoInProgress)
+      drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->fiveQI = qosInfo->nonDynFiveQI ;
+   else
+   {
+      /*FiveQI*/
+      if(actionType == ProtocolIE_ID_id_DRBs_ToBeModified_Item)
+         drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->fiveQI = FIVE_QI_VALUE8;
+      else
+         drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->fiveQI = FIVE_QI_VALUE9;
+
+      qosInfo->nonDynFiveQI = drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->fiveQI;
+   }
+
+   if(!hoInProgress)
+   {
+      /*AveragingWindow*/
+      CU_ALLOC(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow, sizeof(AveragingWindow_t));
+      if(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow == NULLP)
       {
-        if(cellidx==0&&spCellLst->list.array[cellidx]!=NULLP)
-        {
-           FreeNrcgi(&spCellLst->list.array[cellidx]->value.choice.SCell_ToBeSetup_Item.sCell_ID);
-        }
-        if(spCellLst->list.array[cellidx]!=NULLP)
-        {
-           CU_FREE(spCellLst->list.array[cellidx],sizeof(SCell_ToBeSetup_ItemIEs_t));
-        }
+         return RFAILED;
       }
-      CU_FREE(spCellLst->list.array,spCellLst->list.size);
+      *(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow) = 0;
+      qosInfo->avgWindow = *(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow);
+
+      /*MaxDataBurstVolume*/
+      CU_ALLOC(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume, sizeof(MaxDataBurstVolume_t));
+      if(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume == NULLP)
+      {
+         return RFAILED;
+      }
+      *(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume) = 0;
+      qosInfo->maxBurstDataVol = *(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume);
    }
-}
+
+   /*nRGRAN Allocation Retention Priority*/
+   if(hoInProgress)
+   {
+      drbQos->nGRANallocationRetentionPriority.priorityLevel = qosInfo->priorityLevel;
+      drbQos->nGRANallocationRetentionPriority.pre_emptionCapability = qosInfo->preemptionCapability;
+      drbQos->nGRANallocationRetentionPriority.pre_emptionVulnerability = qosInfo->preemptionVulnerability;
+   }
+   else
+   {
+      drbQos->nGRANallocationRetentionPriority.priorityLevel = PriorityLevel_lowest;
+      drbQos->nGRANallocationRetentionPriority.pre_emptionCapability = Pre_emptionCapability_may_trigger_pre_emption;
+      drbQos->nGRANallocationRetentionPriority.pre_emptionVulnerability = Pre_emptionVulnerability_not_pre_emptable;
+
+      qosInfo->priorityLevel = PriorityLevel_lowest;
+      qosInfo->preemptionCapability = Pre_emptionCapability_may_trigger_pre_emption;
+      qosInfo->preemptionVulnerability = Pre_emptionVulnerability_not_pre_emptable;
+   }
+
+   /* PDU session ID */
+   if(!hoInProgress)
+   {
+      /*If PDU Session ID is INVALID thus not to be included in Qos IE, skip the PDU Session IE */
+      if(pduSessionID <= INVALID_PDU_SESSION_ID)
+      {
+         DU_LOG("\nINFO  --> F1AP : Invalid PDU_SESSION_ID");
+         return ROK;
+      }
+
+      CU_ALLOC(drbQos->iE_Extensions, sizeof(ProtocolExtensionContainer_4624P74_t));
+      qosIeExt = (ProtocolExtensionContainer_4624P74_t *)drbQos->iE_Extensions;
+
+      if(qosIeExt)
+      {
+         elementCnt = NUM_QOS_EXT;
+         qosIeExt->list.count = elementCnt;
+         qosIeExt->list.size = elementCnt * sizeof(QoSFlowLevelQoSParameters_ExtIEs_t *);
+
+         /*Initialize QoSFlowLevelQoSParameters_ExtIEs_t*/
+         CU_ALLOC(qosIeExt->list.array, qosIeExt->list.size);
+
+         if(qosIeExt->list.array == NULLP)
+         {
+            DU_LOG("\nERROR  -->       F1AP : Memory allocation for QoSFlowLevelQoSParameters_ExtIEs_t failed");
+            return  RFAILED;
+         }
+
+         for(qosCntIdx=0; qosCntIdx < elementCnt; qosCntIdx++)
+         {
+            CU_ALLOC(qosIeExt->list.array[qosCntIdx], sizeof(QoSFlowLevelQoSParameters_ExtIEs_t));
+            if(qosIeExt->list.array[qosCntIdx] == NULLP)
+            {
+               DU_LOG("\nERROR  -->    F1AP : Memory allocation for QoSFlowLevelQoSParameters_ExtIEs_t array failed");
+               return  RFAILED;
+            }
+            /*Filling QoSFlowLevelQoSParameters_ExtIEs_t*/
+            qosIeExt->list.array[qosCntIdx]->id = ProtocolIE_ID_id_PDUSessionID;
+            /*Below Criticality mentioned in Spec38.473, 15.4.1 and later*/
+            qosIeExt->list.array[qosCntIdx]->criticality = Criticality_ignore; 
+            qosIeExt->list.array[qosCntIdx]->extensionValue.present = \
+                                                                      QoSFlowLevelQoSParameters_ExtIEs__extensionValue_PR_PDUSessionID;
+            qosIeExt->list.array[qosCntIdx]->extensionValue.choice.PDUSessionID = (PDUSessionID_t)pduSessionID;
+            qosInfo->pduSessionId = pduSessionID;
+         }
+      }
+      else
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation for QosIE_extension failed");
+         return RFAILED;
+      }
+   }
+   return ROK;
+}/*End of BuildQOSInfo*/
+
 /*******************************************************************
  *
- * @brief Deallocating memory of function BuildAndSendUESetReq
+ * @brief Builds SNSSAI  
  *
  * @details
  *
- *    Function : FreeSRBSetup
+ *    Function : BuildSNSSAI
  *
- *    Functionality: Deallocating memory for function BuildSRBSetup
+ *    Functionality: Constructs the SNSSAI For DRB list
  *
- * @params[in] SRBs_ToBeSetup_List_t *srbSet
+ * @params[in] SNSSAI_t *snssai
+ *             Snssai  *snssaiToCopy S-NSSAI from CuCfgParam to be copied
  *
- * @return void
- *        
+ * @return ROK     - success
+ *         RFAILED - failure
  *
- * ******************************************************************/
-void FreeSRBSetup(SRBs_ToBeSetup_List_t *srbSet)
+ * ****************************************************************/
+uint8_t BuildSNSSAI(DrbInfo *drbInfo, SNSSAI_t *snssai, Snssai *snssaiToCopy, bool hoInProgress)
 {
-   uint8_t srbidx;
-   if(srbSet->list.array != NULLP)
+   /*SNSSAI*/
+   /*ssT*/
+   snssai->sST.size = sizeof(uint8_t);
+   CU_ALLOC(snssai->sST.buf, snssai->sST.size);
+   if(snssai->sST.buf == NULLP)
    {
-      for(srbidx=0; srbidx<srbSet->list.count; srbidx++)
-      {
-        if(srbSet->list.array[srbidx]!=NULLP)
-        {
-           CU_FREE(srbSet->list.array[srbidx],sizeof(SRBs_ToBeSetup_ItemIEs_t));
-        }
-      }
-      CU_FREE(srbSet->list.array,srbSet->list.size);
+      return RFAILED;
    }
-}
+   if(!hoInProgress)
+      memcpy(snssai->sST.buf, &snssaiToCopy->sst, snssai->sST.size);
+   else
+      memcpy(snssai->sST.buf, &drbInfo->snssai->sst, snssai->sST.size);
+
+   /*sD*/
+   CU_ALLOC(snssai->sD, sizeof(OCTET_STRING_t));
+   if(snssai->sD == NULLP)
+   {
+      return RFAILED;
+   }
+   snssai->sD->size = 3 * sizeof(uint8_t);
+   CU_ALLOC(snssai->sD->buf, snssai->sD->size);
+   if(snssai->sD->buf == NULLP)
+   {
+      return RFAILED;
+   }
+   if(!hoInProgress)
+      memcpy(snssai->sD->buf, snssaiToCopy->sd, snssai->sD->size);
+   else
+      memcpy(snssai->sD->buf, drbInfo->snssai->sd, snssai->sD->size);
+
+   if(!hoInProgress)
+      drbInfo->snssai = snssaiToCopy;
+   return ROK;
+}/*End of BuildSNSSAI*/
+
 /*******************************************************************
  *
- * @brief Deallocating memory of function BuildAndSendUESetReq
+ * @brief Builds the flow map.  
  *
  * @details
  *
- *    Function : FreeQOSInfo
+ *    Function : BuildFlowsMap
  *
- *    Functionality:  Deallocating memory for function BuildQOSInfo
+ *    Functionality: Constructs the flowmap For DRB list
  *
- * @params[in] QoSFlowLevelQoSParameters_t *drbQos
+ * @params[in] Flows_Mapped_To_DRB_List_t *flowMap
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
  *
- * @return void
- *          
  * ****************************************************************/
-void FreeQOSInfo(QoSFlowLevelQoSParameters_t *drbQos)
+uint8_t BuildFlowsMap(DrbInfo *drbInfo, Flows_Mapped_To_DRB_List_t *flowMap , uint8_t actionType, bool hoInProgress)
 {
-   ProtocolExtensionContainer_4624P74_t *qosIeExt = NULLP;
-   uint8_t qosCntIdx = 0;
+   uint8_t  ret = ROK, idx = 0, flowCnt = 0, flowIdx = 0;
+   FlowsMapped *qosFlow;
 
-   if(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI != NULLP)
+   if(!hoInProgress)
+      flowCnt = 1;
+   else
+      flowCnt = drbInfo->numFlowMap;
+   flowMap->list.count = flowCnt;
+   flowMap->list.size = flowCnt * sizeof(Flows_Mapped_To_DRB_Item_t *);
+   CU_ALLOC(flowMap->list.array,flowMap->list.size);
+   if(flowMap->list.array == NULLP)
    {
-      if(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow!=NULLP)
-      {
-         if(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume!=NULLP)
-         {
-            CU_FREE(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume,\
-                  sizeof(MaxDataBurstVolume_t));
-         }
-         CU_FREE(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow,\
-               sizeof(AveragingWindow_t));
-      }
-      CU_FREE(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI,\
-            sizeof(NonDynamic5QIDescriptor_t));
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed for array in BuildFlowsMap()");
+      return RFAILED;
    }
-   if(drbQos->iE_Extensions)
+   for(idx=0; idx<flowCnt; idx++)
    {
-      qosIeExt = (ProtocolExtensionContainer_4624P74_t *)drbQos->iE_Extensions;
-      if(qosIeExt->list.array != NULLP)
+      CU_ALLOC(flowMap->list.array[idx],sizeof(Flows_Mapped_To_DRB_Item_t));
+      if(flowMap->list.array[idx] == NULLP)
       {
-         for(qosCntIdx=0; qosCntIdx <  qosIeExt->list.count; qosCntIdx++)
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed for arrayIdx[%d] in BuildFlowsMap()", idx);
+         return RFAILED;
+      }
+      
+      if(!hoInProgress)
+      {
+         flowMap->list.array[idx]->qoSFlowIdentifier = 0;
+         if(actionType == ProtocolIE_ID_id_DRBs_ToBeModified_Item)
          {
-            if(qosIeExt->list.array[qosCntIdx])
+            for(flowIdx =0; flowIdx < drbInfo->numFlowMap; flowIdx++)
             {
-               CU_FREE(qosIeExt->list.array[qosCntIdx], sizeof(QoSFlowLevelQoSParameters_ExtIEs_t));
+               if(drbInfo->flowMapList[flowIdx].qosFlowId == flowMap->list.array[idx]->qoSFlowIdentifier)
+               {
+                  qosFlow = &drbInfo->flowMapList[flowIdx];
+                  break;
+               }
             }
          }
-         CU_FREE(qosIeExt->list.array, qosIeExt->list.size);
+         else
+         {
+            qosFlow = &drbInfo->flowMapList[drbInfo->numFlowMap];
+            qosFlow->qosFlowId = flowMap->list.array[idx]->qoSFlowIdentifier;
+         }
+      }
+      else
+      {
+         qosFlow = &drbInfo->flowMapList[idx];
+         flowMap->list.array[idx]->qoSFlowIdentifier = qosFlow->qosFlowId;
       }
 
-      CU_FREE(drbQos->iE_Extensions, sizeof(ProtocolExtensionContainer_4624P74_t));
+      ret = BuildQOSInfo(&qosFlow->qos, &flowMap->list.array[idx]->qoSFlowLevelQoSParameters,\
+            actionType, INVALID_PDU_SESSION_ID, hoInProgress);
+      if(ret != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Failed to Build QOS Info in BuildFlowsMap()");
+         return RFAILED;
+      }
+
+      if((!hoInProgress) && (actionType != ProtocolIE_ID_id_DRBs_ToBeModified_Item))
+         drbInfo->numFlowMap++;
    }
-}
+   return ROK;
+}/*End of BuildFlowsMap*/
+
 /*******************************************************************
  *
- * @brief Deallocating memory of function BuildAndSendUESetReq
+ * @brief Builds the Uplink Tunnel Info  
  *
  * @details
  *
- *    Function : FreeULTnlInfo
+ *    Function : BuildULTnlInfo
  *
- *    Functionality:  Deallocating memory for function BuildULTnlInfo
+ *    Functionality: Constructs the UL TnlInfo For DRB list
  *
- * @params[in] ULUPTNLInformation_ToBeSetup_List_t *ulInfo
+ * @params[in]  UPTNLInformation_ToBeSetup_List_t *ulInfo
  *
- * @return void
- *         
-
- * ****************************************************************/
-void FreeULTnlInfo(ULUPTNLInformation_ToBeSetup_List_t *ulInfo)
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildULTnlInfo(uint8_t duId, TnlInfo *ulUpTnlInfo, ULUPTNLInformation_ToBeSetup_List_t *ulInfo, bool hoInProgress)
 {
-   uint8_t ulidx=0;
-   if(ulInfo->list.array != NULLP)
+   uint8_t idx;
+   uint8_t ulCnt;
+
+   ulCnt = 1;
+   ulInfo->list.count = ulCnt;
+   ulInfo->list.size = ulCnt * sizeof(ULUPTNLInformation_ToBeSetup_Item_t *);
+   CU_ALLOC(ulInfo->list.array,ulInfo->list.size);
+   if(ulInfo->list.array == NULLP)
+   {  
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed for array in BuildULTnlInfo()");
+      return RFAILED;
+   }
+   for(idx=0; idx<ulCnt; idx++)
    {
-      for(ulidx=0; ulidx<ulInfo->list.count; ulidx++)
+      CU_ALLOC(ulInfo->list.array[idx],sizeof(ULUPTNLInformation_ToBeSetup_Item_t));
+      if(ulInfo->list.array[idx] == NULLP)
       {
-        if(ulidx==0&&ulInfo->list.array[ulidx]!=NULLP)
-        {
-           if(ulInfo->list.array[ulidx]->uLUPTNLInformation.choice.gTPTunnel!=NULLP)
-           {
-              if(ulInfo->list.array[ulidx]->uLUPTNLInformation.choice.gTPTunnel->\
-                    transportLayerAddress.buf != NULLP)
-              {
-                 if(ulInfo->list.array[ulidx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf\
-                       !=NULLP)
-                 {
-                    CU_FREE(ulInfo->list.array[ulidx]->uLUPTNLInformation.choice.gTPTunnel->\
-                          gTP_TEID.buf,ulInfo->list.array[ulidx]->uLUPTNLInformation.choice.\
-                          gTPTunnel->gTP_TEID.size);
-                 }
-                 CU_FREE(ulInfo->list.array[ulidx]->uLUPTNLInformation.choice.gTPTunnel->\
-                       transportLayerAddress.buf,ulInfo->list.array[ulidx]->\
-                       uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.size);
-              }
-              CU_FREE(ulInfo->list.array[ulidx]->uLUPTNLInformation.choice.gTPTunnel,\
-                    sizeof(GTPTunnel_t));
-           }
-        }
-        if(ulInfo->list.array[ulidx]!=NULLP)
-        {
-           CU_FREE(ulInfo->list.array[ulidx],sizeof(ULUPTNLInformation_ToBeSetup_Item_t));
-        }
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed for arrayIdx [%d] in BuildULTnlInfo()", idx);
+             return RFAILED;
       }
-      CU_FREE(ulInfo->list.array,ulInfo->list.size);
    }
-}
+   idx = 0;
+   ulInfo->list.array[idx]->uLUPTNLInformation.present = UPTransportLayerInformation_PR_gTPTunnel;
+   /*GTP TUNNEL*/
+   CU_ALLOC(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel, sizeof(GTPTunnel_t));
+   if(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel == NULLP)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed for gTPTunnel in BuildULTnlInfo()");
+      return RFAILED;
+   }
+   ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.size    = 4*sizeof(uint8_t);
+   CU_ALLOC(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf, \
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.size);
+   if(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf == NULLP)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed for gtp tunnel arrayIdx[%d] in BuildULTnlInfo()", idx);
+      return RFAILED;
+   }
+
+   if(!hoInProgress)
+   {
+      /* NOTE: Below IP address must be changed if running on different IP configuration */
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[0] = 192;
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[1] = 168;
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[2] = 130;
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[3] = 82;
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.bits_unused = 0;
+
+      ulUpTnlInfo->address[0] = ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[0];
+      ulUpTnlInfo->address[1] = ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[1];
+      ulUpTnlInfo->address[2] = ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[2];
+      ulUpTnlInfo->address[3] = ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[3];
+   }
+   else
+   {
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[0] = ulUpTnlInfo->address[0];
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[1] = ulUpTnlInfo->address[1];
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[2] = ulUpTnlInfo->address[2];
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[3] = ulUpTnlInfo->address[3];
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.bits_unused = 0;
+   }
+
+   /*GTP TEID*/
+   ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.size = 4 * sizeof(uint8_t);
+   CU_ALLOC(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf, \
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.size);
+   if(ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf == NULLP)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed for gtp tunnel buffer in BuildULTnlInfo()");
+      return RFAILED;
+   }
+   
+   if(!hoInProgress)
+   {
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[0] = 0;
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[1] = 0;
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[2] = 0;
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[3] = cuCb.cuCfgParams.egtpParams.currTunnelId++;
+
+      ulUpTnlInfo->teId[0] = ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[0];
+      ulUpTnlInfo->teId[1] = ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[1];
+      ulUpTnlInfo->teId[2] = ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[2];
+      ulUpTnlInfo->teId[3] = ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[3];
+   }
+   else
+   {
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[0] = ulUpTnlInfo->teId[0];
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[1] = ulUpTnlInfo->teId[1];
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[2] = ulUpTnlInfo->teId[2];
+      ulInfo->list.array[idx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[3] = ulUpTnlInfo->teId[3];
+   }
+   return ROK;
+}/*End of BuildULTnlInfo*/
+
 /*******************************************************************
  *
- * @brief Deallocating memory for BuildAndSendUESetReq
+ * @brief Builds DRBS to be setup 
  *
  * @details
  *
- *    Function : FreeDRBSetup
+ *    Function : BuildDRBSetup
  *
- *    Functionality:  Deallocating memory for BuildDRBSetup
+ *    Functionality: Constructs the DRB's for UESetReq
  *
  * @params[in] DRBs_ToBeSetup_List_t *drbSet
  *
- * @return void
+ * @return ROK     - success
+ *         RFAILED - failure
  *
  * ****************************************************************/
-void FreeDRBSetup(DRBs_ToBeSetup_List_t *drbSet)
+uint8_t BuildDRBSetup(uint32_t duId, CuUeCb *ueCb, DRBs_ToBeSetup_List_t *drbSet)
 {
+   uint16_t snssaiIdx=0;
+   uint8_t idx = 0, extIeIdx = 0;
+   uint8_t elementCnt = 0, drbCnt = 0;
+   uint8_t BuildQOSInforet = 0,BuildSNSSAIret = 0;
+   uint8_t BuildFlowsMapret =0, BuildULTnlInforet =0;
    DRBs_ToBeSetup_Item_t *drbSetItem;
-   ProtocolExtensionContainer_4624P74_t *qosIeExt = NULLP;
+   ProtocolExtensionContainer_4624P33_t *drbToBeSetupExt;
+   DRBs_ToBeSetup_ItemExtIEs_t *drbToBeSetupExtIe = NULLP;
    
-   uint8_t  flowidx = 0, drbidx = 0, qosCntIdx = 0;
+   if(ueCb->state == UE_HANDOVER_IN_PROGRESS)
+      drbCnt = ueCb->numDrb;
+   else
+      drbCnt = MAX_DRB_SET_UE_CONTEXT_SETUP_REQ;
+   drbSet->list.count = drbCnt;
 
-   /*BUG: Need to check drbSet->list.array is not Empty to procced with Deletion*/
-   if(drbSet->list.array != NULLP)
+   drbSet->list.size = drbCnt*sizeof(DRBs_ToBeSetup_ItemIEs_t *);
+   CU_ALLOC(drbSet->list.array,drbSet->list.size);
+   if(drbSet->list.array == NULLP)
    {
-      for(drbidx=0; drbidx<drbSet->list.count; drbidx++)
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDRBSetup");
+      return RFAILED;
+   }
+
+   for(idx=0; idx<drbCnt; idx++)
+   {
+      CU_ALLOC(drbSet->list.array[idx],sizeof(DRBs_ToBeSetup_ItemIEs_t));
+      if(drbSet->list.array[idx] == NULLP)
       {
-             if(drbSet->list.array[drbidx] != NULLP)
-             {
-                drbSetItem =&drbSet->list.array[drbidx]->value.choice.DRBs_ToBeSetup_Item;
-                if(drbSetItem->qoSInformation.choice.choice_extension != NULLP)
-                {
-                   if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.dRB_QoS.\
-                                 qoS_Characteristics.choice.non_Dynamic_5QI !=NULLP)
-               {
-                  if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.dRB_QoS.\
-                                         qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow!=NULLP)
-                           {
-                              if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.dRB_QoS.\
-                                         qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume!=NULLP)
-                              {
-                                      if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.sNSSAI.sST.buf!=NULLP)
-                                      {
-                                         if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.sNSSAI.sD!=NULLP)
-                                         {
-                                            if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.sNSSAI.sD->buf!=NULLP)
-                                            {
-                                                    if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.\
-                                                           flows_Mapped_To_DRB_List.list.array != NULLP)
-                                                    {
-                                                        for(flowidx=0;flowidx<drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.\
-                                                                     flows_Mapped_To_DRB_List.list.count; flowidx++)
-                                                        {
-                                                            if(flowidx==0&&drbSetItem->qoSInformation.choice.choice_extension->value.choice.\
-                                                                          DRB_Information.flows_Mapped_To_DRB_List.list.array[flowidx]!=NULLP)
-                                                            {
-                                                                    if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.\
-                                                                               DRB_Information.flows_Mapped_To_DRB_List.list.array[flowidx]->qoSFlowLevelQoSParameters.\
-                                                                               qoS_Characteristics.choice.non_Dynamic_5QI!=NULLP)
-                                                                    {
-                                                                        if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.\
-                                                                                  DRB_Information.flows_Mapped_To_DRB_List.list.array[flowidx]->qoSFlowLevelQoSParameters.\
-                                                                                  qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow!=NULLP)
-                                                                        {
-                                                                                if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.\
-                                                                                DRB_Information.flows_Mapped_To_DRB_List.list.array[flowidx]->qoSFlowLevelQoSParameters.\
-                                                                                 qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume!=NULLP)
-                                                                                 {     
-                                                                                     FreeULTnlInfo(&drbSetItem->uLUPTNLInformation_ToBeSetup_List);
-                                                                                     CU_FREE(drbSetItem->uLConfiguration,sizeof(ULConfiguration_t));
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDRBSetup for arry idx [%d]", idx);
+         return RFAILED;
+      }
 
-                                                                                     CU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.\
-                                                                                                  DRB_Information.flows_Mapped_To_DRB_List.list.array[flowidx]->qoSFlowLevelQoSParameters.\
-                                                                                                  qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume,\
-                                                                                                  sizeof(MaxDataBurstVolume_t));
-                                                                                 }
-                                                        CU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.\
-                                                                                          DRB_Information.flows_Mapped_To_DRB_List.list.array[flowidx]->qoSFlowLevelQoSParameters.\
-                                                                                          qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow,sizeof(AveragingWindow_t));
-                                                                        }
-                                                                        CU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.\
-                                                                                      DRB_Information.flows_Mapped_To_DRB_List.list.array[flowidx]->qoSFlowLevelQoSParameters.\
-                                                                                      qoS_Characteristics.choice.non_Dynamic_5QI,sizeof(NonDynamic5QIDescriptor_t));
-                                                                    }
-                                                           }
-                                                           if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.\
-                                                                    DRB_Information.flows_Mapped_To_DRB_List.list.array[flowidx]!=NULLP)
-                                                           {
-                                                                   CU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.\
-                                                                                 DRB_Information.flows_Mapped_To_DRB_List.list.array[flowidx],sizeof(Flows_Mapped_To_DRB_Item_t));
-                                                           }
-                                                       }
-                                                       CU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.\
-                                                                     flows_Mapped_To_DRB_List.list.array,drbSetItem->qoSInformation.choice.choice_extension->value.\
-                                                                     choice.DRB_Information.flows_Mapped_To_DRB_List.list.size);
-                                                    }
-                                                    CU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.sNSSAI.sD->buf,\
-                                                            drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.sNSSAI.sD->size);
-                                           }
-                                           CU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.sNSSAI.sD,\
-                                                             sizeof(OCTET_STRING_t));
-                                      }
-                                      CU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.sNSSAI.sST.buf,\
-                                                   drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.sNSSAI.sST.size);
-                                   }
-                                   CU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.dRB_QoS.\
-                                           qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume,sizeof(MaxDataBurstVolume_t));
-                           }
-                      CU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.dRB_QoS.\
-                                        qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow,sizeof(AveragingWindow_t));
-                        }
-                        CU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.dRB_QoS.\
-                                      qoS_Characteristics.choice.non_Dynamic_5QI, sizeof(NonDynamic5QIDescriptor_t));
-             }
-             if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.dRB_QoS.\
-                        iE_Extensions != NULLP)
-             {
-                qosIeExt = (ProtocolExtensionContainer_4624P74_t *)drbSetItem->qoSInformation.choice.\
-                                    choice_extension->value.choice.DRB_Information.dRB_QoS.iE_Extensions;
-                 if(qosIeExt->list.array != NULLP)
-                 {
-                   for(qosCntIdx=0; qosCntIdx < qosIeExt->list.count; qosCntIdx++)
-                   {
-                      if(qosIeExt->list.array[qosCntIdx] != NULLP)
-                      {
-                         CU_FREE(qosIeExt->list.array[qosCntIdx], sizeof(QoSFlowLevelQoSParameters_ExtIEs_t));
-                      }
-                    }
-                    CU_FREE(qosIeExt->list.array, qosIeExt->list.size);
-                  }
-                  CU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.dRB_QoS.\
-                                   iE_Extensions, sizeof(ProtocolExtensionContainer_4624P74_t));
-              }
-                  
-                 CU_FREE(drbSetItem->qoSInformation.choice.choice_extension,sizeof(QoSInformation_ExtIEs_t));
-               }
-               CU_FREE(drbSet->list.array[drbidx],sizeof(DRBs_ToBeSetup_ItemIEs_t));
-             }
+      drbSet->list.array[idx]->id = ProtocolIE_ID_id_DRBs_ToBeSetup_Item;
+      drbSet->list.array[idx]->criticality = Criticality_ignore;
+      drbSet->list.array[idx]->value.present = DRBs_ToBeSetup_ItemIEs__value_PR_DRBs_ToBeSetup_Item;
+      drbSetItem = &drbSet->list.array[idx]->value.choice.DRBs_ToBeSetup_Item;
+      /*dRBID*/
+      if(ueCb->state != UE_HANDOVER_IN_PROGRESS)
+      {
+         drbSetItem->dRBID = idx + 1;
+         ueCb->drbList[ueCb->numDrb].drbId = drbSetItem->dRBID;
       }
-      CU_FREE(drbSet->list.array,drbSet->list.size);
-   }
-}
+      else
+         drbSetItem->dRBID = ueCb->drbList[idx].drbId;
 
+      /*qoSInformation*/
+      drbSetItem->qoSInformation.present = QoSInformation_PR_choice_extension;
+      CU_ALLOC(drbSetItem->qoSInformation.choice.choice_extension,sizeof(QoSInformation_ExtIEs_t));
+      if(drbSetItem->qoSInformation.choice.choice_extension == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed for QOS choice extension in BuildDRBSetup");
+         return RFAILED;
+      }
+      drbSetItem->qoSInformation.choice.choice_extension->id = ProtocolIE_ID_id_DRB_Information;
+      drbSetItem->qoSInformation.choice.choice_extension->criticality = Criticality_ignore;
+      drbSetItem->qoSInformation.choice.choice_extension->value.present = QoSInformation_ExtIEs__value_PR_DRB_Information;
+      if(ueCb->state != UE_HANDOVER_IN_PROGRESS)
+         BuildQOSInforet =  BuildQOSInfo(&ueCb->drbList[ueCb->numDrb].qos, &drbSetItem->qoSInformation.choice.\
+               choice_extension->value.choice.DRB_Information.dRB_QoS, ProtocolIE_ID_id_DRBs_ToBeSetup_Item, PDU_SESSION_ID_1, FALSE);
+      else
+         BuildQOSInforet =  BuildQOSInfo(&ueCb->drbList[idx].qos, &drbSetItem->qoSInformation.choice.\
+               choice_extension->value.choice.DRB_Information.dRB_QoS, ProtocolIE_ID_id_DRBs_ToBeSetup_Item, PDU_SESSION_ID_1, TRUE);
+      if(BuildQOSInforet != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Failed to build QOS Info in BuildDRBSetup");
+         return RFAILED;
+      }
 
-/*******************************************************************
- *
- * @brief Free the UE Setup Request
- *
- * @details
+      /*SNSSAI*/
+      snssaiIdx = (idx% cuCb.numSnssaiSupported);
+      if(ueCb->state != UE_HANDOVER_IN_PROGRESS)
+         BuildSNSSAIret = BuildSNSSAI(&ueCb->drbList[ueCb->numDrb], &drbSetItem->qoSInformation.choice.\
+               choice_extension->value.choice.DRB_Information.sNSSAI, cuCb.snssaiList[snssaiIdx], FALSE);
+      else
+         BuildSNSSAIret = BuildSNSSAI(&ueCb->drbList[idx], &drbSetItem->qoSInformation.choice.\
+               choice_extension->value.choice.DRB_Information.sNSSAI, NULLP, TRUE);
+      if(BuildSNSSAIret != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Failed to build SNSSAI Info in BuildDRBSetup");
+         return RFAILED;
+      }
+
+      /*Flows mapped to DRB List*/
+      if(ueCb->state != UE_HANDOVER_IN_PROGRESS)
+         BuildFlowsMapret = BuildFlowsMap(&ueCb->drbList[ueCb->numDrb], &drbSetItem->qoSInformation.choice.choice_extension->\
+               value.choice.DRB_Information.flows_Mapped_To_DRB_List, ProtocolIE_ID_id_DRBs_ToBeSetup_Item, FALSE);
+      else
+         BuildFlowsMapret = BuildFlowsMap(&ueCb->drbList[idx], &drbSetItem->qoSInformation.choice.choice_extension->\
+               value.choice.DRB_Information.flows_Mapped_To_DRB_List, ProtocolIE_ID_id_DRBs_ToBeSetup_Item, TRUE);
+      if(BuildFlowsMapret != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Failed to build Flow Map Info in BuildDRBSetup");
+         return RFAILED;
+      }
+
+      /*ULUPTNLInformation To Be Setup List*/
+      if(ueCb->state != UE_HANDOVER_IN_PROGRESS)
+         BuildULTnlInforet = BuildULTnlInfo(duId, &ueCb->drbList[ueCb->numDrb].ulUpTnlInfo, &drbSetItem->uLUPTNLInformation_ToBeSetup_List,\
+               FALSE);
+      else
+         BuildULTnlInforet = BuildULTnlInfo(duId, &ueCb->drbList[idx].ulUpTnlInfo, &drbSetItem->uLUPTNLInformation_ToBeSetup_List,\
+               TRUE);
+      if(BuildULTnlInforet != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Failed to build tunnel Info in BuildDRBSetup");
+         return RFAILED;
+      }
+
+      /*RLCMode*/
+      if(ueCb->state != UE_HANDOVER_IN_PROGRESS)
+      {
+         drbSetItem->rLCMode = RLCMode_rlc_um_bidirectional;
+         ueCb->drbList[ueCb->numDrb].rlcMode = drbSetItem->rLCMode;
+      }
+      else
+         drbSetItem->rLCMode = ueCb->drbList[idx].rlcMode;
+
+      /* DL PDCP SN Length */
+      if(ueCb->state == UE_HANDOVER_IN_PROGRESS)
+      {
+         CU_ALLOC(drbToBeSetupExt, sizeof(ProtocolExtensionContainer_4624P33_t));
+         if(!drbToBeSetupExt)
+         {
+            DU_LOG("\nERROR  -->  F1AP : Failed to allocate memory for extension IE list in BuildDRBSetup");
+            return RFAILED;
+         }
+
+         elementCnt = 1;
+         drbToBeSetupExt->list.count = elementCnt;
+         drbToBeSetupExt->list.size = drbToBeSetupExt->list.count * sizeof(DRBs_ToBeSetup_ItemExtIEs_t *);
+
+         CU_ALLOC(drbToBeSetupExt->list.array, drbToBeSetupExt->list.size);
+         if(!drbToBeSetupExt->list.array)
+         {
+             DU_LOG("\nERROR  -->  F1AP : Failed to allocated memory for extension array in BuildDRBSetup");
+             return RFAILED;
+         }
+
+         for(extIeIdx=0; extIeIdx < drbToBeSetupExt->list.count; extIeIdx++)
+         {
+            CU_ALLOC(drbToBeSetupExt->list.array[extIeIdx], sizeof(DRBs_ToBeSetup_ItemExtIEs_t));
+            if(!drbToBeSetupExt->list.array[extIeIdx])
+            {
+               DU_LOG("\nERROR  -->  F1AP : Failed to allocated memory for extension array element in BuildDRBSetup");
+               return RFAILED;
+            }
+         }
+         extIeIdx = 0;
+         drbToBeSetupExtIe = drbToBeSetupExt->list.array[extIeIdx];
+
+         drbToBeSetupExtIe->id = ProtocolIE_ID_id_DLPDCPSNLength;
+         drbToBeSetupExtIe->criticality = Criticality_ignore;
+         drbToBeSetupExtIe->extensionValue.present = DRBs_ToBeSetup_ItemExtIEs__extensionValue_PR_PDCPSNLength;
+         drbToBeSetupExtIe->extensionValue.choice.PDCPSNLength = PDCPSNLength_twelve_bits;
+         drbSetItem->iE_Extensions = drbToBeSetupExt;
+      }
+
+      if(ueCb->state != UE_HANDOVER_IN_PROGRESS)
+         ueCb->numDrb++;
+   }
+   return ROK;
+}/* End of BuildDRBSetup*/
+
+/*******************************************************************
  *
- *    Function : FreeUeContextSetupReq
+ * @brief Deallocating memory of function BuildAndSendUESetReq
  *
- *    Functionality: Deallocate the memory of BuildUESetReq
+ * @details
  *
- * @params[in]  F1AP_PDU_t  *f1apMsg
+ *    Function : FreeNrcgi
+ *
+ *    Functionality: Deallocating memory for function BuildNrcgi
+ *
+ * @params[in] NRCGI_t *nrcgi
+ *
+ * @return void
+ *
+ *******************************************************************/
+void FreeNrcgi(NRCGI_t *nrcgi)
+{
+   if(nrcgi->pLMN_Identity.buf != NULLP)
+   {
+      if(nrcgi->nRCellIdentity.buf != NULLP)
+      {
+        CU_FREE(nrcgi->nRCellIdentity.buf, nrcgi->nRCellIdentity.size); 
+      }
+      CU_FREE(nrcgi->pLMN_Identity.buf, nrcgi->pLMN_Identity.size);
+   }
+}
+/*******************************************************************
+ *
+ * @brief  Deallocating memory of function BuildAndSendUESetReq
+ *
+ * @details
+ *
+ *    Function : FreeSplCellList
+ *
+ *    Functionality: Deallocating memory for function BuildSplCellList
+ *
+ * @params[in] SCell_ToBeSetup_List_t *spCellLst
+ *
+ * @return void
+ *      
+ *
+ * *****************************************************************/
+void FreeSplCellList(SCell_ToBeSetup_List_t *spCellLst)
+{
+   uint8_t  cellidx;
+   if(spCellLst->list.array != NULLP)
+   {
+      for(cellidx=0; cellidx<spCellLst->list.count; cellidx++)
+      {
+        if(cellidx==0&&spCellLst->list.array[cellidx]!=NULLP)
+        {
+           FreeNrcgi(&spCellLst->list.array[cellidx]->value.choice.SCell_ToBeSetup_Item.sCell_ID);
+        }
+        if(spCellLst->list.array[cellidx]!=NULLP)
+        {
+           CU_FREE(spCellLst->list.array[cellidx],sizeof(SCell_ToBeSetup_ItemIEs_t));
+        }
+      }
+      CU_FREE(spCellLst->list.array,spCellLst->list.size);
+   }
+}
+/*******************************************************************
+ *
+ * @brief Deallocating memory of function BuildAndSendUESetReq
+ *
+ * @details
+ *
+ *    Function : FreeSRBSetup
+ *
+ *    Functionality: Deallocating memory for function BuildSRBSetup
+ *
+ * @params[in] SRBs_ToBeSetup_List_t *srbSet
+ *
+ * @return void
+ *        
+ *
+ * ******************************************************************/
+void FreeSRBSetup(SRBs_ToBeSetup_List_t *srbSet)
+{
+   uint8_t srbidx;
+   if(srbSet->list.array != NULLP)
+   {
+      for(srbidx=0; srbidx<srbSet->list.count; srbidx++)
+      {
+        if(srbSet->list.array[srbidx]!=NULLP)
+        {
+           CU_FREE(srbSet->list.array[srbidx],sizeof(SRBs_ToBeSetup_ItemIEs_t));
+        }
+      }
+      CU_FREE(srbSet->list.array,srbSet->list.size);
+   }
+}
+/*******************************************************************
+ *
+ * @brief Deallocating memory of function BuildAndSendUESetReq
+ *
+ * @details
+ *
+ *    Function : FreeQOSInfo
+ *
+ *    Functionality:  Deallocating memory for function BuildQOSInfo
+ *
+ * @params[in] QoSFlowLevelQoSParameters_t *drbQos
  *
  * @return void
+ *          
+ * ****************************************************************/
+void FreeQOSInfo(QoSFlowLevelQoSParameters_t *drbQos)
+{
+   ProtocolExtensionContainer_4624P74_t *qosIeExt = NULLP;
+   uint8_t qosCntIdx = 0;
+
+   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)
+         {
+            CU_FREE(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume,\
+                  sizeof(MaxDataBurstVolume_t));
+         }
+         CU_FREE(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow,\
+               sizeof(AveragingWindow_t));
+      }
+      CU_FREE(drbQos->qoS_Characteristics.choice.non_Dynamic_5QI,\
+            sizeof(NonDynamic5QIDescriptor_t));
+   }
+   if(drbQos->iE_Extensions)
+   {
+      qosIeExt = (ProtocolExtensionContainer_4624P74_t *)drbQos->iE_Extensions;
+      if(qosIeExt->list.array != NULLP)
+      {
+         for(qosCntIdx=0; qosCntIdx <  qosIeExt->list.count; qosCntIdx++)
+         {
+            if(qosIeExt->list.array[qosCntIdx])
+            {
+               CU_FREE(qosIeExt->list.array[qosCntIdx], sizeof(QoSFlowLevelQoSParameters_ExtIEs_t));
+            }
+         }
+         CU_FREE(qosIeExt->list.array, qosIeExt->list.size);
+      }
+
+      CU_FREE(drbQos->iE_Extensions, sizeof(ProtocolExtensionContainer_4624P74_t));
+   }
+}
+/*******************************************************************
+ *
+ * @brief Deallocating memory of function BuildAndSendUESetReq
+ *
+ * @details
+ *
+ *    Function : FreeULTnlInfo
+ *
+ *    Functionality:  Deallocating memory for function BuildULTnlInfo
  *
+ * @params[in] ULUPTNLInformation_ToBeSetup_List_t *ulInfo
  *
+ * @return void
+ *         
+
  * ****************************************************************/
-void FreeUeContextSetupReq(F1AP_PDU_t  *f1apMsg)
+void FreeULTnlInfo(ULUPTNLInformation_ToBeSetup_List_t *ulInfo)
 {
-   uint8_t idx, ieId;
-   UEContextSetupRequest_t  *ueSetReq = NULLP;
+   uint8_t ulidx=0;
+   if(ulInfo->list.array != NULLP)
+   {
+      for(ulidx=0; ulidx<ulInfo->list.count; ulidx++)
+      {
+        if(ulidx==0&&ulInfo->list.array[ulidx]!=NULLP)
+        {
+           if(ulInfo->list.array[ulidx]->uLUPTNLInformation.choice.gTPTunnel!=NULLP)
+           {
+              if(ulInfo->list.array[ulidx]->uLUPTNLInformation.choice.gTPTunnel->\
+                    transportLayerAddress.buf != NULLP)
+              {
+                 if(ulInfo->list.array[ulidx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf\
+                       !=NULLP)
+                 {
+                    CU_FREE(ulInfo->list.array[ulidx]->uLUPTNLInformation.choice.gTPTunnel->\
+                          gTP_TEID.buf,ulInfo->list.array[ulidx]->uLUPTNLInformation.choice.\
+                          gTPTunnel->gTP_TEID.size);
+                 }
+                 CU_FREE(ulInfo->list.array[ulidx]->uLUPTNLInformation.choice.gTPTunnel->\
+                       transportLayerAddress.buf,ulInfo->list.array[ulidx]->\
+                       uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.size);
+              }
+              CU_FREE(ulInfo->list.array[ulidx]->uLUPTNLInformation.choice.gTPTunnel,\
+                    sizeof(GTPTunnel_t));
+           }
+        }
+        if(ulInfo->list.array[ulidx]!=NULLP)
+        {
+           CU_FREE(ulInfo->list.array[ulidx],sizeof(ULUPTNLInformation_ToBeSetup_Item_t));
+        }
+      }
+      CU_FREE(ulInfo->list.array,ulInfo->list.size);
+   }
+}
+/*******************************************************************
+ *
+ * @brief Deallocating memory for BuildAndSendUESetReq
+ *
+ * @details
+ *
+ *    Function : FreeDRBSetup
+ *
+ *    Functionality:  Deallocating memory for BuildDRBSetup
+ *
+ * @params[in] DRBs_ToBeSetup_List_t *drbSet
+ *
+ * @return void
+ *
+ * ****************************************************************/
+void FreeDRBSetup(DRBs_ToBeSetup_List_t *drbSet)
+{
+   DRBs_ToBeSetup_Item_t *drbSetItem;
+   ProtocolExtensionContainer_4624P74_t *qosIeExt = NULLP;
+   
+   uint8_t  flowidx = 0, drbidx = 0, qosCntIdx = 0;
+
+   /*BUG: Need to check drbSet->list.array is not Empty to procced with Deletion*/
+   if(drbSet->list.array != NULLP)
+   {
+      for(drbidx=0; drbidx<drbSet->list.count; drbidx++)
+      {
+             if(drbSet->list.array[drbidx] != NULLP)
+             {
+                drbSetItem =&drbSet->list.array[drbidx]->value.choice.DRBs_ToBeSetup_Item;
+                if(drbSetItem->qoSInformation.choice.choice_extension != NULLP)
+                {
+                   if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.dRB_QoS.\
+                                 qoS_Characteristics.choice.non_Dynamic_5QI !=NULLP)
+               {
+                  if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.dRB_QoS.\
+                                         qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow!=NULLP)
+                           {
+                              if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.dRB_QoS.\
+                                         qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume!=NULLP)
+                              {
+                                      if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.sNSSAI.sST.buf!=NULLP)
+                                      {
+                                         if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.sNSSAI.sD!=NULLP)
+                                         {
+                                            if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.sNSSAI.sD->buf!=NULLP)
+                                            {
+                                                    if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.\
+                                                           flows_Mapped_To_DRB_List.list.array != NULLP)
+                                                    {
+                                                        for(flowidx=0;flowidx<drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.\
+                                                                     flows_Mapped_To_DRB_List.list.count; flowidx++)
+                                                        {
+                                                            if(flowidx==0&&drbSetItem->qoSInformation.choice.choice_extension->value.choice.\
+                                                                          DRB_Information.flows_Mapped_To_DRB_List.list.array[flowidx]!=NULLP)
+                                                            {
+                                                                    if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.\
+                                                                               DRB_Information.flows_Mapped_To_DRB_List.list.array[flowidx]->qoSFlowLevelQoSParameters.\
+                                                                               qoS_Characteristics.choice.non_Dynamic_5QI!=NULLP)
+                                                                    {
+                                                                        if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.\
+                                                                                  DRB_Information.flows_Mapped_To_DRB_List.list.array[flowidx]->qoSFlowLevelQoSParameters.\
+                                                                                  qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow!=NULLP)
+                                                                        {
+                                                                                if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.\
+                                                                                DRB_Information.flows_Mapped_To_DRB_List.list.array[flowidx]->qoSFlowLevelQoSParameters.\
+                                                                                 qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume!=NULLP)
+                                                                                 {     
+                                                                                     FreeULTnlInfo(&drbSetItem->uLUPTNLInformation_ToBeSetup_List);
+                                                                                     CU_FREE(drbSetItem->uLConfiguration,sizeof(ULConfiguration_t));
+
+                                                                                     CU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.\
+                                                                                                  DRB_Information.flows_Mapped_To_DRB_List.list.array[flowidx]->qoSFlowLevelQoSParameters.\
+                                                                                                  qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume,\
+                                                                                                  sizeof(MaxDataBurstVolume_t));
+                                                                                 }
+                                                        CU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.\
+                                                                                          DRB_Information.flows_Mapped_To_DRB_List.list.array[flowidx]->qoSFlowLevelQoSParameters.\
+                                                                                          qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow,sizeof(AveragingWindow_t));
+                                                                        }
+                                                                        CU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.\
+                                                                                      DRB_Information.flows_Mapped_To_DRB_List.list.array[flowidx]->qoSFlowLevelQoSParameters.\
+                                                                                      qoS_Characteristics.choice.non_Dynamic_5QI,sizeof(NonDynamic5QIDescriptor_t));
+                                                                    }
+                                                           }
+                                                           if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.\
+                                                                    DRB_Information.flows_Mapped_To_DRB_List.list.array[flowidx]!=NULLP)
+                                                           {
+                                                                   CU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.\
+                                                                                 DRB_Information.flows_Mapped_To_DRB_List.list.array[flowidx],sizeof(Flows_Mapped_To_DRB_Item_t));
+                                                           }
+                                                       }
+                                                       CU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.\
+                                                                     flows_Mapped_To_DRB_List.list.array,drbSetItem->qoSInformation.choice.choice_extension->value.\
+                                                                     choice.DRB_Information.flows_Mapped_To_DRB_List.list.size);
+                                                    }
+                                                    CU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.sNSSAI.sD->buf,\
+                                                            drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.sNSSAI.sD->size);
+                                           }
+                                           CU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.sNSSAI.sD,\
+                                                             sizeof(OCTET_STRING_t));
+                                      }
+                                      CU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.sNSSAI.sST.buf,\
+                                                   drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.sNSSAI.sST.size);
+                                   }
+                                   CU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.dRB_QoS.\
+                                           qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume,sizeof(MaxDataBurstVolume_t));
+                           }
+                      CU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.dRB_QoS.\
+                                        qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow,sizeof(AveragingWindow_t));
+                        }
+                        CU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.dRB_QoS.\
+                                      qoS_Characteristics.choice.non_Dynamic_5QI, sizeof(NonDynamic5QIDescriptor_t));
+             }
+             if(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.dRB_QoS.\
+                        iE_Extensions != NULLP)
+             {
+                qosIeExt = (ProtocolExtensionContainer_4624P74_t *)drbSetItem->qoSInformation.choice.\
+                                    choice_extension->value.choice.DRB_Information.dRB_QoS.iE_Extensions;
+                 if(qosIeExt->list.array != NULLP)
+                 {
+                   for(qosCntIdx=0; qosCntIdx < qosIeExt->list.count; qosCntIdx++)
+                   {
+                      if(qosIeExt->list.array[qosCntIdx] != NULLP)
+                      {
+                         CU_FREE(qosIeExt->list.array[qosCntIdx], sizeof(QoSFlowLevelQoSParameters_ExtIEs_t));
+                      }
+                    }
+                    CU_FREE(qosIeExt->list.array, qosIeExt->list.size);
+                  }
+                  CU_FREE(drbSetItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.dRB_QoS.\
+                                   iE_Extensions, sizeof(ProtocolExtensionContainer_4624P74_t));
+              }
+                  
+                 CU_FREE(drbSetItem->qoSInformation.choice.choice_extension,sizeof(QoSInformation_ExtIEs_t));
+               }
+               CU_FREE(drbSet->list.array[drbidx],sizeof(DRBs_ToBeSetup_ItemIEs_t));
+             }
+      }
+      CU_FREE(drbSet->list.array,drbSet->list.size);
+   }
+}
+
+
+/*******************************************************************
+ *
+ * @brief Free the UE Setup Request
+ *
+ * @details
+ *
+ *    Function : FreeUeContextSetupReq
+ *
+ *    Functionality: Deallocate the memory of BuildUESetReq
+ *
+ * @params[in]  F1AP_PDU_t  *f1apMsg
+ *
+ * @return void
+ *
+ *
+ * ****************************************************************/
+void FreeUeContextSetupReq(F1AP_PDU_t  *f1apMsg)
+{
+   uint8_t idx, ieId;
+   UEContextSetupRequest_t  *ueSetReq = NULLP;
+
+   if(f1apMsg != NULLP)
+   {
+      if(f1apMsg->choice.initiatingMessage != NULLP)
+      {
+         ueSetReq = &f1apMsg->choice.initiatingMessage->value.choice.UEContextSetupRequest;
+         if(ueSetReq->protocolIEs.list.array != NULLP)
+         {
+            for(idx = 0; idx < ueSetReq->protocolIEs.list.count; idx++)
+            {
+               if(ueSetReq->protocolIEs.list.array[idx])
+               {
+                  switch(ueSetReq->protocolIEs.list.array[idx]->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_SpCell_ID:
+                        FreeNrcgi(&ueSetReq->protocolIEs.list.array[idx]->value.choice.NRCGI);
+                        break;
+                     case ProtocolIE_ID_id_ServCellIndex:
+                        break;
+                     case ProtocolIE_ID_id_SpCellULConfigured:
+                        break;
+                     case ProtocolIE_ID_id_CUtoDURRCInformation:
+                        FreeCuToDuInfo(&ueSetReq->protocolIEs.list.array[idx]->value.choice.CUtoDURRCInformation);
+                        break;
+                     case ProtocolIE_ID_id_SCell_ToBeSetup_List:
+                        FreeSplCellList(&ueSetReq->protocolIEs.list.array[idx]->value.choice.SCell_ToBeSetup_List);
+                        break;
+                     case ProtocolIE_ID_id_SRBs_ToBeSetup_List:
+                        FreeSRBSetup(&ueSetReq->protocolIEs.list.array[idx]->value.choice.SRBs_ToBeSetup_List);
+                        break;
+                     case ProtocolIE_ID_id_DRBs_ToBeSetup_List:
+                        FreeDRBSetup(&ueSetReq->protocolIEs.list.array[idx]->value.choice.DRBs_ToBeSetup_List);
+                        break;
+                     case ProtocolIE_ID_id_RRCContainer:
+                        if(ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf != NULLP)
+                        {
+                           CU_FREE(ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf, \
+                                 ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.size);
+                        }
+                        break;
+                     case ProtocolIE_ID_id_GNB_DU_UE_AMBR_UL:
+                        CU_FREE(ueSetReq->protocolIEs.list.array[idx]->value.choice.BitRate.buf,\
+                              ueSetReq->protocolIEs.list.array[idx]->value.choice.BitRate.size);
+                        break;
+                     default:
+                        DU_LOG("\nERROR  -->  F1AP: Invalid event type %ld", ueSetReq->protocolIEs.list.array[idx]->id);
+                        break;
+                  }
+               }
+               /*BUG: Break is causing to exit the for Loop before complete traversing and freeing of each IE*/
+            }
+            for(ieId=0; ieId<idx; ieId++)
+            {
+               if(ueSetReq->protocolIEs.list.array[ieId] != NULLP)
+               {
+                  CU_FREE(ueSetReq->protocolIEs.list.array[ieId],sizeof(UEContextSetupRequestIEs_t));
+               }
+            }
+            CU_FREE(ueSetReq->protocolIEs.list.array,ueSetReq->protocolIEs.list.size);
+         }
+         CU_FREE(f1apMsg->choice.initiatingMessage,sizeof(InitiatingMessage_t));
+      }
+      CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
+   }
+}
+
+/**Filling cell group info **/
+/*******************************************************************
+ *
+ * @brief Build Control resource set to add/modify list 
+ *
+ * @details
+ *
+ *    Function : BuildControlRSetToAddModList
+ *
+ *    Functionality: Build Control resource set to add/modify list
+ *
+ * @params[in] 
+ * struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+   uint8_t BuildControlRSetToAddModList
+(
+ struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList
+ )
+{
+   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;
+   CU_ALLOC(controlRSetList->list.array, controlRSetList->list.size);
+   if(!controlRSetList->list.array)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+      return RFAILED;
+   }
+
+   for(idx = 0; idx < elementCnt; idx++)
+   {
+      controlRSetList->list.array[idx] = NULLP;
+      CU_ALLOC(controlRSetList->list.array[idx], sizeof(struct ControlResourceSet));
+      if(!controlRSetList->list.array[idx])
+      {
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+        return RFAILED;
+      }
+   }
+
+   idx=0;
+   controlRSet = controlRSetList->list.array[idx];
+   controlRSet->controlResourceSetId = PDCCH_CTRL_RSRC_SET_ONE_ID;
+
+   /* Values harcoded according to our design:
+    * 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;
+   CU_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);
+   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;
+   controlRSet->tci_StatesPDCCH_ToAddList = NULLP;
+   controlRSet->tci_StatesPDCCH_ToReleaseList = NULLP;
+   controlRSet->tci_PresentInDCI = NULLP;
+#if 0
+   uint8_t tciStateIdx;
+
+   CU_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 *);
+   CU_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++)
+   {
+      CU_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]);
+
+   CU_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;
+   CU_ALLOC(controlRSet->pdcch_DMRS_ScramblingID, sizeof(long));
+   if(!controlRSet->pdcch_DMRS_ScramblingID)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+      return RFAILED;
+   }
+   *(controlRSet->pdcch_DMRS_ScramblingID) = SCRAMBLING_ID;
+
+   return ROK;
+} /* End BuildControlRSetToAddModList */
+
+/*******************************************************************
+ *
+ * @brief Build search space to add/modify list
+ *
+ * @details
+ *
+ *    Function : BuildSearchSpcToAddModList
+ *
+ *    Functionality: Build search space to add/modify list
+ *
+ * @params[in] 
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+   uint8_t BuildSearchSpcToAddModList
+(
+ struct PDCCH_Config__searchSpacesToAddModList *searchSpcList
+ )
+{
+   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;
+   CU_ALLOC(searchSpcList->list.array, searchSpcList->list.size);
+   if(!searchSpcList->list.array)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+      return RFAILED;
+   }
+
+   for(idx = 0; idx < elementCnt; idx++)
+   {
+      searchSpcList->list.array[idx] = NULLP;
+      CU_ALLOC(searchSpcList->list.array[idx], sizeof(struct SearchSpace));
+      if(!searchSpcList->list.array[idx])
+      {
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+        return RFAILED;
+      }
+   }
+
+   idx = 0;
+   searchSpc = searchSpcList->list.array[idx];
+
+   searchSpc->searchSpaceId = PDCCH_SRCH_SPC_TWO_ID;
+
+   searchSpc->controlResourceSetId = NULLP;
+   CU_ALLOC(searchSpc->controlResourceSetId, sizeof(ControlResourceSetId_t));
+   if(!searchSpc->controlResourceSetId)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+      return RFAILED;
+   }
+   *(searchSpc->controlResourceSetId) = PDCCH_CTRL_RSRC_SET_ONE_ID;
+
+   searchSpc->monitoringSlotPeriodicityAndOffset = NULLP;
+   CU_ALLOC(searchSpc->monitoringSlotPeriodicityAndOffset, \
+        sizeof(struct SearchSpace__monitoringSlotPeriodicityAndOffset));
+   if(!searchSpc->monitoringSlotPeriodicityAndOffset)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+      return RFAILED;
+   }
+   searchSpc->monitoringSlotPeriodicityAndOffset->present = \
+                                                           SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1;
+
+   searchSpc->duration = NULLP;
+   searchSpc->monitoringSymbolsWithinSlot = NULLP;
+   CU_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;
+   CU_ALLOC(searchSpc->monitoringSymbolsWithinSlot->buf, \
+        searchSpc->monitoringSymbolsWithinSlot->size);
+   if(!searchSpc->monitoringSymbolsWithinSlot->buf)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+      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;
+   CU_ALLOC(searchSpc->nrofCandidates, sizeof(struct SearchSpace__nrofCandidates));
+   if(!searchSpc->nrofCandidates)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+      return RFAILED;
+   }
+
+   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;
+
+   searchSpc->searchSpaceType = NULLP;
+   CU_ALLOC(searchSpc->searchSpaceType, sizeof(struct SearchSpace__searchSpaceType));
+   if(!searchSpc->searchSpaceType)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+      return RFAILED;
+   }
+
+   searchSpc->searchSpaceType->present = SearchSpace__searchSpaceType_PR_ue_Specific;
+
+   searchSpc->searchSpaceType->choice.ue_Specific = NULLP;
+   CU_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;
+
+   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(struct PDCCH_Config *pdcchCfg)
+{
+   pdcchCfg->controlResourceSetToAddModList = NULLP;
+   CU_ALLOC(pdcchCfg->controlResourceSetToAddModList, \
+        sizeof(struct PDCCH_Config__controlResourceSetToAddModList));
+   if(!pdcchCfg->controlResourceSetToAddModList)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPDlDedPdcchCfg");
+      return RFAILED;
+   }
+
+   if(BuildControlRSetToAddModList(pdcchCfg->controlResourceSetToAddModList) != ROK)
+   {
+      return RFAILED;
+   }
+
+   pdcchCfg->controlResourceSetToReleaseList = NULLP;
+
+   pdcchCfg->searchSpacesToAddModList = NULLP;
+   CU_ALLOC(pdcchCfg->searchSpacesToAddModList, \
+        sizeof(struct PDCCH_Config__searchSpacesToAddModList));
+   if(!pdcchCfg->searchSpacesToAddModList)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPDlDedPdcchCfg");
+      return RFAILED;
+   }
+
+   if(BuildSearchSpcToAddModList(pdcchCfg->searchSpacesToAddModList) != ROK)
+   {
+      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
+(
+ struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA *dmrsDlCfg
+ )
+{
+   dmrsDlCfg->present = PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA_PR_setup;
+   dmrsDlCfg->choice.setup = NULLP;
+   CU_ALLOC(dmrsDlCfg->choice.setup, sizeof(struct DMRS_DownlinkConfig));
+   if(!dmrsDlCfg->choice.setup)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
+      return RFAILED;
+   }
+
+   dmrsDlCfg->choice.setup->dmrs_Type = NULLP;
+   dmrsDlCfg->choice.setup->dmrs_AdditionalPosition = NULLP;
+   CU_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;
+   }
+   *(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;
+
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds TCI states to add/modify list
+ *
+ * @details
+ *
+ *    Function : BuildTCIStatesToAddModList
+ *
+ *    Functionality:Builds TCI states to add/modify list
+ *
+ * @params[in] 
+ * struct PDSCH_Config__tci_StatesToAddModList *tciStatesList
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildTCIStatesToAddModList(struct PDSCH_Config__tci_StatesToAddModList *tciStatesList)
+{
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds PDSCH time domain allocation list
+ *
+ * @details
+ *
+ *    Function : BuildPdschTimeDomAllocList
+ *
+ *    Functionality: Builds PDSCH time domain allocation list
+ *
+ * @params[in] 
+ * struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+   uint8_t BuildPdschTimeDomAllocList
+(
+ 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->choice.setup = NULLP;
+   CU_ALLOC(timeDomAllocList->choice.setup, \
+        sizeof(struct PDSCH_TimeDomainResourceAllocationList));
+   if(!timeDomAllocList->choice.setup)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
+      return RFAILED;
+   }
+
+   elementCnt = 2;
+   timeDomAllocList->choice.setup->list.count = elementCnt;
+   timeDomAllocList->choice.setup->list.size = \
+                                              elementCnt * sizeof(struct PDSCH_TimeDomainResourceAllocation *);
+
+   timeDomAllocList->choice.setup->list.array = NULLP;
+   CU_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");
+      return RFAILED;
+   }
+
+   for(idx = 0; idx < elementCnt; idx++)
+   {
+      timeDomAllocList->choice.setup->list.array[idx] = NULLP;
+      CU_ALLOC(timeDomAllocList->choice.setup->list.array[idx], \
+           sizeof(struct PDSCH_TimeDomainResourceAllocation));
+      if(!timeDomAllocList->choice.setup->list.array[idx])
+      {
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
+        return RFAILED;
+      }
+   }
+
+   idx = 0;
+   timeDomAlloc = timeDomAllocList->choice.setup->list.array[idx];
+   CU_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 = 66;
+
+   idx++;
+   timeDomAlloc = timeDomAllocList->choice.setup->list.array[idx];
+   CU_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 = 66;
+
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds PDSCH PRB Bundling type
+ *
+ * @details
+ *
+ *    Function : BuildPdschPrbBundlingType
+ *
+ *    Functionality: Builds PDSCH PRB Bundling type
+ *
+ * @params[in] 
+ * struct PDSCH_Config__prb_BundlingType *prbBndlType
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+   uint8_t BuildPdschPrbBundlingType
+(
+ struct PDSCH_Config__prb_BundlingType *prbBndlType
+ )
+{
+   prbBndlType->present = PDSCH_Config__prb_BundlingType_PR_staticBundling;
+
+   prbBndlType->choice.staticBundling = NULLP;
+   CU_ALLOC(prbBndlType->choice.staticBundling, \
+        sizeof(struct PDSCH_Config__prb_BundlingType__staticBundling));
+   if(!prbBndlType->choice.staticBundling)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschPrbBundlingType");
+      return RFAILED;
+   }
+   prbBndlType->choice.staticBundling->bundleSize = NULLP;
+
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds BWP DL dedicated PDSCH config 
+ *
+ * @details
+ *
+ *    Function : BuildBWPDlDedPdschCfg
+ *
+ *    Functionality: Builds BWP DL dedicated PDSCH config
+ *
+ * @params[in] struct PDSCH_Config *pdschCfg
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildBWPDlDedPdschCfg(struct PDSCH_Config *pdschCfg)
+{
+   pdschCfg->dataScramblingIdentityPDSCH = NULLP;
+
+   pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA = NULLP;
+   CU_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)
+   {
+      return RFAILED;
+   }
+
+   pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeB = NULLP;
+   pdschCfg->tci_StatesToAddModList = NULLP;
+   pdschCfg->tci_StatesToReleaseList = NULLP;
+   pdschCfg->vrb_ToPRB_Interleaver = NULLP;
+#if 0
+   CU_ALLOC(pdschCfg->tci_StatesToAddModList, sizeof(struct PDSCH_Config__tci_StatesToAddModList));
+   if(!pdschCfg->tci_StatesToAddModList)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
+      return RFAILED;
+   }
+   if(BuildTCIStatesToAddModList(pdschCfg->tci_StatesToAddModList) != ROK)
+   {
+      return RFAILED;
+   }
+#endif
+
+   pdschCfg->resourceAllocation = RES_ALLOC_TYPE;
+
+   pdschCfg->pdsch_TimeDomainAllocationList = NULLP;
+   CU_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)
+   {
+      return RFAILED;
+   }
+   pdschCfg->pdsch_AggregationFactor = NULLP;
+   pdschCfg->rateMatchPatternToAddModList = NULLP;
+   pdschCfg->rateMatchPatternToReleaseList = NULLP;
+   pdschCfg->rateMatchPatternGroup1 = NULLP;
+   pdschCfg->rateMatchPatternGroup2 = NULLP;
+   pdschCfg->rbg_Size = PDSCH_RBG_SIZE;
+   pdschCfg->mcs_Table = NULLP;
+
+   pdschCfg->maxNrofCodeWordsScheduledByDCI = NULLP;
+   CU_ALLOC(pdschCfg->maxNrofCodeWordsScheduledByDCI, sizeof(long));
+   if(!pdschCfg->maxNrofCodeWordsScheduledByDCI)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
+      return RFAILED;
+   }
+   *(pdschCfg->maxNrofCodeWordsScheduledByDCI) = PDSCH_MAX_CODEWORD_SCH_BY_DCI;
+
+   if(BuildPdschPrbBundlingType(&pdschCfg->prb_BundlingType) != ROK)
+   {
+      return RFAILED;
+   }
+
+   pdschCfg->zp_CSI_RS_ResourceToAddModList = NULLP;
+   pdschCfg->zp_CSI_RS_ResourceToReleaseList = NULLP;
+   pdschCfg->aperiodic_ZP_CSI_RS_ResourceSetsToAddModList = NULLP;
+   pdschCfg->aperiodic_ZP_CSI_RS_ResourceSetsToReleaseList = NULLP;
+   pdschCfg->sp_ZP_CSI_RS_ResourceSetsToAddModList = NULLP;
+   pdschCfg->sp_ZP_CSI_RS_ResourceSetsToReleaseList = NULLP;
+   pdschCfg->p_ZP_CSI_RS_ResourceSet = NULLP;
+
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds intitial DL BWP
+ * @details
+ *
+ *    Function : BuildInitialDlBWP 
+ *
+ *    Functionality: Builds intitial DL BWP in spCellCfgDed
+ *
+ * @params[in] BWP_DownlinkDedicated_t *dlBwp
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildInitialDlBWP(BWP_DownlinkDedicated_t *dlBwp)
+{
+   dlBwp->pdcch_Config = NULLP;
+   CU_ALLOC(dlBwp->pdcch_Config, sizeof(struct BWP_DownlinkDedicated__pdcch_Config));
+   if(!dlBwp->pdcch_Config)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory Allocation failure in BuildInitialDlBWP");
+      return RFAILED;
+   }
+   dlBwp->pdcch_Config->present = BWP_DownlinkDedicated__pdcch_Config_PR_setup; 
+
+   dlBwp->pdcch_Config->choice.setup = NULLP;
+   CU_ALLOC(dlBwp->pdcch_Config->choice.setup, sizeof(struct PDCCH_Config));
+   if(!dlBwp->pdcch_Config->choice.setup)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory Allocation failure in BuildInitialDlBWP");
+      return RFAILED;
+   }
+   if(BuildBWPDlDedPdcchCfg(dlBwp->pdcch_Config->choice.setup) != ROK)
+   {
+      return RFAILED;
+   }
+
+   dlBwp->pdsch_Config = NULLP;
+   CU_ALLOC(dlBwp->pdsch_Config, sizeof(struct BWP_DownlinkDedicated__pdsch_Config));
+   if(!dlBwp->pdsch_Config)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory Allocation failure in BuildInitialDlBWP");
+      return RFAILED;
+   }
+   dlBwp->pdsch_Config->present = BWP_DownlinkDedicated__pdsch_Config_PR_setup;
+
+   dlBwp->pdsch_Config->choice.setup = NULLP;
+   CU_ALLOC(dlBwp->pdsch_Config->choice.setup, sizeof(struct PDSCH_Config));
+   if(!dlBwp->pdsch_Config->choice.setup)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory Allocation failure in BuildInitialDlBWP");
+      return RFAILED;
+   }
+
+   if(BuildBWPDlDedPdschCfg(dlBwp->pdsch_Config->choice.setup) != ROK)
+   {
+      return RFAILED;
+   }
+
+   dlBwp->sps_Config = NULLP;
+   dlBwp->radioLinkMonitoringConfig = NULLP; 
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds DMRS UL Pusch Mapping type A
+ *
+ * @details
+ *
+ *    Function : BuildDMRSULPuschMapTypeA
+ *
+ *    Functionality: Builds DMRS UL Pusch Mapping type A
+ *
+ * @params[in] 
+ *    struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA *dmrsUlCfg
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+   uint8_t BuildDMRSULPuschMapTypeA
+(
+ struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA *dmrsUlCfg
+ )
+{
+   dmrsUlCfg->present = PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA_PR_setup;
+   dmrsUlCfg->choice.setup= NULLP;
+   CU_ALLOC(dmrsUlCfg->choice.setup, sizeof(DMRS_UplinkConfig_t));
+   if(!dmrsUlCfg->choice.setup)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDMRSULPuschMapTypeA");
+      return RFAILED;
+   }
+
+   dmrsUlCfg->choice.setup->dmrs_Type = NULLP;
+   dmrsUlCfg->choice.setup->dmrs_AdditionalPosition = NULLP;
+   CU_ALLOC(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition, sizeof(long));
+   if(!dmrsUlCfg->choice.setup->dmrs_AdditionalPosition)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDMRSULPuschMapTypeA");
+      return RFAILED;
+   }
+   *(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition) = DMRS_ADDITIONAL_POS; 
+
+   dmrsUlCfg->choice.setup->phaseTrackingRS = NULLP;
+   dmrsUlCfg->choice.setup->maxLength = NULLP;
+   dmrsUlCfg->choice.setup->transformPrecodingDisabled = NULLP;
+   CU_ALLOC(dmrsUlCfg->choice.setup->transformPrecodingDisabled, \
+        sizeof(struct DMRS_UplinkConfig__transformPrecodingDisabled));
+   if(!dmrsUlCfg->choice.setup->transformPrecodingDisabled)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDMRSULPuschMapTypeA");
+      return RFAILED;
+   }
+
+   dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0 = NULLP;
+   CU_ALLOC(dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0,\
+        sizeof(long));
+   if(!dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDMRSULPuschMapTypeA");
+      return RFAILED;
+   }
+   *(dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0) = SCRAMBLING_ID;
+
+   dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID1 = NULLP;
+   dmrsUlCfg->choice.setup->transformPrecodingEnabled = NULLP;
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Build PUSCH time domain allocation list
+ *
+ * @details
+ *
+ *    Function : BuildPuschTimeDomAllocList
+ *
+ *    Functionality: Build PUSCH time domain allocation list
+ *
+ * @params[in] 
+ * struct PUSCH_Config__pusch_TimeDomainAllocationList *timeDomAllocList
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+   uint8_t BuildPuschTimeDomAllocList
+(
+ struct PUSCH_Config__pusch_TimeDomainAllocationList *timeDomAllocList
+ )
+{
+   uint8_t idx;
+   uint8_t elementCnt;
+   PUSCH_TimeDomainResourceAllocation_t  *timeDomAlloc;
+
+   timeDomAllocList->present = PUSCH_Config__pusch_TimeDomainAllocationList_PR_setup;
+   timeDomAllocList->choice.setup = NULLP;
+   CU_ALLOC(timeDomAllocList->choice.setup, \
+        sizeof(struct PUSCH_TimeDomainResourceAllocationList));
+   if(!timeDomAllocList->choice.setup)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
+      return RFAILED;
+   }
+
+   elementCnt = 2;
+   timeDomAllocList->choice.setup->list.count = elementCnt;
+   timeDomAllocList->choice.setup->list.size = \
+                                              elementCnt * sizeof(PUSCH_TimeDomainResourceAllocation_t *);
+   timeDomAllocList->choice.setup->list.array = NULLP;
+   CU_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");
+      return RFAILED;
+   }
+
+   for(idx = 0; idx < elementCnt; idx++)
+   {
+      timeDomAllocList->choice.setup->list.array[idx] = NULLP;
+      CU_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;
+      }
+   }
+
+   idx = 0;
+   timeDomAlloc = timeDomAllocList->choice.setup->list.array[idx];
+   CU_ALLOC(timeDomAlloc->k2, sizeof(long));
+   if(!timeDomAlloc->k2)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
+      return RFAILED;
+   }
+   *(timeDomAlloc->k2) = PUSCH_K2_CFG1;
+   timeDomAlloc->mappingType = PUSCH_MAPPING_TYPE_A;
+   timeDomAlloc->startSymbolAndLength = 66; 
+
+   idx++;
+   timeDomAlloc = timeDomAllocList->choice.setup->list.array[idx];
+   CU_ALLOC(timeDomAlloc->k2, sizeof(long));
+   if(!timeDomAlloc->k2)
+   {
+       DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
+       return RFAILED;
+   }
+   *(timeDomAlloc->k2) = PUSCH_K2_CFG2;
+   timeDomAlloc->mappingType = PUSCH_MAPPING_TYPE_A;
+   timeDomAlloc->startSymbolAndLength = 66;
+
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds BWP UL dedicated PUSCH Config
+ *
+ * @details
+ *
+ *    Function : BuildBWPUlDedPuschCfg
+ *
+ *    Functionality:
+ *      Builds BWP UL dedicated PUSCH Config
+ *
+ * @params[in] : PUSCH_Config_t *puschCfg
+ *    
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildBWPUlDedPuschCfg(PUSCH_Config_t *puschCfg)
+{
+   puschCfg->dataScramblingIdentityPUSCH = NULLP;
+   CU_ALLOC(puschCfg->dataScramblingIdentityPUSCH, sizeof(long));
+   if(!puschCfg->dataScramblingIdentityPUSCH)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPuschCfg");
+      return RFAILED;
+   }
+   *(puschCfg->dataScramblingIdentityPUSCH) = SCRAMBLING_ID;
+
+   puschCfg->txConfig = NULLP;
+   puschCfg->dmrs_UplinkForPUSCH_MappingTypeA = NULLP;
+   CU_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)
+   {
+      return RFAILED;
+   }
+
+   puschCfg->dmrs_UplinkForPUSCH_MappingTypeB = NULLP;
+   puschCfg->pusch_PowerControl = NULLP;
+   puschCfg->frequencyHopping = NULLP;
+   puschCfg->frequencyHoppingOffsetLists = NULLP;
+   puschCfg->resourceAllocation = RES_ALLOC_TYPE;
+
+   puschCfg->pusch_TimeDomainAllocationList = NULLP;
+   CU_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)
+   {
+      return RFAILED;
+   }
+
+   puschCfg->pusch_AggregationFactor = NULLP;
+   puschCfg->mcs_Table = NULLP;
+   puschCfg->mcs_TableTransformPrecoder = NULLP;
+   puschCfg->transformPrecoder = NULLP;
+   CU_ALLOC(puschCfg->transformPrecoder, sizeof(long));
+   if(!puschCfg->transformPrecoder)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPuschCfg");
+      return RFAILED;
+   }
+   *(puschCfg->transformPrecoder) = PUSCH_TRANSFORM_PRECODER;
+
+   puschCfg->codebookSubset = NULLP;
+   puschCfg->maxRank = NULLP;
+   puschCfg->rbg_Size = NULLP;
+   puschCfg->uci_OnPUSCH = NULLP;
+   puschCfg->tp_pi2BPSK = NULLP;
+
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds BWP UL dedicated PUCCH Config
+ *
+ * @details
+ *
+ *    Function : BuildBWPUlDedPucchCfg
+ *
+ *    Functionality:
+ *      Builds BWP UL dedicated PUCCH Config
+ *
+ * @params[in] : PUCCH_Config_t *pucchCfg
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildBWPUlDedPucchCfg(PUCCH_Config_t *pucchCfg)
+{
+   uint8_t arrIdx, elementCnt;
+   uint8_t rsrcIdx, rsrcSetIdx;
+   PUCCH_ResourceSet_t *rsrcSet = NULLP;
+   PUCCH_Resource_t *rsrc = NULLP;
+
+   //RESOURCE SET
+   elementCnt = 1;
+   CU_ALLOC(pucchCfg->resourceSetToAddModList, sizeof(struct PUCCH_Config__resourceSetToAddModList));
+   pucchCfg->resourceSetToAddModList->list.count = elementCnt;
+   pucchCfg->resourceSetToAddModList->list.size = elementCnt * sizeof(PUCCH_ResourceSet_t *);
+   CU_ALLOC(pucchCfg->resourceSetToAddModList->list.array, pucchCfg->resourceSetToAddModList->list.size);
+   for(rsrcSetIdx=0; rsrcSetIdx < pucchCfg->resourceSetToAddModList->list.count; rsrcSetIdx++)
+   {
+      CU_ALLOC(pucchCfg->resourceSetToAddModList->list.array[rsrcSetIdx], sizeof(PUCCH_ResourceSet_t));
+   }
+   rsrcSetIdx = 0;
+   rsrcSet = pucchCfg->resourceSetToAddModList->list.array[rsrcSetIdx];
+   rsrcSet->pucch_ResourceSetId = 1;
+   elementCnt = 1;
+   rsrcSet->resourceList.list.count = elementCnt;
+   rsrcSet->resourceList.list.size = elementCnt * sizeof(PUCCH_ResourceId_t *);
+   CU_ALLOC(rsrcSet->resourceList.list.array, rsrcSet->resourceList.list.size);
+   for(rsrcIdx=0; rsrcIdx < rsrcSet->resourceList.list.count; rsrcIdx++)
+   {
+      CU_ALLOC(rsrcSet->resourceList.list.array[rsrcIdx], sizeof(PUCCH_ResourceId_t));
+   }
+   rsrcIdx = 0;
+   *(rsrcSet->resourceList.list.array[rsrcIdx]) = 1;
+
+   //RESOURCE
+   elementCnt = 1;
+   CU_ALLOC(pucchCfg->resourceToAddModList, sizeof(struct PUCCH_Config__resourceToAddModList));
+   pucchCfg->resourceToAddModList->list.count = elementCnt;
+   pucchCfg->resourceToAddModList->list.size = elementCnt * sizeof(PUCCH_Resource_t *);
+   CU_ALLOC(pucchCfg->resourceToAddModList->list.array, pucchCfg->resourceToAddModList->list.size);
+   for(rsrcIdx=0; rsrcIdx < pucchCfg->resourceToAddModList->list.count; rsrcIdx++)
+   {
+      CU_ALLOC(pucchCfg->resourceToAddModList->list.array[rsrcIdx], sizeof(PUCCH_Resource_t));
+   }
+   rsrcIdx = 0;
+   rsrc = pucchCfg->resourceToAddModList->list.array[rsrcIdx];
+   rsrc->pucch_ResourceId = 1;
+   rsrc->startingPRB = 0;
+   rsrc->format.present = PUCCH_Resource__format_PR_format1; 
+   CU_ALLOC(rsrc->format.choice.format1, sizeof(PUCCH_format1_t));
+   rsrc->format.choice.format1->initialCyclicShift = 0;
+   rsrc->format.choice.format1->nrofSymbols = 4;
+   rsrc->format.choice.format1->startingSymbolIndex = 0;
+   rsrc->format.choice.format1->timeDomainOCC = 0;
+
+   //PUCCH Format 1
+   CU_ALLOC(pucchCfg->format1, sizeof(struct PUCCH_Config__format1));
+   pucchCfg->format1->present = PUCCH_Config__format1_PR_setup;
+   CU_ALLOC(pucchCfg->format1->choice.setup, sizeof(PUCCH_FormatConfig_t));
+   CU_ALLOC(pucchCfg->format1->choice.setup->nrofSlots, sizeof(long));
+   *(pucchCfg->format1->choice.setup->nrofSlots) = PUCCH_FormatConfig__nrofSlots_n4;
+
+   //DL DATA TO UL ACK
+   CU_ALLOC(pucchCfg->dl_DataToUL_ACK, sizeof(struct PUCCH_Config__dl_DataToUL_ACK));
+   if(pucchCfg->dl_DataToUL_ACK == NULLP)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+      return RFAILED;
+   }
+
+   elementCnt = 2;
+   pucchCfg->dl_DataToUL_ACK->list.count = elementCnt;
+   pucchCfg->dl_DataToUL_ACK->list.size = elementCnt * sizeof(long *);
+   CU_ALLOC(pucchCfg->dl_DataToUL_ACK->list.array, pucchCfg->dl_DataToUL_ACK->list.size);
+   if(pucchCfg->dl_DataToUL_ACK->list.array == NULLP)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+      return RFAILED;
+   }
+
+   for(arrIdx = 0; arrIdx <  pucchCfg->dl_DataToUL_ACK->list.count; arrIdx++)
+   {
+      CU_ALLOC(pucchCfg->dl_DataToUL_ACK->list.array[arrIdx], sizeof(long));
+      if(pucchCfg->dl_DataToUL_ACK->list.array[arrIdx] == NULLP)
+      {
+          DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+          return RFAILED;
+      }
+   }
+
+   arrIdx = 0;
+   *(pucchCfg->dl_DataToUL_ACK->list.array[arrIdx++]) = 4;
+   *(pucchCfg->dl_DataToUL_ACK->list.array[arrIdx]) = 5;
+
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Fills SRS resource to add/modify list 
+ *
+ * @details
+ *
+ *    Function : BuildSrsRsrcAddModList
+ *
+ *    Functionality: Fills SRS resource to add/modify list
+ *
+ * @params[in] 
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildSrsRsrcAddModList(struct SRS_Config__srs_ResourceToAddModList *resourceList)
+{
+   uint8_t   elementCnt;
+   uint8_t   rsrcIdx;
+
+   elementCnt = 1;
+   resourceList->list.count = elementCnt;
+   resourceList->list.size = elementCnt * sizeof(SRS_Resource_t *);
+   resourceList->list.array = NULLP;
+   CU_ALLOC(resourceList->list.array, resourceList->list.size);
+   if(!resourceList->list.array)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed in BuildSrsRsrcAddModList");
+      return RFAILED;
+   }
+
+   for(rsrcIdx = 0; rsrcIdx < resourceList->list.count; rsrcIdx++)
+   {
+      CU_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;
+   CU_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;
 
-   if(f1apMsg != NULLP)
+   /* 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;
+   CU_ALLOC(resourceList->list.array[rsrcIdx]->resourceType.choice.aperiodic,
+        sizeof(struct SRS_Resource__resourceType__aperiodic));
+   if(!resourceList->list.array[rsrcIdx]->resourceType.choice.aperiodic)
    {
-      if(f1apMsg->choice.initiatingMessage != NULLP)
-      {
-         ueSetReq = &f1apMsg->choice.initiatingMessage->value.choice.UEContextSetupRequest;
-         if(ueSetReq->protocolIEs.list.array != NULLP)
-         {
-            for(idx = 0; idx < ueSetReq->protocolIEs.list.count; idx++)
-            {
-               if(ueSetReq->protocolIEs.list.array[idx])
-               {
-                  switch(ueSetReq->protocolIEs.list.array[idx]->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_SpCell_ID:
-                        FreeNrcgi(&ueSetReq->protocolIEs.list.array[idx]->value.choice.NRCGI);
-                        break;
-                     case ProtocolIE_ID_id_ServCellIndex:
-                        break;
-                     case ProtocolIE_ID_id_SpCellULConfigured:
-                        break;
-                     case ProtocolIE_ID_id_CUtoDURRCInformation:
-                        FreeCuToDuInfo(&ueSetReq->protocolIEs.list.array[idx]->value.choice.CUtoDURRCInformation);
-                        break;
-                     case ProtocolIE_ID_id_SCell_ToBeSetup_List:
-                        FreeSplCellList(&ueSetReq->protocolIEs.list.array[idx]->value.choice.SCell_ToBeSetup_List);
-                        break;
-                     case ProtocolIE_ID_id_SRBs_ToBeSetup_List:
-                        FreeSRBSetup(&ueSetReq->protocolIEs.list.array[idx]->value.choice.SRBs_ToBeSetup_List);
-                        break;
-                     case ProtocolIE_ID_id_DRBs_ToBeSetup_List:
-                        FreeDRBSetup(&ueSetReq->protocolIEs.list.array[idx]->value.choice.DRBs_ToBeSetup_List);
-                        break;
-                     case ProtocolIE_ID_id_RRCContainer:
-                        if(ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf != NULLP)
-                        {
-                           CU_FREE(ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf, \
-                                 ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.size);
-                        }
-                        break;
-                     default:
-                        DU_LOG("\nERROR  -->  F1AP: Invalid event type %ld", ueSetReq->protocolIEs.list.array[idx]->id);
-                        break;
-                  }
-               }
-               /*BUG: Break is causing to exit the for Loop before complete traversing and freeing of each IE*/
-            }
-            for(ieId=0; ieId<idx; ieId++)
-            {
-               if(ueSetReq->protocolIEs.list.array[ieId] != NULLP)
-               {
-                  CU_FREE(ueSetReq->protocolIEs.list.array[ieId],sizeof(UEContextSetupRequestIEs_t));
-               }
-            }
-            CU_FREE(ueSetReq->protocolIEs.list.array,ueSetReq->protocolIEs.list.size);
-         }
-         CU_FREE(f1apMsg->choice.initiatingMessage,sizeof(InitiatingMessage_t));
-      }
-      CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed in BuildSrsRsrcAddModList");
+      return RFAILED;
    }
+   resourceList->list.array[rsrcIdx]->sequenceId = SRS_SEQ_ID;
+
+   return ROK;
 }
 
-/**Filling cell group info **/
 /*******************************************************************
  *
- * @brief Build Control resource set to add/modify list 
+ * @brief Build SRS resource set Add/mod list
  *
  * @details
  *
- *    Function : BuildControlRSetToAddModList
+ *    Function : BuildSrsRsrcSetAddModList
  *
- *    Functionality: Build Control resource set to add/modify list
+ *    Functionality: Build SRS resource set Add/mod list
  *
  * @params[in] 
- * struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList
- *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-   uint8_t BuildControlRSetToAddModList
+   uint8_t BuildSrsRsrcSetAddModList
 (
- struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList
+ struct SRS_Config__srs_ResourceSetToAddModList *rsrcSetList
  )
 {
-   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;
+   uint8_t  elementCnt;
+   uint8_t  rSetIdx;
+   uint8_t  rsrcIdx;
+   struct SRS_ResourceSet__srs_ResourceIdList *rsrcIdList;
 
    elementCnt = 1;
-   controlRSetList->list.count = elementCnt;
-   controlRSetList->list.size = \
-                               elementCnt * sizeof(struct ControlResourceSet *);
-
-   controlRSetList->list.array = NULLP;
-   CU_ALLOC(controlRSetList->list.array, controlRSetList->list.size);
-   if(!controlRSetList->list.array)
+   rsrcSetList->list.count = elementCnt;
+   rsrcSetList->list.size = elementCnt * sizeof(SRS_ResourceSet_t *);
+   rsrcSetList->list.array = NULLP;
+   CU_ALLOC(rsrcSetList->list.array, rsrcSetList->list.size);
+   if(!rsrcSetList->list.array)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed in BuildSrsRsrcSetAddModList");
       return RFAILED;
    }
 
-   for(idx = 0; idx < elementCnt; idx++)
+   for(rSetIdx = 0; rSetIdx < rsrcSetList->list.count; rSetIdx++)
    {
-      controlRSetList->list.array[idx] = NULLP;
-      CU_ALLOC(controlRSetList->list.array[idx], sizeof(struct ControlResourceSet));
-      if(!controlRSetList->list.array[idx])
+      CU_ALLOC(rsrcSetList->list.array[rSetIdx], sizeof(SRS_ResourceSet_t));
+      if(!rsrcSetList->list.array[rSetIdx])
       {
-        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+        DU_LOG("\nERROR  -->  F1AP: Memory allocation failed in BuildSrsRsrcSetAddModList");
         return RFAILED;
       }
    }
 
-   idx=0;
-   controlRSet = controlRSetList->list.array[idx];
-   controlRSet->controlResourceSetId = PDCCH_CTRL_RSRC_SET_ONE_ID;
+   rSetIdx = 0;
+   rsrcSetList->list.array[rSetIdx]->srs_ResourceSetId = SRS_RSET_ID;
 
-   /* Values harcoded according to our design:
-    * 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;
-   CU_ALLOC(controlRSet->frequencyDomainResources.buf, \
-        controlRSet->frequencyDomainResources.size);
-   if(!controlRSet->frequencyDomainResources.buf)
+   /* Fill Resource Id list in resource set */
+   rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList = NULLP;
+   CU_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 BuildControlRSetToAddModList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSrsRsrcSetAddModList");
       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 */
-   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;
-   controlRSet->tci_StatesPDCCH_ToAddList = NULLP;
-   controlRSet->tci_StatesPDCCH_ToReleaseList = NULLP;
-   controlRSet->tci_PresentInDCI = NULLP;
-#if 0
-   uint8_t tciStateIdx;
-
-   CU_ALLOC(controlRset->tci_StatesPDCCH_ToAddList, \
-        sizeof(struct ControlResourceSet__tci_StatesPDCCH_ToAddList));
-   if(!controlRset->tci_StatesPDCCH_ToAddList)
+   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;
+   CU_ALLOC(rsrcIdList->list.array, rsrcIdList->list.size);
+   if(!rsrcIdList->list.array)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed in BuildSrsRsrcSetAddModList");
       return RFAILED;
    }
 
-   elementCnt = 1;
-   controlRset->tci_StatesPDCCH_ToAddList->list.count = elementCnt;
-   controlRset->tci_StatesPDCCH_ToAddList->list.size = elementCnt * sizeof(TCI_StateId_t *);
-   CU_ALLOC(controlRset->tci_StatesPDCCH_ToAddList->list.array, \
-        controlRset->tci_StatesPDCCH_ToAddList->list.size)
-      if(!controlRset->tci_StatesPDCCH_ToAddList->list.array)
+   for(rsrcIdx = 0; rsrcIdx < rsrcIdList->list.count; rsrcIdx++)
+   {
+      CU_ALLOC(rsrcIdList->list.array[rsrcIdx], sizeof(SRS_ResourceId_t));
+      if(!rsrcIdList->list.array[rsrcIdx])
       {
-        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+        DU_LOG("\nERROR  -->  F1AP: Memory allocation failed in BuildSrsRsrcSetAddModList");
         return RFAILED;
       }
+   }
 
-   for(tciStateIdx = 0; tciStateIdx <elementCntl; tciStateIdx++)
+   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;
+   CU_ALLOC(rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic, \
+        sizeof(struct SRS_ResourceSet__resourceType__aperiodic));
+   if(!rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic)
    {
-      CU_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;
-      }
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed in BuildSrsRsrcSetAddModList");
+      return RFAILED;
+   }
+   rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic->aperiodicSRS_ResourceTrigger \
+      = APERIODIC_SRS_RESRC_TRIGGER;
+
+   /* 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;
+
+
+   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 Builds BWP UL dedicated SRS Config
+ *
+ * @details
+ *
+ *    Function : BuildBWPUlDedSrsCfg
+ *
+ *    Functionality: Builds BWP UL dedicated SRS Config
+ *
+ * @params[in] SRS Config 
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildBWPUlDedSrsCfg(SRS_Config_t *srsCfg)
+{
+   srsCfg->srs_ResourceSetToReleaseList = NULLP;
+   srsCfg->srs_ResourceSetToAddModList = NULLP;
+   CU_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;
    }
 
-   tciStateIdx = 0;
-   /* TODO */
-   *(controlRset->tci_StatesPDCCH_ToAddList->list.array[tciStateIdx]);
+   srsCfg->srs_ResourceToReleaseList = NULLP;
 
-   CU_ALLOC(controlRset->tci_PresentInDCI, sizeof(long));
-   if(!controlRset->tci_PresentInDCI)
+   /* Resource to Add/Modify list */
+   srsCfg->srs_ResourceToAddModList = NULLP;
+   CU_ALLOC(srsCfg->srs_ResourceToAddModList, \
+        sizeof(struct SRS_Config__srs_ResourceToAddModList));
+   if(!srsCfg->srs_ResourceToAddModList)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed in BuildBWPUlDedSrsCfg");
       return RFAILED;
    }
-   /* TODO */
-   *(controlRset->tci_PresentInDCI);
-#endif
 
-   controlRSet->pdcch_DMRS_ScramblingID = NULLP;
-   CU_ALLOC(controlRSet->pdcch_DMRS_ScramblingID, sizeof(long));
-   if(!controlRSet->pdcch_DMRS_ScramblingID)
+   if(BuildSrsRsrcAddModList(srsCfg->srs_ResourceToAddModList) != ROK)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildControlRSetToAddModList");
       return RFAILED;
    }
-   *(controlRSet->pdcch_DMRS_ScramblingID) = SCRAMBLING_ID;
+
+   srsCfg->tpc_Accumulation = NULLP;
 
    return ROK;
-} /* End BuildControlRSetToAddModList */
+}
 
 /*******************************************************************
  *
- * @brief Build search space to add/modify list
+ * @brief Builds inital UL BWP
  *
  * @details
  *
- *    Function : BuildSearchSpcToAddModList
+ *    Function : BuildInitialUlBWP
  *
- *    Functionality: Build search space to add/modify list
+ *    Functionality: Builds initial UL BWP
  *
- * @params[in] 
+ * @params[in] BWP_UplinkDedicated_t *ulBwp
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-   uint8_t BuildSearchSpcToAddModList
-(
- struct PDCCH_Config__searchSpacesToAddModList *searchSpcList
- )
+uint8_t BuildInitialUlBWP(BWP_UplinkDedicated_t *ulBwp)
 {
-   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;
-   CU_ALLOC(searchSpcList->list.array, searchSpcList->list.size);
-   if(!searchSpcList->list.array)
+   ulBwp->pucch_Config = NULLP;
+   ulBwp->pucch_Config = NULLP;
+   CU_ALLOC(ulBwp->pucch_Config, sizeof(struct BWP_UplinkDedicated__pucch_Config));
+   if(!ulBwp->pucch_Config)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildInitialUlBWP");
       return RFAILED;
    }
 
-   for(idx = 0; idx < elementCnt; idx++)
+   ulBwp->pucch_Config->present = BWP_UplinkDedicated__pucch_Config_PR_setup;
+   ulBwp->pucch_Config->choice.setup = NULLP;
+   CU_ALLOC(ulBwp->pucch_Config->choice.setup, sizeof(PUCCH_Config_t));
+   if(!ulBwp->pucch_Config->choice.setup)
    {
-      searchSpcList->list.array[idx] = NULLP;
-      CU_ALLOC(searchSpcList->list.array[idx], sizeof(struct SearchSpace));
-      if(!searchSpcList->list.array[idx])
-      {
-        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
-        return RFAILED;
-      }
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildInitialUlBWP");
+      return RFAILED;
    }
 
-   idx = 0;
-   searchSpc = searchSpcList->list.array[idx];
-
-   searchSpc->searchSpaceId = PDCCH_SRCH_SPC_TWO_ID;
+   if(BuildBWPUlDedPucchCfg(ulBwp->pucch_Config->choice.setup) != ROK)
+   {
+      return RFAILED;
+   }
 
-   searchSpc->controlResourceSetId = NULLP;
-   CU_ALLOC(searchSpc->controlResourceSetId, sizeof(ControlResourceSetId_t));
-   if(!searchSpc->controlResourceSetId)
+   /* Fill BWP UL dedicated PUSCH config */
+   ulBwp->pusch_Config = NULLP;
+   CU_ALLOC(ulBwp->pusch_Config, sizeof(struct BWP_UplinkDedicated__pusch_Config));
+   if(!ulBwp->pusch_Config)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildInitialUlBWP");
       return RFAILED;
    }
-   *(searchSpc->controlResourceSetId) = PDCCH_CTRL_RSRC_SET_ONE_ID;
 
-   searchSpc->monitoringSlotPeriodicityAndOffset = NULLP;
-   CU_ALLOC(searchSpc->monitoringSlotPeriodicityAndOffset, \
-        sizeof(struct SearchSpace__monitoringSlotPeriodicityAndOffset));
-   if(!searchSpc->monitoringSlotPeriodicityAndOffset)
+   ulBwp->pusch_Config->present = BWP_UplinkDedicated__pusch_Config_PR_setup;
+   ulBwp->pusch_Config->choice.setup = NULLP;
+   CU_ALLOC(ulBwp->pusch_Config->choice.setup, sizeof(PUSCH_Config_t));
+   if(!ulBwp->pusch_Config->choice.setup)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildInitialUlBWP");
       return RFAILED;
    }
-   searchSpc->monitoringSlotPeriodicityAndOffset->present = \
-                                                           SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1;
 
-   searchSpc->duration = NULLP;
-   searchSpc->monitoringSymbolsWithinSlot = NULLP;
-   CU_ALLOC(searchSpc->monitoringSymbolsWithinSlot, sizeof(BIT_STRING_t));
-   if(!searchSpc->monitoringSymbolsWithinSlot)
+   if(BuildBWPUlDedPuschCfg(ulBwp->pusch_Config->choice.setup) != ROK)
    {
-      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;
+   ulBwp->configuredGrantConfig = NULLP;
 
-   searchSpc->monitoringSymbolsWithinSlot->size = numBytes * sizeof(uint8_t);
-   searchSpc->monitoringSymbolsWithinSlot->buf = NULLP;
-   CU_ALLOC(searchSpc->monitoringSymbolsWithinSlot->buf, \
-        searchSpc->monitoringSymbolsWithinSlot->size);
-   if(!searchSpc->monitoringSymbolsWithinSlot->buf)
+   /* Fill BPW UL dedicated SRS config */
+   ulBwp->srs_Config = NULLP;
+   CU_ALLOC(ulBwp->srs_Config, sizeof(struct BWP_UplinkDedicated__srs_Config));
+   if(!ulBwp->srs_Config)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildInitialUlBWP");
       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;
-   CU_ALLOC(searchSpc->nrofCandidates, sizeof(struct SearchSpace__nrofCandidates));
-   if(!searchSpc->nrofCandidates)
+   ulBwp->srs_Config->present = BWP_UplinkDedicated__srs_Config_PR_setup;
+   ulBwp->srs_Config->choice.setup = NULLP;
+   CU_ALLOC(ulBwp->srs_Config->choice.setup, sizeof(SRS_Config_t));
+   if(!ulBwp->srs_Config->choice.setup)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildInitialUlBWP");
       return RFAILED;
    }
 
-   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;
+   if(BuildBWPUlDedSrsCfg(ulBwp->srs_Config->choice.setup) != ROK)
+   {
+      return RFAILED;   
+   }
 
-   searchSpc->searchSpaceType = NULLP;
-   CU_ALLOC(searchSpc->searchSpaceType, sizeof(struct SearchSpace__searchSpaceType));
-   if(!searchSpc->searchSpaceType)
+   ulBwp->beamFailureRecoveryConfig = NULLP;
+
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds Pusch Serving cell Config
+ *
+ * @details
+ *
+ *    Function : BuildPuschSrvCellCfg
+ *
+ *    Functionality: Builds Pusch Serving cell Config
+ *
+ * @params[in] struct UplinkConfig__pusch_ServingCellConfig *puschCfg
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildPuschSrvCellCfg(struct UplinkConfig__pusch_ServingCellConfig *puschCfg)
+{
+   puschCfg->present = UplinkConfig__pusch_ServingCellConfig_PR_setup;
+   puschCfg->choice.setup = NULLP;
+   CU_ALLOC(puschCfg->choice.setup, sizeof(struct PUSCH_ServingCellConfig));
+   if(!puschCfg->choice.setup)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschSrvCellCfg");
       return RFAILED;
    }
 
-   searchSpc->searchSpaceType->present = SearchSpace__searchSpaceType_PR_ue_Specific;
+   puschCfg->choice.setup->codeBlockGroupTransmission = NULLP;
+   puschCfg->choice.setup->rateMatching = NULLP;
+   puschCfg->choice.setup->xOverhead = NULLP;
+   puschCfg->choice.setup->ext1 = NULLP;
+   CU_ALLOC(puschCfg->choice.setup->ext1, sizeof(struct PUSCH_ServingCellConfig__ext1));
+   if(!puschCfg->choice.setup->ext1)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschSrvCellCfg");
+      return RFAILED;
+   }
 
-   searchSpc->searchSpaceType->choice.ue_Specific = NULLP;
-   CU_ALLOC(searchSpc->searchSpaceType->choice.ue_Specific, \
-        sizeof(struct SearchSpace__searchSpaceType__ue_Specific));
-   if(!searchSpc->searchSpaceType->choice.ue_Specific)
+   puschCfg->choice.setup->ext1->maxMIMO_Layers = NULLP;
+   CU_ALLOC(puschCfg->choice.setup->ext1->maxMIMO_Layers, sizeof(long));
+   if(!puschCfg->choice.setup->ext1->maxMIMO_Layers)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschSrvCellCfg");
       return RFAILED;
-   }  
-   searchSpc->searchSpaceType->choice.ue_Specific->dci_Formats = \
-                                                                PDCCH_SRCH_SPC_TWO_UE_SPEC_DCI_FORMAT;
+   }
+   *(puschCfg->choice.setup->ext1->maxMIMO_Layers) = PUSCH_MAX_MIMO_LAYERS;
 
+   puschCfg->choice.setup->ext1->processingType2Enabled= NULLP;
+   CU_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;
-}/* End BuildSearchSpcToAddModList */
+}
 
 /*******************************************************************
  *
- * @brief Builds BWP DL dedicated PDCCH config
- *
+ * @brief Builds UL config
  * @details
  *
- *    Function : BuildBWPDlDedPdcchCfg
+ *    Function : BuildUlCfg 
  *
- *    Functionality: Builds BWP DL dedicated PDCCH config
+ *    Functionality: Builds UL config in spCellCfgDed
  *
- * @params[in] struct PDCCH_Config *pdcchCfg
+ * @params[in] UplinkConfig_t *ulCfg
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildBWPDlDedPdcchCfg(struct PDCCH_Config *pdcchCfg)
+uint8_t BuildUlCfg(UplinkConfig_t *ulCfg)
 {
-   pdcchCfg->controlResourceSetToAddModList = NULLP;
-   CU_ALLOC(pdcchCfg->controlResourceSetToAddModList, \
-        sizeof(struct PDCCH_Config__controlResourceSetToAddModList));
-   if(!pdcchCfg->controlResourceSetToAddModList)
+   ulCfg->initialUplinkBWP = NULLP;
+   CU_ALLOC(ulCfg->initialUplinkBWP, sizeof(BWP_UplinkDedicated_t));
+   if(!ulCfg->initialUplinkBWP)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPDlDedPdcchCfg");
+      DU_LOG("\nERROR  -->  F1AP : Memory Allocation failed in BuildUlCfg");
       return RFAILED;
    }
 
-   if(BuildControlRSetToAddModList(pdcchCfg->controlResourceSetToAddModList) != ROK)
+   if(BuildInitialUlBWP(ulCfg->initialUplinkBWP) != ROK)
    {
       return RFAILED;
    }
 
-   pdcchCfg->controlResourceSetToReleaseList = NULLP;
-
-   pdcchCfg->searchSpacesToAddModList = NULLP;
-   CU_ALLOC(pdcchCfg->searchSpacesToAddModList, \
-        sizeof(struct PDCCH_Config__searchSpacesToAddModList));
-   if(!pdcchCfg->searchSpacesToAddModList)
+   ulCfg->uplinkBWP_ToReleaseList = NULLP;
+   ulCfg->uplinkBWP_ToAddModList = NULLP;
+   ulCfg->firstActiveUplinkBWP_Id = NULLP;
+   CU_ALLOC(ulCfg->firstActiveUplinkBWP_Id, sizeof(BWP_Id_t));
+   if(!ulCfg->firstActiveUplinkBWP_Id)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPDlDedPdcchCfg");
+      DU_LOG("\nERROR  -->  F1AP : Memory Allocation failed in BuildUlCfg");
       return RFAILED;
    }
+   *(ulCfg->firstActiveUplinkBWP_Id) = ACTIVE_UL_BWP_ID;
 
-   if(BuildSearchSpcToAddModList(pdcchCfg->searchSpacesToAddModList) != ROK)
+   ulCfg->pusch_ServingCellConfig = NULLP;
+   CU_ALLOC(ulCfg->pusch_ServingCellConfig, \
+        sizeof(struct UplinkConfig__pusch_ServingCellConfig));
+   if(!ulCfg->pusch_ServingCellConfig)
    {
+      DU_LOG("\nERROR  -->  F1AP : Memory Allocation failed in BuildUlCfg");
       return RFAILED;
    }
 
-   pdcchCfg->searchSpacesToReleaseList = NULLP;
-   pdcchCfg->downlinkPreemption = NULLP;
-   pdcchCfg->tpc_PUSCH = NULLP;
-   pdcchCfg->tpc_PUCCH = NULLP;
-   pdcchCfg->tpc_SRS = NULLP;
+   if(BuildPuschSrvCellCfg(ulCfg->pusch_ServingCellConfig) != ROK)
+   {
+      return RFAILED;
+   }
 
+   ulCfg->carrierSwitching = NULLP;
+   ulCfg->ext1 = NULLP;
    return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Builds DMRS DL PDSCH Mapping type A
- *
+ * @brief Builds PDSCH serving cell config
  * @details
  *
- *    Function : BuildDMRSDLPdschMapTypeA
+ *    Function : BuildPdschSrvCellCfg
  *
- *    Functionality: Builds DMRS DL PDSCH Mapping type A
+ *    Functionality: Builds PDSCH serving cell config in spCellCfgDed
+ *
+ * @params[in] struct ServingCellConfig__pdsch_ServingCellConfig *pdschCfg 
  *
- * @params[in]
- * struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA *dmrsDlCfg
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-   uint8_t BuildDMRSDLPdschMapTypeA
-(
- struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA *dmrsDlCfg
- )
+uint8_t BuildPdschSrvCellCfg(struct ServingCellConfig__pdsch_ServingCellConfig *pdschCfg)
 {
-   dmrsDlCfg->present = PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA_PR_setup;
-   dmrsDlCfg->choice.setup = NULLP;
-   CU_ALLOC(dmrsDlCfg->choice.setup, sizeof(struct DMRS_DownlinkConfig));
-   if(!dmrsDlCfg->choice.setup)
+   pdschCfg->present =  ServingCellConfig__pdsch_ServingCellConfig_PR_setup;
+   pdschCfg->choice.setup = NULLP;
+   CU_ALLOC(pdschCfg->choice.setup, sizeof( struct PDSCH_ServingCellConfig));
+   if(!pdschCfg->choice.setup)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschSrvCellCfg");
       return RFAILED;
    }
 
-   dmrsDlCfg->choice.setup->dmrs_Type = NULLP;
-   dmrsDlCfg->choice.setup->dmrs_AdditionalPosition = NULLP;
-   CU_ALLOC(dmrsDlCfg->choice.setup->dmrs_AdditionalPosition, sizeof(long));
-   if(!dmrsDlCfg->choice.setup->dmrs_AdditionalPosition)
+   pdschCfg->choice.setup->codeBlockGroupTransmission = NULLP;
+   pdschCfg->choice.setup->xOverhead = NULLP;
+   pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH = NULLP;
+   CU_ALLOC(pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH, sizeof(long));
+   if(!pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDMRSDLPdschMapTypeA");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschSrvCellCfg");
       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;
+   *(pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH)= PDSCH_NUM_HARQ_PROC;
+   pdschCfg->choice.setup->pucch_Cell = NULLP;
+   pdschCfg->choice.setup->ext1 = NULLP;
 
    return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Builds TCI states to add/modify list
- *
+ * @brief Builds CSI Meas config
  * @details
  *
- *    Function : BuildTCIStatesToAddModList
+ *    Function : BuildCsiMeasCfg 
  *
- *    Functionality:Builds TCI states to add/modify list
+ *    Functionality: Builds CSI Meas config in spCellCfgDed
  *
- * @params[in] 
- * struct PDSCH_Config__tci_StatesToAddModList *tciStatesList
+ * @params[in] struct ServingCellConfig__csi_MeasConfig *csiMeasCfg
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildTCIStatesToAddModList(struct PDSCH_Config__tci_StatesToAddModList *tciStatesList)
+uint8_t BuildCsiMeasCfg(struct ServingCellConfig__csi_MeasConfig *csiMeasCfg)
 {
+
    return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Builds PDSCH time domain allocation list
- *
+ * @brief Builds Spcell config dedicated
  * @details
  *
- *    Function : BuildPdschTimeDomAllocList
+ *    Function : BuildSpCellCfgDed
  *
- *    Functionality: Builds PDSCH time domain allocation list
+ *    Functionality: Builds sp cell config dedicated in spCellCfg
  *
- * @params[in] 
- * struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList
+ * @params[in] ServingCellConfig_t srvCellCfg
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-   uint8_t BuildPdschTimeDomAllocList
-(
- struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList
- )
+uint8_t BuildSpCellCfgDed(ServingCellConfig_t *srvCellCfg)
 {
-   uint8_t idx;
-   uint8_t elementCnt;
-   struct PDSCH_TimeDomainResourceAllocation *timeDomAlloc;
+   srvCellCfg->tdd_UL_DL_ConfigurationDedicated = NULLP;
 
-   timeDomAllocList->present = \
-                              PDSCH_Config__pdsch_TimeDomainAllocationList_PR_setup;
+   srvCellCfg->initialDownlinkBWP = NULLP;
+   CU_ALLOC(srvCellCfg->initialDownlinkBWP, sizeof(BWP_DownlinkDedicated_t));
+   if(!srvCellCfg->initialDownlinkBWP)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
+      return RFAILED;
+   }
 
-   timeDomAllocList->choice.setup = NULLP;
-   CU_ALLOC(timeDomAllocList->choice.setup, \
-        sizeof(struct PDSCH_TimeDomainResourceAllocationList));
-   if(!timeDomAllocList->choice.setup)
+   if(BuildInitialDlBWP(srvCellCfg->initialDownlinkBWP) != ROK)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
+      DU_LOG("\nERROR  -->  F1AP : BuildInitialDlBWP failed");
       return RFAILED;
    }
+   srvCellCfg->downlinkBWP_ToReleaseList = NULLP;
+   srvCellCfg->downlinkBWP_ToAddModList = NULLP;
 
-   elementCnt = 2;
-   timeDomAllocList->choice.setup->list.count = elementCnt;
-   timeDomAllocList->choice.setup->list.size = \
-                                              elementCnt * sizeof(struct PDSCH_TimeDomainResourceAllocation *);
+   srvCellCfg->firstActiveDownlinkBWP_Id = NULLP;
+   CU_ALLOC(srvCellCfg->firstActiveDownlinkBWP_Id, sizeof(long));
+   if(!srvCellCfg->firstActiveDownlinkBWP_Id)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
+      return RFAILED;
+   }
+   *(srvCellCfg->firstActiveDownlinkBWP_Id) = ACTIVE_DL_BWP_ID;
 
-   timeDomAllocList->choice.setup->list.array = NULLP;
-   CU_ALLOC(timeDomAllocList->choice.setup->list.array, \
-        timeDomAllocList->choice.setup->list.size);
-   if(!timeDomAllocList->choice.setup->list.array)
+   srvCellCfg->bwp_InactivityTimer = NULLP;
+
+   srvCellCfg->defaultDownlinkBWP_Id = NULLP;
+   CU_ALLOC(srvCellCfg->defaultDownlinkBWP_Id, sizeof(long));
+   if(!srvCellCfg->defaultDownlinkBWP_Id)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
       return RFAILED;
    }
+   *(srvCellCfg->defaultDownlinkBWP_Id) = ACTIVE_DL_BWP_ID;
 
-   for(idx = 0; idx < elementCnt; idx++)
+   srvCellCfg->uplinkConfig = NULLP;
+   CU_ALLOC(srvCellCfg->uplinkConfig, sizeof(UplinkConfig_t));
+   if(!srvCellCfg->uplinkConfig)
    {
-      timeDomAllocList->choice.setup->list.array[idx] = NULLP;
-      CU_ALLOC(timeDomAllocList->choice.setup->list.array[idx], \
-           sizeof(struct PDSCH_TimeDomainResourceAllocation));
-      if(!timeDomAllocList->choice.setup->list.array[idx])
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
+      return RFAILED;
+   }
+
+   if(BuildUlCfg(srvCellCfg->uplinkConfig) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP : BuildUlCfg failed");
+      return RFAILED;
+   }
+   srvCellCfg->supplementaryUplink = NULLP;
+   srvCellCfg->pdcch_ServingCellConfig = NULLP;
+
+   srvCellCfg->pdsch_ServingCellConfig = NULLP;
+   CU_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(srvCellCfg->pdsch_ServingCellConfig) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP : BuildPdschSrvCellCfg failed");
+      return RFAILED;
+   }
+
+   srvCellCfg->csi_MeasConfig = NULLP;
+#if 0
+   CU_ALLOC(srvCellCfg->csi_MeasConfig, sizeof(struct  ServingCellConfig__csi_MeasConfig))
+      if(!srvCellCfg->csi_MeasConfig)
       {
-        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
+        DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
         return RFAILED;
       }
+
+   if(BuildCsiMeasCfg(srvCellCfg->csi_MeasConfig) != ROK)
+   {
+      DU_LOG("\nF1AP : BuildCsiMeasCfg failed");
+      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;
 
-   idx = 0;
-   timeDomAlloc = timeDomAllocList->choice.setup->list.array[idx];
-   CU_ALLOC(timeDomAlloc->k0, sizeof(long));
-   if(!timeDomAlloc->k0)
+   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)
+{
+
+   spCellCfg->servCellIndex = NULLP;
+   CU_ALLOC(spCellCfg->servCellIndex, sizeof(long));
+   if(!spCellCfg->servCellIndex)
    {
-       DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
-       return RFAILED;
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfg");
+      return RFAILED;
    }
-   *(timeDomAlloc->k0) = 0;
-   timeDomAlloc->mappingType = PDSCH_MAPPING_TYPE_A;
-   timeDomAlloc->startSymbolAndLength = 66;
+   *(spCellCfg->servCellIndex) = SERV_CELL_IDX;
 
-   idx++;
-   timeDomAlloc = timeDomAllocList->choice.setup->list.array[idx];
-   CU_ALLOC(timeDomAlloc->k0, sizeof(long));
-   if(!timeDomAlloc->k0)
+   spCellCfg->reconfigurationWithSync = NULLP;
+   spCellCfg->rlf_TimersAndConstants = NULLP;
+   spCellCfg->rlmInSyncOutOfSyncThreshold = NULLP;
+   CU_ALLOC(spCellCfg->rlmInSyncOutOfSyncThreshold, sizeof(long));
+   if(!spCellCfg->rlmInSyncOutOfSyncThreshold)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfg");
       return RFAILED;
    }
-   *(timeDomAlloc->k0) = 1;
-   timeDomAlloc->mappingType = PDSCH_MAPPING_TYPE_A;
-   timeDomAlloc->startSymbolAndLength = 66;
+   *(spCellCfg->rlmInSyncOutOfSyncThreshold) = RLM_SYNC_OUT_SYNC_THRESHOLD;
 
+   spCellCfg->spCellConfigDedicated = NULLP;
+   CU_ALLOC(spCellCfg->spCellConfigDedicated, sizeof(ServingCellConfig_t));
+   if(!spCellCfg->spCellConfigDedicated)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfg");
+      return RFAILED;
+   }
+   if(BuildSpCellCfgDed(spCellCfg->spCellConfigDedicated) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP : BuildSpCellCfgDed failed");
+      return RFAILED;
+   }
    return ROK;
 }
-
 /*******************************************************************
  *
- * @brief Builds PDSCH PRB Bundling type
+ * @brief Builds Phy cell group config 
  *
  * @details
  *
- *    Function : BuildPdschPrbBundlingType
+ *    Function : BuildPhyCellGrpCfg 
  *
- *    Functionality: Builds PDSCH PRB Bundling type
+ *    Functionality: Builds Phy cell group config in DuToCuRrcContainer
  *
- * @params[in] 
- * struct PDSCH_Config__prb_BundlingType *prbBndlType
+ * @params[in] PhysicalCellGroupConfig_t *phyCellGrpCfg 
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-   uint8_t BuildPdschPrbBundlingType
-(
- struct PDSCH_Config__prb_BundlingType *prbBndlType
- )
+uint8_t BuildPhyCellGrpCfg(PhysicalCellGroupConfig_t *phyCellGrpCfg)
 {
-   prbBndlType->present = PDSCH_Config__prb_BundlingType_PR_staticBundling;
+   phyCellGrpCfg->harq_ACK_SpatialBundlingPUCCH = NULLP;
+   phyCellGrpCfg->harq_ACK_SpatialBundlingPUSCH = NULLP;
 
-   prbBndlType->choice.staticBundling = NULLP;
-   CU_ALLOC(prbBndlType->choice.staticBundling, \
-        sizeof(struct PDSCH_Config__prb_BundlingType__staticBundling));
-   if(!prbBndlType->choice.staticBundling)
+   phyCellGrpCfg->p_NR_FR1 = NULLP;
+   CU_ALLOC(phyCellGrpCfg->p_NR_FR1, sizeof(long));
+   if(!phyCellGrpCfg->p_NR_FR1)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschPrbBundlingType");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildPhyCellGrpCfg");
       return RFAILED;
    }
-   prbBndlType->choice.staticBundling->bundleSize = NULLP;
+   *(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;
 
    return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Builds BWP DL dedicated PDSCH config 
+ * @brief Builds tag config 
  *
  * @details
  *
- *    Function : BuildBWPDlDedPdschCfg
+ *    Function : BuildTagConfig 
  *
- *    Functionality: Builds BWP DL dedicated PDSCH config
+ *    Functionality: Builds tag config in MacCellGroupConfig
  *
- * @params[in] struct PDSCH_Config *pdschCfg
+ * @params[in] TAG_Config *tag_Config
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildBWPDlDedPdschCfg(struct PDSCH_Config *pdschCfg)
+uint8_t BuildTagConfig(struct TAG_Config *tagConfig)
 {
-   pdschCfg->dataScramblingIdentityPDSCH = NULLP;
-
-   pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA = NULLP;
-   CU_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)
-   {
-      return RFAILED;
-   }
+   struct TAG_Config__tag_ToAddModList *tagList;
+   uint8_t                     idx, elementCnt;
 
-   pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeB = NULLP;
-   pdschCfg->tci_StatesToAddModList = NULLP;
-   pdschCfg->tci_StatesToReleaseList = NULLP;
-   pdschCfg->vrb_ToPRB_Interleaver = NULLP;
-#if 0
-   CU_ALLOC(pdschCfg->tci_StatesToAddModList, sizeof(struct PDSCH_Config__tci_StatesToAddModList));
-   if(!pdschCfg->tci_StatesToAddModList)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
-      return RFAILED;
-   }
-   if(BuildTCIStatesToAddModList(pdschCfg->tci_StatesToAddModList) != ROK)
+   tagConfig->tag_ToReleaseList = NULLP;
+   tagConfig->tag_ToAddModList = NULLP;
+   CU_ALLOC(tagConfig->tag_ToAddModList, sizeof(struct TAG_Config__tag_ToAddModList));
+   if(!tagConfig->tag_ToAddModList)
    {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildTagConfig");
       return RFAILED;
    }
-#endif
 
-   pdschCfg->resourceAllocation = RES_ALLOC_TYPE;
-
-   pdschCfg->pdsch_TimeDomainAllocationList = NULLP;
-   CU_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)
-   {
-      return RFAILED;
-   }
-   pdschCfg->pdsch_AggregationFactor = NULLP;
-   pdschCfg->rateMatchPatternToAddModList = NULLP;
-   pdschCfg->rateMatchPatternToReleaseList = NULLP;
-   pdschCfg->rateMatchPatternGroup1 = NULLP;
-   pdschCfg->rateMatchPatternGroup2 = NULLP;
-   pdschCfg->rbg_Size = PDSCH_RBG_SIZE;
-   pdschCfg->mcs_Table = NULLP;
+   elementCnt = 1; //ODU_VALUE_ONE;
+   tagList = tagConfig->tag_ToAddModList;
+   tagList->list.count = elementCnt;
+   tagList->list.size  =  elementCnt * sizeof(struct TAG *);
 
-   pdschCfg->maxNrofCodeWordsScheduledByDCI = NULLP;
-   CU_ALLOC(pdschCfg->maxNrofCodeWordsScheduledByDCI, sizeof(long));
-   if(!pdschCfg->maxNrofCodeWordsScheduledByDCI)
+   tagList->list.array = NULLP;
+   CU_ALLOC(tagList->list.array, tagList->list.size);
+   if(!tagList->list.array)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildTagConfig");
       return RFAILED;
    }
-   *(pdschCfg->maxNrofCodeWordsScheduledByDCI) = PDSCH_MAX_CODEWORD_SCH_BY_DCI;
 
-   if(BuildPdschPrbBundlingType(&pdschCfg->prb_BundlingType) != ROK)
+   for(idx=0; idx<tagList->list.count; idx++)
    {
-      return RFAILED;
+      tagList->list.array[idx] = NULLP;
+      CU_ALLOC(tagList->list.array[idx], sizeof(struct TAG));
+      if(!tagList->list.array[idx])
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildTagConfig");
+         return RFAILED;
+      }
    }
 
-   pdschCfg->zp_CSI_RS_ResourceToAddModList = NULLP;
-   pdschCfg->zp_CSI_RS_ResourceToReleaseList = NULLP;
-   pdschCfg->aperiodic_ZP_CSI_RS_ResourceSetsToAddModList = NULLP;
-   pdschCfg->aperiodic_ZP_CSI_RS_ResourceSetsToReleaseList = NULLP;
-   pdschCfg->sp_ZP_CSI_RS_ResourceSetsToAddModList = NULLP;
-   pdschCfg->sp_ZP_CSI_RS_ResourceSetsToReleaseList = NULLP;
-   pdschCfg->p_ZP_CSI_RS_ResourceSet = NULLP;
+   idx = 0;
+   tagList->list.array[idx]->tag_Id = TAG_ID;
+   tagList->list.array[idx]->timeAlignmentTimer = TIME_ALIGNMENT_TMR;
 
    return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Builds intitial DL BWP
+ * @brief Builds PHR Config 
+ *
  * @details
  *
- *    Function : BuildInitialDlBWP 
+ *    Function : BuildPhrConfig
  *
- *    Functionality: Builds intitial DL BWP in spCellCfgDed
+ *    Functionality: Builds phrConfig in MacCellGroupConfig
  *
- * @params[in] BWP_DownlinkDedicated_t *dlBwp
+ * @params[in] PHR Config *
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildInitialDlBWP(BWP_DownlinkDedicated_t *dlBwp)
+uint8_t BuildPhrConfig(struct MAC_CellGroupConfig__phr_Config *phrConfig)
 {
-   dlBwp->pdcch_Config = NULLP;
-   CU_ALLOC(dlBwp->pdcch_Config, sizeof(struct BWP_DownlinkDedicated__pdcch_Config));
-   if(!dlBwp->pdcch_Config)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory Allocation failure in BuildInitialDlBWP");
-      return RFAILED;
-   }
-   dlBwp->pdcch_Config->present = BWP_DownlinkDedicated__pdcch_Config_PR_setup; 
-
-   dlBwp->pdcch_Config->choice.setup = NULLP;
-   CU_ALLOC(dlBwp->pdcch_Config->choice.setup, sizeof(struct PDCCH_Config));
-   if(!dlBwp->pdcch_Config->choice.setup)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory Allocation failure in BuildInitialDlBWP");
-      return RFAILED;
-   }
-   if(BuildBWPDlDedPdcchCfg(dlBwp->pdcch_Config->choice.setup) != ROK)
-   {
-      return RFAILED;
-   }
-
-   dlBwp->pdsch_Config = NULLP;
-   CU_ALLOC(dlBwp->pdsch_Config, sizeof(struct BWP_DownlinkDedicated__pdsch_Config));
-   if(!dlBwp->pdsch_Config)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory Allocation failure in BuildInitialDlBWP");
-      return RFAILED;
-   }
-   dlBwp->pdsch_Config->present = BWP_DownlinkDedicated__pdsch_Config_PR_setup;
 
-   dlBwp->pdsch_Config->choice.setup = NULLP;
-   CU_ALLOC(dlBwp->pdsch_Config->choice.setup, sizeof(struct PDSCH_Config));
-   if(!dlBwp->pdsch_Config->choice.setup)
+   phrConfig->present = MAC_CellGroupConfig__phr_Config_PR_setup;
+   phrConfig->choice.setup = NULLP;
+   CU_ALLOC(phrConfig->choice.setup, sizeof(struct PHR_Config));
+   if(!phrConfig->choice.setup)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory Allocation failure in BuildInitialDlBWP");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildPhrConfig");
       return RFAILED;
    }
 
-   if(BuildBWPDlDedPdschCfg(dlBwp->pdsch_Config->choice.setup) != ROK)
-   {
-      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;
 
-   dlBwp->sps_Config = NULLP;
-   dlBwp->radioLinkMonitoringConfig = NULLP; 
    return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Builds DMRS UL Pusch Mapping type A
+ * @brief Builds BSR Config 
  *
  * @details
  *
- *    Function : BuildDMRSULPuschMapTypeA
+ *    Function : BuildBsrConfig
  *
- *    Functionality: Builds DMRS UL Pusch Mapping type A
+ *    Functionality: Builds BuildBsrConfig in MacCellGroupConfig
+ *
+ * @params[in] BSR_Config *bsrConfig
  *
- * @params[in] 
- *    struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA *dmrsUlCfg
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-   uint8_t BuildDMRSULPuschMapTypeA
-(
- struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA *dmrsUlCfg
- )
+uint8_t BuildBsrConfig(struct BSR_Config *bsrConfig)
 {
-   dmrsUlCfg->present = PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA_PR_setup;
-   dmrsUlCfg->choice.setup= NULLP;
-   CU_ALLOC(dmrsUlCfg->choice.setup, sizeof(DMRS_UplinkConfig_t));
-   if(!dmrsUlCfg->choice.setup)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDMRSULPuschMapTypeA");
-      return RFAILED;
-   }
-
-   dmrsUlCfg->choice.setup->dmrs_Type = NULLP;
-   dmrsUlCfg->choice.setup->dmrs_AdditionalPosition = NULLP;
-   CU_ALLOC(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition, sizeof(long));
-   if(!dmrsUlCfg->choice.setup->dmrs_AdditionalPosition)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDMRSULPuschMapTypeA");
-      return RFAILED;
-   }
-   *(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition) = DMRS_ADDITIONAL_POS; 
-
-   dmrsUlCfg->choice.setup->phaseTrackingRS = NULLP;
-   dmrsUlCfg->choice.setup->maxLength = NULLP;
-   dmrsUlCfg->choice.setup->transformPrecodingDisabled = NULLP;
-   CU_ALLOC(dmrsUlCfg->choice.setup->transformPrecodingDisabled, \
-        sizeof(struct DMRS_UplinkConfig__transformPrecodingDisabled));
-   if(!dmrsUlCfg->choice.setup->transformPrecodingDisabled)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDMRSULPuschMapTypeA");
-      return RFAILED;
-   }
-
-   dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0 = NULLP;
-   CU_ALLOC(dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0,\
-        sizeof(long));
-   if(!dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDMRSULPuschMapTypeA");
-      return RFAILED;
-   }
-   *(dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0) = SCRAMBLING_ID;
+   bsrConfig->periodicBSR_Timer = PERIODIC_BSR_TMR;
+   bsrConfig->retxBSR_Timer     = RETX_BSR_TMR;
+   bsrConfig->logicalChannelSR_DelayTimer = NULLP;
 
-   dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID1 = NULLP;
-   dmrsUlCfg->choice.setup->transformPrecodingEnabled = NULLP;
    return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Build PUSCH time domain allocation list
+ * @brief Builds scheduling request config 
  *
  * @details
  *
- *    Function : BuildPuschTimeDomAllocList
+ *    Function : BuildSchedulingReqConfig 
  *
- *    Functionality: Build PUSCH time domain allocation list
+ *    Functionality: Builds BuildSchedulingReqConfig in MacCellGroupConfig
  *
- * @params[in] 
- * struct PUSCH_Config__pusch_TimeDomainAllocationList *timeDomAllocList
+ * @params[in] SchedulingRequestConfig *schedulingRequestConfig
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-   uint8_t BuildPuschTimeDomAllocList
-(
- struct PUSCH_Config__pusch_TimeDomainAllocationList *timeDomAllocList
- )
+uint8_t BuildSchedulingReqConfig(struct SchedulingRequestConfig *schedulingRequestConfig)
 {
-   uint8_t idx;
-   uint8_t elementCnt;
-   PUSCH_TimeDomainResourceAllocation_t  *timeDomAlloc;
+   struct SchedulingRequestConfig__schedulingRequestToAddModList *schReqList;
+   uint8_t                     idx, elementCnt;
 
-   timeDomAllocList->present = PUSCH_Config__pusch_TimeDomainAllocationList_PR_setup;
-   timeDomAllocList->choice.setup = NULLP;
-   CU_ALLOC(timeDomAllocList->choice.setup, \
-        sizeof(struct PUSCH_TimeDomainResourceAllocationList));
-   if(!timeDomAllocList->choice.setup)
+   schedulingRequestConfig->schedulingRequestToAddModList = NULLP;
+   CU_ALLOC(schedulingRequestConfig->schedulingRequestToAddModList,
+        sizeof(struct SchedulingRequestConfig__schedulingRequestToAddModList));
+   if(!schedulingRequestConfig->schedulingRequestToAddModList)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSchedulingReqConfig");
       return RFAILED;
    }
 
-   elementCnt = 2;
-   timeDomAllocList->choice.setup->list.count = elementCnt;
-   timeDomAllocList->choice.setup->list.size = \
-                                              elementCnt * sizeof(PUSCH_TimeDomainResourceAllocation_t *);
-   timeDomAllocList->choice.setup->list.array = NULLP;
-   CU_ALLOC(timeDomAllocList->choice.setup->list.array, \
-        timeDomAllocList->choice.setup->list.size);
-   if(!timeDomAllocList->choice.setup->list.array)
+   elementCnt = 1; //ODU_VALUE_ONE;
+   schReqList = schedulingRequestConfig->schedulingRequestToAddModList;
+   schReqList->list.count = elementCnt;
+   schReqList->list.size  = elementCnt * sizeof(struct SchedulingRequestToAddMod *);
+
+   schReqList->list.array = NULLP;
+   CU_ALLOC(schReqList->list.array, schReqList->list.size);
+   if(!schReqList->list.array)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSchedulingReqConfig");
       return RFAILED;
    }
 
-   for(idx = 0; idx < elementCnt; idx++)
+   for(idx=0;idx<schReqList->list.count; idx++)
    {
-      timeDomAllocList->choice.setup->list.array[idx] = NULLP;
-      CU_ALLOC(timeDomAllocList->choice.setup->list.array[idx],\
-           sizeof(PUSCH_TimeDomainResourceAllocation_t));
-      if(!timeDomAllocList->choice.setup->list.array[idx])
+      schReqList->list.array[idx] = NULLP;
+      CU_ALLOC(schReqList->list.array[idx], sizeof(struct SchedulingRequestToAddMod));
+      if(!schReqList->list.array[idx])
       {
-        DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
-        return RFAILED;
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSchedulingReqConfig");
+         return RFAILED;
       }
    }
 
    idx = 0;
-   timeDomAlloc = timeDomAllocList->choice.setup->list.array[idx];
-   CU_ALLOC(timeDomAlloc->k2, sizeof(long));
-   if(!timeDomAlloc->k2)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
-      return RFAILED;
-   }
-   *(timeDomAlloc->k2) = PUSCH_K2_CFG1;
-   timeDomAlloc->mappingType = PUSCH_MAPPING_TYPE_A;
-   timeDomAlloc->startSymbolAndLength = 66; 
+   schReqList->list.array[idx]->schedulingRequestId = SCH_REQ_ID;
 
-   idx++;
-   timeDomAlloc = timeDomAllocList->choice.setup->list.array[idx];
-   CU_ALLOC(timeDomAlloc->k2, sizeof(long));
-   if(!timeDomAlloc->k2)
+   schReqList->list.array[idx]->sr_ProhibitTimer = NULLP;
+   CU_ALLOC(schReqList->list.array[idx]->sr_ProhibitTimer, sizeof(long));
+   if(!schReqList->list.array[idx]->sr_ProhibitTimer)
    {
-       DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
-       return RFAILED;
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSchedulingReqConfig");
+      return RFAILED;
    }
-   *(timeDomAlloc->k2) = PUSCH_K2_CFG2;
-   timeDomAlloc->mappingType = PUSCH_MAPPING_TYPE_A;
-   timeDomAlloc->startSymbolAndLength = 66;
+   *(schReqList->list.array[idx]->sr_ProhibitTimer) = SR_PROHIBIT_TMR;
+   schReqList->list.array[idx]->sr_TransMax = SR_TRANS_MAX;
+   schedulingRequestConfig->schedulingRequestToReleaseList = NULLP;
 
    return ROK;
 }
-
 /*******************************************************************
  *
- * @brief Builds BWP UL dedicated PUSCH Config
+ * @brief Builds Mac cell group config 
  *
  * @details
  *
- *    Function : BuildBWPUlDedPuschCfg
+ *    Function : BuildMacCellGrpCfg 
  *
- *    Functionality:
- *      Builds BWP UL dedicated PUSCH Config
+ *    Functionality: Builds Mac cell group config in DuToCuRrcContainer
+ *
+ * @params[in] MAC_CellGroupConfig_t *macCellGrpCfg
  *
- * @params[in] : PUSCH_Config_t *puschCfg
- *    
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildBWPUlDedPuschCfg(PUSCH_Config_t *puschCfg)
+uint8_t BuildMacCellGrpCfg(MAC_CellGroupConfig_t *macCellGrpCfg)
 {
-   puschCfg->dataScramblingIdentityPUSCH = NULLP;
-   CU_ALLOC(puschCfg->dataScramblingIdentityPUSCH, sizeof(long));
-   if(!puschCfg->dataScramblingIdentityPUSCH)
+   macCellGrpCfg->drx_ConfigRrc = NULLP;
+   macCellGrpCfg->schedulingRequestConfig = NULLP;
+   CU_ALLOC(macCellGrpCfg->schedulingRequestConfig, sizeof(struct SchedulingRequestConfig));
+   if(!macCellGrpCfg->schedulingRequestConfig)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPuschCfg");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacCellGrpCfg");
       return RFAILED;
    }
-   *(puschCfg->dataScramblingIdentityPUSCH) = SCRAMBLING_ID;
 
-   puschCfg->txConfig = NULLP;
-   puschCfg->dmrs_UplinkForPUSCH_MappingTypeA = NULLP;
-   CU_ALLOC(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA, \
-        sizeof(struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA));
-   if(!puschCfg->dmrs_UplinkForPUSCH_MappingTypeA)
+   if(BuildSchedulingReqConfig(macCellGrpCfg->schedulingRequestConfig) != ROK)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPuschCfg");
+      DU_LOG("\nERROR  -->  F1AP : BuildSchedulingReqConfig failed");
       return RFAILED;
    }
 
-   if(BuildDMRSULPuschMapTypeA(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA) != ROK)
+   macCellGrpCfg->bsr_Config = NULLP;
+   CU_ALLOC(macCellGrpCfg->bsr_Config, sizeof(struct BSR_Config));
+   if(!macCellGrpCfg->bsr_Config)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacCellGrpCfg");
+      return RFAILED;
+   }
+
+   if(BuildBsrConfig(macCellGrpCfg->bsr_Config) != ROK)
    {
+      DU_LOG("\nERROR  -->  F1AP : BuildBsrConfig failed");
       return RFAILED;
    }
 
-   puschCfg->dmrs_UplinkForPUSCH_MappingTypeB = NULLP;
-   puschCfg->pusch_PowerControl = NULLP;
-   puschCfg->frequencyHopping = NULLP;
-   puschCfg->frequencyHoppingOffsetLists = NULLP;
-   puschCfg->resourceAllocation = RES_ALLOC_TYPE;
+   macCellGrpCfg->tag_Config = NULLP;
+   CU_ALLOC(macCellGrpCfg->tag_Config, sizeof(struct TAG_Config));
+   if(!macCellGrpCfg->tag_Config)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacCellGrpCfg");
+      return RFAILED;
+   }
 
-   puschCfg->pusch_TimeDomainAllocationList = NULLP;
-   CU_ALLOC(puschCfg->pusch_TimeDomainAllocationList, \
-        sizeof(struct PUSCH_Config__pusch_TimeDomainAllocationList));
-   if(!puschCfg->pusch_TimeDomainAllocationList)
+   if(BuildTagConfig(macCellGrpCfg->tag_Config) != ROK)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPuschCfg");
+      DU_LOG("\nERROR  -->  F1AP : BuildTagConfig failed");
+      return RFAILED;
+   }
+
+   macCellGrpCfg->phr_Config = NULLP;
+   CU_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(macCellGrpCfg->phr_Config) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP : BuildPhrConfig failed");
       return RFAILED;
    }
 
-   if(BuildPuschTimeDomAllocList(puschCfg->pusch_TimeDomainAllocationList) != ROK)
+   macCellGrpCfg->skipUplinkTxDynamic = false;
+   macCellGrpCfg->ext1 = NULLP;
+
+   return ROK;
+}
+/*******************************************************************
+ *
+ * @brief Frees memeory allocated for SearchSpcToAddModList
+ *
+ * @details
+ *
+ *    Function : FreeSearchSpcToAddModList
+ *
+ *    Functionality: Deallocating memory of SearchSpcToAddModList
+ *
+ * @params[in] struct PDCCH_Config__searchSpacesToAddModList *searchSpcList
+ *
+ * @return void
+ *
+ 4221 * ****************************************************************/
+void FreeSearchSpcToAddModList(struct PDCCH_Config__searchSpacesToAddModList *searchSpcList)
+{
+   uint8_t idx1=0;
+   uint8_t idx2=0;
+   struct  SearchSpace *searchSpc=NULLP;
+
+   if(searchSpcList->list.array)
+   {
+      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)
+                       {
+                          CU_FREE(searchSpc->searchSpaceType->choice.ue_Specific,\
+                                sizeof(struct SearchSpace__searchSpaceType__ue_Specific));
+                          CU_FREE(searchSpc->searchSpaceType, sizeof(struct
+                                   SearchSpace__searchSpaceType));
+                       }
+                       CU_FREE(searchSpc->nrofCandidates,
+                             sizeof(struct SearchSpace__nrofCandidates));
+                    }
+                    CU_FREE(searchSpc->monitoringSymbolsWithinSlot->buf, \
+                          searchSpc->monitoringSymbolsWithinSlot->size);
+                 }
+                 CU_FREE(searchSpc->monitoringSymbolsWithinSlot,
+                       sizeof(BIT_STRING_t));
+              }
+              CU_FREE(searchSpc->monitoringSlotPeriodicityAndOffset, \
+                    sizeof(struct SearchSpace__monitoringSlotPeriodicityAndOffset));
+           }
+           CU_FREE(searchSpc->controlResourceSetId,
+                 sizeof(ControlResourceSetId_t));
+        }
+      }
+      for(idx1 = 0; idx1 < searchSpcList->list.count; idx1++)
+      {
+        CU_FREE(searchSpcList->list.array[idx1],
+              sizeof(struct SearchSpace));
+      }
+      CU_FREE(searchSpcList->list.array,searchSpcList->list.size);
+   }
+}
+/*******************************************************************
+ *
+ * @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)
    {
-      return RFAILED;
+      if(timeDomAllocList->choice.setup->list.array)
+      {
+        for(idx1 = 0; idx1 <timeDomAllocList->choice.setup->list.count ; idx1++)
+        {
+           CU_FREE(timeDomAllocList->choice.setup->list.array[idx1],
+                 sizeof(struct PDSCH_TimeDomainResourceAllocation));
+        }
+        CU_FREE(timeDomAllocList->choice.setup->list.array, \
+              timeDomAllocList->choice.setup->list.size);
+      }
+      CU_FREE(timeDomAllocList->choice.setup,\
+           sizeof(struct PDSCH_TimeDomainResourceAllocationList));
    }
+}
+/*******************************************************************
+ *
+ * @brief Frees memory allocated for PuschTimeDomAllocList
+ *
+ *@details
+ *
+ *    Function : FreePuschTimeDomAllocList
+ *
+ *    Functionality: Deallocating memory of PuschTimeDomAllocList
+ *
+ * @params[in] PUSCH_Config_t *puschCfg
+ *
+ * @return void
+ *
+ ***********************************************************************/
+void FreePuschTimeDomAllocList(PUSCH_Config_t *puschCfg)
+{
+   uint8_t idx1=0;
+   uint8_t idx2=0;
+   struct PUSCH_Config__pusch_TimeDomainAllocationList *timeDomAllocList_t=NULLP;
 
-   puschCfg->pusch_AggregationFactor = NULLP;
-   puschCfg->mcs_Table = NULLP;
-   puschCfg->mcs_TableTransformPrecoder = NULLP;
-   puschCfg->transformPrecoder = NULLP;
-   CU_ALLOC(puschCfg->transformPrecoder, sizeof(long));
-   if(!puschCfg->transformPrecoder)
+   if(puschCfg->pusch_TimeDomainAllocationList)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPuschCfg");
-      return RFAILED;
+      timeDomAllocList_t=puschCfg->pusch_TimeDomainAllocationList;
+      if(timeDomAllocList_t->choice.setup)
+      {
+        if(timeDomAllocList_t->choice.setup->list.array)
+        {
+           CU_FREE(timeDomAllocList_t->choice.setup->list.array[idx2]->k2, sizeof(long));
+           for(idx1 = 0; idx1<timeDomAllocList_t->choice.setup->list.count; idx1++)
+           {
+              CU_FREE(timeDomAllocList_t->choice.setup->list.array[idx1],\
+                    sizeof(PUSCH_TimeDomainResourceAllocation_t));
+           }
+           CU_FREE(timeDomAllocList_t->choice.setup->list.array, \
+                 timeDomAllocList_t->choice.setup->list.size);
+        }
+        CU_FREE(timeDomAllocList_t->choice.setup, \
+              sizeof(struct PUSCH_TimeDomainResourceAllocationList));
+      }
+      CU_FREE(puschCfg->transformPrecoder, sizeof(long));
+      CU_FREE(puschCfg->pusch_TimeDomainAllocationList, \
+           sizeof(struct PUSCH_Config__pusch_TimeDomainAllocationList));
    }
-   *(puschCfg->transformPrecoder) = PUSCH_TRANSFORM_PRECODER;
-
-   puschCfg->codebookSubset = NULLP;
-   puschCfg->maxRank = NULLP;
-   puschCfg->rbg_Size = NULLP;
-   puschCfg->uci_OnPUSCH = NULLP;
-   puschCfg->tp_pi2BPSK = NULLP;
 
-   return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Builds BWP UL dedicated PUCCH Config
+ * @brief Frees memory allocated for Dedicated PUCCH config
  *
  * @details
  *
- *    Function : BuildBWPUlDedPucchCfg
+ *    Function : FreeBWPUlDedPucchCfg
  *
- *    Functionality:
- *      Builds BWP UL dedicated PUCCH Config
+ *    Functionality: Deallocating memory of Dedicated PUCCH cfg
  *
- * @params[in] : PUCCH_Config_t *pucchCfg
+ * @params[in] BWP_UplinkDedicated__pucch_Config *ulBwpPucchCfg
  *
- * @return ROK     - success
- *         RFAILED - failure
+ * @return void
  *
  * ****************************************************************/
-uint8_t BuildBWPUlDedPucchCfg(PUCCH_Config_t *pucchCfg)
-{
-   uint8_t arrIdx, elementCnt;
-   uint8_t rsrcIdx, rsrcSetIdx;
+void FreeBWPUlDedPucchCfg(struct BWP_UplinkDedicated__pucch_Config *ulBwpPucchCfg)
+{  
+   uint8_t arrIdx, rsrcIdx, rsrcSetIdx;
+   PUCCH_Config_t *pucchCfg = NULLP;
    PUCCH_ResourceSet_t *rsrcSet = NULLP;
    PUCCH_Resource_t *rsrc = NULLP;
 
-   //RESOURCE SET
-   elementCnt = 1;
-   CU_ALLOC(pucchCfg->resourceSetToAddModList, sizeof(struct PUCCH_Config__resourceSetToAddModList));
-   pucchCfg->resourceSetToAddModList->list.count = elementCnt;
-   pucchCfg->resourceSetToAddModList->list.size = elementCnt * sizeof(PUCCH_ResourceSet_t *);
-   CU_ALLOC(pucchCfg->resourceSetToAddModList->list.array, pucchCfg->resourceSetToAddModList->list.size);
-   for(rsrcSetIdx=0; rsrcSetIdx < pucchCfg->resourceSetToAddModList->list.count; rsrcSetIdx++)
-   {
-      CU_ALLOC(pucchCfg->resourceSetToAddModList->list.array[rsrcSetIdx], sizeof(PUCCH_ResourceSet_t));
-   }
-   rsrcSetIdx = 0;
-   rsrcSet = pucchCfg->resourceSetToAddModList->list.array[rsrcSetIdx];
-   rsrcSet->pucch_ResourceSetId = 1;
-   elementCnt = 1;
-   rsrcSet->resourceList.list.count = elementCnt;
-   rsrcSet->resourceList.list.size = elementCnt * sizeof(PUCCH_ResourceId_t *);
-   CU_ALLOC(rsrcSet->resourceList.list.array, rsrcSet->resourceList.list.size);
-   for(rsrcIdx=0; rsrcIdx < rsrcSet->resourceList.list.count; rsrcIdx++)
-   {
-      CU_ALLOC(rsrcSet->resourceList.list.array[rsrcIdx], sizeof(PUCCH_ResourceId_t));
-   }
-   rsrcIdx = 0;
-   *(rsrcSet->resourceList.list.array[rsrcIdx]) = 1;
-
-   //RESOURCE
-   elementCnt = 1;
-   CU_ALLOC(pucchCfg->resourceToAddModList, sizeof(struct PUCCH_Config__resourceToAddModList));
-   pucchCfg->resourceToAddModList->list.count = elementCnt;
-   pucchCfg->resourceToAddModList->list.size = elementCnt * sizeof(PUCCH_Resource_t *);
-   CU_ALLOC(pucchCfg->resourceToAddModList->list.array, pucchCfg->resourceToAddModList->list.size);
-   for(rsrcIdx=0; rsrcIdx < pucchCfg->resourceToAddModList->list.count; rsrcIdx++)
+   if(ulBwpPucchCfg)
    {
-      CU_ALLOC(pucchCfg->resourceToAddModList->list.array[rsrcIdx], sizeof(PUCCH_Resource_t));
-   }
-   rsrcIdx = 0;
-   rsrc = pucchCfg->resourceToAddModList->list.array[rsrcIdx];
-   rsrc->pucch_ResourceId = 1;
-   rsrc->startingPRB = 0;
-   rsrc->format.present = PUCCH_Resource__format_PR_format1; 
-   CU_ALLOC(rsrc->format.choice.format1, sizeof(PUCCH_format1_t));
-   rsrc->format.choice.format1->initialCyclicShift = 0;
-   rsrc->format.choice.format1->nrofSymbols = 4;
-   rsrc->format.choice.format1->startingSymbolIndex = 0;
-   rsrc->format.choice.format1->timeDomainOCC = 0;
+      if(ulBwpPucchCfg->choice.setup)
+      {
+         pucchCfg = ulBwpPucchCfg->choice.setup;
 
-   //PUCCH Format 1
-   CU_ALLOC(pucchCfg->format1, sizeof(struct PUCCH_Config__format1));
-   pucchCfg->format1->present = PUCCH_Config__format1_PR_setup;
-   CU_ALLOC(pucchCfg->format1->choice.setup, sizeof(PUCCH_FormatConfig_t));
-   CU_ALLOC(pucchCfg->format1->choice.setup->nrofSlots, sizeof(long));
-   *(pucchCfg->format1->choice.setup->nrofSlots) = PUCCH_FormatConfig__nrofSlots_n4;
+         //Free resource set list
+         if(pucchCfg->resourceSetToAddModList)
+         {
+            if(pucchCfg->resourceSetToAddModList->list.array)
+            {
+               for(rsrcSetIdx=0; rsrcSetIdx < pucchCfg->resourceSetToAddModList->list.count; rsrcSetIdx++)
+               {
+                  rsrcSet = pucchCfg->resourceSetToAddModList->list.array[rsrcSetIdx];
+                  if(rsrcSet->resourceList.list.array)
+                  {
+                     for(rsrcIdx=0; rsrcIdx < rsrcSet->resourceList.list.count; rsrcIdx++)
+                     {
+                        CU_FREE(rsrcSet->resourceList.list.array[rsrcIdx], sizeof(PUCCH_ResourceId_t));
+                     }
+                     CU_FREE(rsrcSet->resourceList.list.array, rsrcSet->resourceList.list.size);
+                  }
+                  CU_FREE(pucchCfg->resourceSetToAddModList->list.array[rsrcSetIdx], sizeof(PUCCH_ResourceSet_t));
+               }
+               CU_FREE(pucchCfg->resourceSetToAddModList->list.array, pucchCfg->resourceSetToAddModList->list.size);
+            }
+            CU_FREE(pucchCfg->resourceSetToAddModList, sizeof(struct PUCCH_Config__resourceSetToAddModList));
+         }
 
-   //DL DATA TO UL ACK
-   CU_ALLOC(pucchCfg->dl_DataToUL_ACK, sizeof(struct PUCCH_Config__dl_DataToUL_ACK));
-   if(pucchCfg->dl_DataToUL_ACK == NULLP)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
-      return RFAILED;
-   }
+         //Free resource list
+         if(pucchCfg->resourceToAddModList)
+         {
+            if(pucchCfg->resourceToAddModList->list.array)
+            {
+               for(rsrcIdx=0; rsrcIdx < pucchCfg->resourceToAddModList->list.count; rsrcIdx++)
+               {
+                  rsrc = pucchCfg->resourceToAddModList->list.array[rsrcIdx];
+                  CU_FREE(rsrc->format.choice.format1, sizeof(PUCCH_format1_t));
+                  CU_FREE(pucchCfg->resourceToAddModList->list.array[rsrcIdx], sizeof(PUCCH_Resource_t));
+               }
+               CU_FREE(pucchCfg->resourceToAddModList->list.array, pucchCfg->resourceToAddModList->list.size);
+            }
+            CU_FREE(pucchCfg->resourceToAddModList, sizeof(struct PUCCH_Config__resourceToAddModList));
+         }
+         
+         //PUCCH Format 1
+         if(pucchCfg->format1)
+         {
+            if(pucchCfg->format1->choice.setup)
+            {
+               CU_FREE(pucchCfg->format1->choice.setup->nrofSlots, sizeof(long));
+               CU_FREE(pucchCfg->format1->choice.setup, sizeof(PUCCH_FormatConfig_t));
+            }
+            CU_FREE(pucchCfg->format1, sizeof(struct PUCCH_Config__format1));
+         }
 
-   elementCnt = 2;
-   pucchCfg->dl_DataToUL_ACK->list.count = elementCnt;
-   pucchCfg->dl_DataToUL_ACK->list.size = elementCnt * sizeof(long *);
-   CU_ALLOC(pucchCfg->dl_DataToUL_ACK->list.array, pucchCfg->dl_DataToUL_ACK->list.size);
-   if(pucchCfg->dl_DataToUL_ACK->list.array == NULLP)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
-      return RFAILED;
-   }
+         //DL DATA TO UL ACK
+         if(pucchCfg->dl_DataToUL_ACK)
+         {
+            if(pucchCfg->dl_DataToUL_ACK->list.array)
+            {
+               for(arrIdx = 0; arrIdx <  pucchCfg->dl_DataToUL_ACK->list.count; arrIdx++)
+               {
+                  CU_FREE(pucchCfg->dl_DataToUL_ACK->list.array[arrIdx], sizeof(long));
+               }
+               CU_FREE(pucchCfg->dl_DataToUL_ACK->list.array, pucchCfg->dl_DataToUL_ACK->list.size);
+            }
+            CU_FREE(pucchCfg->dl_DataToUL_ACK, sizeof(struct PUCCH_Config__dl_DataToUL_ACK));
+         }
 
-   for(arrIdx = 0; arrIdx <  pucchCfg->dl_DataToUL_ACK->list.count; arrIdx++)
-   {
-      CU_ALLOC(pucchCfg->dl_DataToUL_ACK->list.array[arrIdx], sizeof(long));
-      if(pucchCfg->dl_DataToUL_ACK->list.array[arrIdx] == NULLP)
-      {
-          DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
-          return RFAILED;
+         CU_FREE(ulBwpPucchCfg->choice.setup, sizeof(PUCCH_Config_t));
       }
+      CU_FREE(ulBwpPucchCfg, sizeof(struct BWP_UplinkDedicated__pucch_Config));
    }
-
-   arrIdx = 0;
-   *(pucchCfg->dl_DataToUL_ACK->list.array[arrIdx++]) = 4;
-   *(pucchCfg->dl_DataToUL_ACK->list.array[arrIdx]) = 5;
-
-   return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Fills SRS resource to add/modify list 
+ * @brief Frees memory allocated for InitialUlBWP
  *
  * @details
  *
- *    Function : BuildSrsRsrcAddModList
+ *    Function : FreeInitialUlBWP
  *
- *    Functionality: Fills SRS resource to add/modify list
+ *    Functionality: Deallocating memory of InitialUlBWP
  *
- * @params[in] 
- * @return ROK     - success
- *         RFAILED - failure
+ * @params[in] BWP_UplinkDedicated_t *ulBwp
+ *
+ * @return void
  *
  * ****************************************************************/
-uint8_t BuildSrsRsrcAddModList(struct SRS_Config__srs_ResourceToAddModList *resourceList)
+void FreeInitialUlBWP(BWP_UplinkDedicated_t *ulBwp)
 {
-   uint8_t   elementCnt;
-   uint8_t   rsrcIdx;
+   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;
 
-   elementCnt = 1;
-   resourceList->list.count = elementCnt;
-   resourceList->list.size = elementCnt * sizeof(SRS_Resource_t *);
-   resourceList->list.array = NULLP;
-   CU_ALLOC(resourceList->list.array, resourceList->list.size);
-   if(!resourceList->list.array)
-   {
-      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed in BuildSrsRsrcAddModList");
-      return RFAILED;
-   }
+   FreeBWPUlDedPucchCfg(ulBwp->pucch_Config);
 
-   for(rsrcIdx = 0; rsrcIdx < resourceList->list.count; rsrcIdx++)
+   if(ulBwp->pusch_Config)
    {
-      CU_ALLOC(resourceList->list.array[rsrcIdx], sizeof(SRS_Resource_t));
-      if(!resourceList->list.array[rsrcIdx])
+      if(ulBwp->pusch_Config->choice.setup)
       {
-        DU_LOG("\nERROR  -->  F1AP: Memory allocation failed in BuildSrsRsrcAddModList");
-        return RFAILED;
+         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)
+                     {
+                        CU_FREE(dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0,\
+                              sizeof(long));
+                        CU_FREE(dmrsUlCfg->choice.setup->transformPrecodingDisabled,
+                              sizeof(struct DMRS_UplinkConfig__transformPrecodingDisabled));
+                     }
+                     CU_FREE(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition,
+                           sizeof(long));
+                  }
+                  CU_FREE(dmrsUlCfg->choice.setup,sizeof(DMRS_UplinkConfig_t));
+               }
+               CU_FREE(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA, \
+                     sizeof(struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA));
+            }
+            CU_FREE(puschCfg->dataScramblingIdentityPUSCH, sizeof(long));
+         }
+         CU_FREE(ulBwp->pusch_Config->choice.setup, sizeof(PUSCH_Config_t));
       }
-   }
+      CU_FREE(ulBwp->pusch_Config, sizeof(struct BWP_UplinkDedicated__pusch_Config));
 
-   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;
+      /* Free SRS-Config */
+      if(ulBwp->srs_Config)
+      {
+         if(ulBwp->srs_Config->choice.setup)
+         {
+            srsCfg = ulBwp->srs_Config->choice.setup;
 
-   resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2 = NULLP;
-   CU_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;
+            /* Free Resource Set to add/mod list */
+            if(srsCfg->srs_ResourceSetToAddModList)
+            {
+               rsrcSetList = srsCfg->srs_ResourceSetToAddModList;
+               if(rsrcSetList->list.array)
+               {
+                  rSetIdx = 0;
 
-   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;
+                  /* Free SRS resource Id list in this SRS resource set */
+                  if(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList)
+                  {
+                     rsrcIdList = rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList;
 
-   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;
+                     if(rsrcIdList->list.array)
+                     {
+                        for(rsrcIdx = 0; rsrcIdx < rsrcIdList->list.count; rsrcIdx++)
+                        {
+                           CU_FREE(rsrcIdList->list.array[rsrcIdx], sizeof(SRS_ResourceId_t));
+                        }
+                        CU_FREE(rsrcIdList->list.array, rsrcIdList->list.size);
+                     }
+                     CU_FREE(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList,\
+                           sizeof(struct SRS_ResourceSet__srs_ResourceIdList));
+                  }
 
-   /* 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;
-   CU_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;
+                  /* Free resource type info for this SRS resource set */
+                  CU_FREE(rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic, \
+                        sizeof(struct SRS_ResourceSet__resourceType__aperiodic));
 
-   return ROK;
-}
+                  /* Free memory for each resource set */
+                  for(rSetIdx = 0; rSetIdx < rsrcSetList->list.count; rSetIdx++)
+                  {
+                     CU_FREE(rsrcSetList->list.array[rSetIdx], sizeof(SRS_ResourceSet_t));
+                  }
+                  CU_FREE(rsrcSetList->list.array, rsrcSetList->list.size); 
+               }
+               CU_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;
+                  CU_FREE(resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2,\
+                        sizeof(struct SRS_Resource__transmissionComb__n2));
+                  CU_FREE(resourceList->list.array[rsrcIdx]->resourceType.choice.aperiodic,\
+                        sizeof(struct SRS_Resource__resourceType__aperiodic));
+
+                  for(rsrcIdx = 0; rsrcIdx < resourceList->list.count; rsrcIdx++)
+                  {
+                     CU_FREE(resourceList->list.array[rsrcIdx], sizeof(SRS_Resource_t));
+                  }
+                  CU_FREE(resourceList->list.array, resourceList->list.size);
+               }
+               CU_FREE(srsCfg->srs_ResourceToAddModList, \
+                     sizeof(struct SRS_Config__srs_ResourceToAddModList));
+            }
 
+            CU_FREE(ulBwp->srs_Config->choice.setup, sizeof(SRS_Config_t));
+         }
+         CU_FREE(ulBwp->srs_Config, sizeof(struct BWP_UplinkDedicated__srs_Config));
+      }
+   }
+}      
 /*******************************************************************
  *
- * @brief Build SRS resource set Add/mod list
+ * @brief Frees memory allocated for initialUplinkBWP
  *
  * @details
  *
- *    Function : BuildSrsRsrcSetAddModList
+ *    Function : FreeinitialUplinkBWP
  *
- *    Functionality: Build SRS resource set Add/mod list
+ *    Functionality: Deallocating memory of initialUplinkBWP
  *
- * @params[in] 
- * @return ROK     - success
- *         RFAILED - failure
+ * @params[in] UplinkConfig_t *ulCfg
+ *
+ * @return void
+ *         
  *
  * ****************************************************************/
-   uint8_t BuildSrsRsrcSetAddModList
-(
- struct SRS_Config__srs_ResourceSetToAddModList *rsrcSetList
- )
+void FreeinitialUplinkBWP(UplinkConfig_t *ulCfg)
 {
-   uint8_t  elementCnt;
-   uint8_t  rSetIdx;
-   uint8_t  rsrcIdx;
-   struct SRS_ResourceSet__srs_ResourceIdList *rsrcIdList;
-
-   elementCnt = 1;
-   rsrcSetList->list.count = elementCnt;
-   rsrcSetList->list.size = elementCnt * sizeof(SRS_ResourceSet_t *);
-   rsrcSetList->list.array = NULLP;
-   CU_ALLOC(rsrcSetList->list.array, rsrcSetList->list.size);
-   if(!rsrcSetList->list.array)
-   {
-      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed in BuildSrsRsrcSetAddModList");
-      return RFAILED;
-   }
+   BWP_UplinkDedicated_t *ulBwp=NULLP; 
+   struct UplinkConfig__pusch_ServingCellConfig *puschCfg=NULLP;
 
-   for(rSetIdx = 0; rSetIdx < rsrcSetList->list.count; rSetIdx++)
+   if(ulCfg->initialUplinkBWP)
    {
-      CU_ALLOC(rsrcSetList->list.array[rSetIdx], sizeof(SRS_ResourceSet_t));
-      if(!rsrcSetList->list.array[rSetIdx])
+      ulBwp=ulCfg->initialUplinkBWP;
+      if(ulCfg->firstActiveUplinkBWP_Id)
       {
-        DU_LOG("\nERROR  -->  F1AP: Memory allocation failed in BuildSrsRsrcSetAddModList");
-        return RFAILED;
+        if(ulCfg->pusch_ServingCellConfig)
+        {
+           puschCfg=ulCfg->pusch_ServingCellConfig;
+           if(puschCfg->choice.setup)
+           {
+              if(puschCfg->choice.setup->ext1)
+              {
+                 CU_FREE(puschCfg->choice.setup->ext1->\
+                       processingType2Enabled,sizeof(BOOLEAN_t));
+                 CU_FREE(puschCfg->choice.setup->ext1->\
+                       maxMIMO_Layers,sizeof(long));
+                 CU_FREE(puschCfg->choice.setup->ext1, \
+                       sizeof(struct PUSCH_ServingCellConfig__ext1));
+              }
+              CU_FREE(puschCfg->choice.setup, sizeof(struct PUSCH_ServingCellConfig));
+           }
+           CU_FREE(ulCfg->pusch_ServingCellConfig, sizeof(struct UplinkConfig__pusch_ServingCellConfig));
+        }
+        CU_FREE(ulCfg->firstActiveUplinkBWP_Id, sizeof(BWP_Id_t));
       }
+      FreeInitialUlBWP(ulBwp);
+      CU_FREE(ulCfg->initialUplinkBWP, sizeof(BWP_UplinkDedicated_t));
    }
+}
+/*******************************************************************
+ *
+ * @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;
+   struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList=NULLP;
+   struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA *dmrsDlCfg=NULLP;
 
-   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;
-   CU_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;
-   CU_ALLOC(rsrcIdList->list.array, rsrcIdList->list.size);
-   if(!rsrcIdList->list.array)
-   {
-      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed in BuildSrsRsrcSetAddModList");
-      return RFAILED;
-   }
-
-   for(rsrcIdx = 0; rsrcIdx < rsrcIdList->list.count; rsrcIdx++)
+   if(dlBwp->pdsch_Config->choice.setup)
    {
-      CU_ALLOC(rsrcIdList->list.array[rsrcIdx], sizeof(SRS_ResourceId_t));
-      if(!rsrcIdList->list.array[rsrcIdx])
+      pdschCfg=dlBwp->pdsch_Config->choice.setup;
+      if(pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA)
       {
-        DU_LOG("\nERROR  -->  F1AP: Memory allocation failed in BuildSrsRsrcSetAddModList");
-        return RFAILED;
+        if(pdschCfg->pdsch_TimeDomainAllocationList)
+        {
+           timeDomAllocList=pdschCfg->pdsch_TimeDomainAllocationList;
+           if(pdschCfg->maxNrofCodeWordsScheduledByDCI)
+           {
+              prbBndlType=&pdschCfg->prb_BundlingType;
+              CU_FREE(prbBndlType->choice.staticBundling,\
+                    sizeof(struct PDSCH_Config__prb_BundlingType__staticBundling));
+              CU_FREE(pdschCfg->maxNrofCodeWordsScheduledByDCI, sizeof(long));
+           }
+           FreePdschTimeDomAllocList(timeDomAllocList);
+           CU_FREE(pdschCfg->pdsch_TimeDomainAllocationList, \
+                 sizeof(struct PDSCH_Config__pdsch_TimeDomainAllocationList));
+        }
+        dmrsDlCfg=pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA;
+        if(dmrsDlCfg->choice.setup)
+        {
+           CU_FREE(dmrsDlCfg->choice.setup->dmrs_AdditionalPosition,
+                 sizeof(long));
+           CU_FREE(dmrsDlCfg->choice.setup, sizeof(struct DMRS_DownlinkConfig));
+        }
+        CU_FREE(pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA, \
+              sizeof(struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA));
       }
+      CU_FREE(dlBwp->pdsch_Config->choice.setup, sizeof(struct PDSCH_Config));
    }
-
-   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;
-   CU_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;
-
-   /* 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;
-
-
-   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 Builds BWP UL dedicated SRS Config
+ * @brief Frees emmory allocated for BWPDlDedPdcchCfg
  *
  * @details
  *
- *    Function : BuildBWPUlDedSrsCfg
+ *    Function : FreeBWPDlDedPdcchCfg
  *
- *    Functionality: Builds BWP UL dedicated SRS Config
+ *    Functionality: Deallocating memory of BWPDlDedPdcchCfg
  *
- * @params[in] SRS Config 
- * @return ROK     - success
- *         RFAILED - failure
+ * @params[in] BWP_DownlinkDedicated_t *dlBwp
+ *
+ * @return void
+ *         
  *
  * ****************************************************************/
-uint8_t BuildBWPUlDedSrsCfg(SRS_Config_t *srsCfg)
+void FreeBWPDlDedPdcchCfg(BWP_DownlinkDedicated_t *dlBwp)
 {
-   srsCfg->srs_ResourceSetToReleaseList = NULLP;
-   srsCfg->srs_ResourceSetToAddModList = NULLP;
-   CU_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;
-   }
-
-   srsCfg->srs_ResourceToReleaseList = NULLP;
-
-   /* Resource to Add/Modify list */
-   srsCfg->srs_ResourceToAddModList = NULLP;
-   CU_ALLOC(srsCfg->srs_ResourceToAddModList, \
-        sizeof(struct SRS_Config__srs_ResourceToAddModList));
-   if(!srsCfg->srs_ResourceToAddModList)
-   {
-      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed in BuildBWPUlDedSrsCfg");
-      return RFAILED;
-   }
+   uint8_t idx1=0;
+   uint8_t idx2=0;
+   struct PDCCH_Config *pdcchCfg=NULLP;
+   struct ControlResourceSet *controlRSet=NULLP;
+   struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList=NULLP;
 
-   if(BuildSrsRsrcAddModList(srsCfg->srs_ResourceToAddModList) != ROK)
+   if(dlBwp->pdcch_Config->choice.setup)
    {
-      return RFAILED;
+      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);
+                       CU_FREE(pdcchCfg->searchSpacesToAddModList, \
+                             sizeof(struct PDCCH_Config__searchSpacesToAddModList));
+                    }
+                    CU_FREE(controlRSet->pdcch_DMRS_ScramblingID, sizeof(long));
+                 }
+                 CU_FREE(controlRSet->frequencyDomainResources.buf, \
+                       controlRSet->frequencyDomainResources.size);
+              }
+           }
+           for(idx1 = 0; idx1 <controlRSetList->list.count; idx1++)
+           {
+              CU_FREE(controlRSetList->list.array[idx1], sizeof(struct ControlResourceSet));
+           }
+           CU_FREE(controlRSetList->list.array, controlRSetList->list.size);
+        }
+        CU_FREE(pdcchCfg->controlResourceSetToAddModList, \
+              sizeof(struct PDCCH_Config__controlResourceSetToAddModList));
+      }
+      CU_FREE(dlBwp->pdcch_Config->choice.setup, sizeof(struct PDCCH_Config));
    }
-
-   srsCfg->tpc_Accumulation = NULLP;
-
-   return ROK;
 }
-
 /*******************************************************************
  *
- * @brief Builds inital UL BWP
+ * @brief Builds RLC Config
  *
  * @details
  *
- *    Function : BuildInitialUlBWP
+ *    Function : BuildRlcConfig
  *
- *    Functionality: Builds initial UL BWP
+ *    Functionality: Builds RLC Config in BuildRlcBearerToAddModList 
+ *
+ * @params[in] RLC_Config *rlcConfig
  *
- * @params[in] BWP_UplinkDedicated_t *ulBwp
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildInitialUlBWP(BWP_UplinkDedicated_t *ulBwp)
+uint8_t BuildRlcConfig(RlcLcCfg rlcLcCfgDb, struct RLC_Config *rlcConfig)
 {
-   ulBwp->pucch_Config = NULLP;
-   ulBwp->pucch_Config = NULLP;
-   CU_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;
-   }
+   rlcConfig->present = rlcLcCfgDb.rlcMode;
 
-   ulBwp->pucch_Config->present = BWP_UplinkDedicated__pucch_Config_PR_setup;
-   ulBwp->pucch_Config->choice.setup = NULLP;
-   CU_ALLOC(ulBwp->pucch_Config->choice.setup, sizeof(PUCCH_Config_t));
-   if(!ulBwp->pucch_Config->choice.setup)
+   switch(rlcConfig->present)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildInitialUlBWP");
-      return RFAILED;
-   }
+      case RLC_Config_PR_am:
+         {
+            rlcConfig->choice.am = NULLP;
+            CU_ALLOC(rlcConfig->choice.am, sizeof(struct RLC_Config__am));
+            if(!rlcConfig->choice.am)
+            {
+               DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfig");
+               return RFAILED;
+            }
 
-   if(BuildBWPUlDedPucchCfg(ulBwp->pucch_Config->choice.setup) != ROK)
-   {
-      return RFAILED;
-   }
+            /* UL */
+            rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength = NULLP;
+            CU_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");
+               return RFAILED;
+            }
+            *(rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength) = rlcLcCfgDb.u.amCfg.ulAmCfg.snLenUl;
+            rlcConfig->choice.am->ul_AM_RLC.t_PollRetransmit  = rlcLcCfgDb.u.amCfg.ulAmCfg.pollRetxTmr;
+            rlcConfig->choice.am->ul_AM_RLC.pollPDU           = rlcLcCfgDb.u.amCfg.ulAmCfg.pollPdu;
+            rlcConfig->choice.am->ul_AM_RLC.pollByte          = rlcLcCfgDb.u.amCfg.ulAmCfg.pollByte;
+            rlcConfig->choice.am->ul_AM_RLC.maxRetxThreshold  = rlcLcCfgDb.u.amCfg.ulAmCfg.maxRetxTh;
+
+            /* DL */
+            rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength = NULLP;
+            CU_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");
+               return RFAILED;
+            }
+            *(rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength) = rlcLcCfgDb.u.amCfg.dlAmCfg.snLenDl;
+            rlcConfig->choice.am->dl_AM_RLC.t_Reassembly      = rlcLcCfgDb.u.amCfg.dlAmCfg.reAssemTmr;
+            rlcConfig->choice.am->dl_AM_RLC.t_StatusProhibit  = rlcLcCfgDb.u.amCfg.dlAmCfg.statProhTmr;
 
-   /* Fill BWP UL dedicated PUSCH config */
-   ulBwp->pusch_Config = NULLP;
-   CU_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;
-   }
+            break;
+         }
 
-   ulBwp->pusch_Config->present = BWP_UplinkDedicated__pusch_Config_PR_setup;
-   ulBwp->pusch_Config->choice.setup = NULLP;
-   CU_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;
+      case RLC_Config_PR_um_Bi_Directional:
+         {
+            rlcConfig->choice.um_Bi_Directional = NULLP;
+            CU_ALLOC(rlcConfig->choice.um_Bi_Directional, sizeof(struct RLC_Config__um_Bi_Directional));
+            if(!rlcConfig->choice.um_Bi_Directional)
+            {
+               DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfig");
+               return RFAILED;
+            }
+
+            /* UL */
+            rlcConfig->choice.um_Bi_Directional->ul_UM_RLC.sn_FieldLength = NULLP;
+            CU_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)
+            {
+               DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfig");
+               return RFAILED;
+            }
+            *(rlcConfig->choice.um_Bi_Directional->ul_UM_RLC.sn_FieldLength) = rlcLcCfgDb.u.umBiDirCfg.ulUmCfg.snLenUlUm;
+
+            /* DL */
+            rlcConfig->choice.um_Bi_Directional->dl_UM_RLC.sn_FieldLength = NULLP;
+            CU_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)
+            {
+               DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfig");
+               return RFAILED;
+            }
+            *(rlcConfig->choice.um_Bi_Directional->dl_UM_RLC.sn_FieldLength) = rlcLcCfgDb.u.umBiDirCfg.dlUmCfg.snLenDlUm;
+            rlcConfig->choice.um_Bi_Directional->dl_UM_RLC.t_Reassembly = rlcLcCfgDb.u.umBiDirCfg.dlUmCfg.reAssemTmr;
+            break;
+         }
    }
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @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(MacLcCfg macLcCfgDb, struct LogicalChannelConfig *macLcConfig)
+{
 
-   if(BuildBWPUlDedPuschCfg(ulBwp->pusch_Config->choice.setup) != ROK)
+   macLcConfig->ul_SpecificParameters = NULLP;
+   CU_ALLOC(macLcConfig->ul_SpecificParameters, sizeof(struct LogicalChannelConfig__ul_SpecificParameters));
+   if(!macLcConfig->ul_SpecificParameters)
    {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacLCConfig");
       return RFAILED;
    }
 
-   ulBwp->configuredGrantConfig = NULLP;
+   macLcConfig->ul_SpecificParameters->priority = macLcCfgDb.priority;
+   macLcConfig->ul_SpecificParameters->prioritisedBitRate =    macLcCfgDb.pbr;
+   macLcConfig->ul_SpecificParameters->bucketSizeDuration =    macLcCfgDb.bsd;
+   macLcConfig->ul_SpecificParameters->allowedServingCells = NULLP;
+   macLcConfig->ul_SpecificParameters->allowedSCS_List = NULLP;
+   macLcConfig->ul_SpecificParameters->maxPUSCH_Duration = NULLP;
+   macLcConfig->ul_SpecificParameters->configuredGrantType1Allowed = NULLP;
 
-   /* Fill BPW UL dedicated SRS config */
-   ulBwp->srs_Config = NULLP;
-   CU_ALLOC(ulBwp->srs_Config, sizeof(struct BWP_UplinkDedicated__srs_Config));
-   if(!ulBwp->srs_Config)
+   macLcConfig->ul_SpecificParameters->logicalChannelGroup = NULLP;
+   CU_ALLOC(macLcConfig->ul_SpecificParameters->logicalChannelGroup,   sizeof(long));
+   if(!macLcConfig->ul_SpecificParameters->logicalChannelGroup)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildInitialUlBWP");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacLCConfig");
       return RFAILED;
    }
+   *(macLcConfig->ul_SpecificParameters->logicalChannelGroup) = macLcCfgDb.lcGroup;
 
-   ulBwp->srs_Config->present = BWP_UplinkDedicated__srs_Config_PR_setup;
-   ulBwp->srs_Config->choice.setup = NULLP;
-   CU_ALLOC(ulBwp->srs_Config->choice.setup, sizeof(SRS_Config_t));
-   if(!ulBwp->srs_Config->choice.setup)
+   macLcConfig->ul_SpecificParameters->schedulingRequestID = NULLP;
+   CU_ALLOC(macLcConfig->ul_SpecificParameters->schedulingRequestID,   sizeof(SchedulingRequestId_t));
+   if(!macLcConfig->ul_SpecificParameters->schedulingRequestID)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildInitialUlBWP");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacLCConfig");
       return RFAILED;
    }
+   *(macLcConfig->ul_SpecificParameters->schedulingRequestID) = macLcCfgDb.schReqId;
 
-   if(BuildBWPUlDedSrsCfg(ulBwp->srs_Config->choice.setup) != ROK)
-   {
-      return RFAILED;   
-   }
-
-   ulBwp->beamFailureRecoveryConfig = NULLP;
+   macLcConfig->ul_SpecificParameters->logicalChannelSR_Mask = false;
+   macLcConfig->ul_SpecificParameters->logicalChannelSR_DelayTimerApplied = false;
+   macLcConfig->ul_SpecificParameters->bitRateQueryProhibitTimer = NULLP;
 
    return ROK;
 }
-
 /*******************************************************************
  *
- * @brief Builds Pusch Serving cell Config
+ * @brief Builds RLC Bearer to Add/Mod list
  *
  * @details
  *
- *    Function : BuildPuschSrvCellCfg
+ *    Function :BuildRlcBearerToAddModList 
  *
- *    Functionality: Builds Pusch Serving cell Config
+ *    Functionality: Builds RLC Bearer to Add/Mod list in DuToCuRrcContainer
  *
- * @params[in] struct UplinkConfig__pusch_ServingCellConfig *puschCfg
+ * @params[in] rlc_BearerToAddModList
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildPuschSrvCellCfg(struct UplinkConfig__pusch_ServingCellConfig *puschCfg)
+uint8_t BuildRlcBearerToAddModList(CuUeCb *ueCb, struct CellGroupConfigRrc__rlc_BearerToAddModList *rlcBearerList, bool updateAllRbCfg)
 {
-   puschCfg->present = UplinkConfig__pusch_ServingCellConfig_PR_setup;
-   puschCfg->choice.setup = NULLP;
-   CU_ALLOC(puschCfg->choice.setup, sizeof(struct PUSCH_ServingCellConfig));
-   if(!puschCfg->choice.setup)
+   uint8_t idx, srbIdx = 0, drbIdx = 0, elementCnt=0;
+
+   if(updateAllRbCfg)
+      elementCnt = ueCb->numSrb + ueCb->numDrb;
+   else
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschSrvCellCfg");
-      return RFAILED;
+      for(srbIdx = 0; srbIdx< ueCb->numSrb; srbIdx++)
+      {
+         if(ueCb->srbList[srbIdx].cfgSentToUe == false)
+            elementCnt++;
+      }
+
+      for(drbIdx = 0; drbIdx< ueCb->numDrb; drbIdx++)
+      {
+         if(ueCb->drbList[drbIdx].cfgSentToUe == false)
+            elementCnt++;
+      }
    }
 
-   puschCfg->choice.setup->codeBlockGroupTransmission = NULLP;
-   puschCfg->choice.setup->rateMatching = NULLP;
-   puschCfg->choice.setup->xOverhead = NULLP;
-   puschCfg->choice.setup->ext1 = NULLP;
-   CU_ALLOC(puschCfg->choice.setup->ext1, sizeof(struct PUSCH_ServingCellConfig__ext1));
-   if(!puschCfg->choice.setup->ext1)
+   if(!elementCnt)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschSrvCellCfg");
+      DU_LOG("INFO  --> F1AP : No  RLC Bearer available to add or modify");
+      return ROK;
+   }
+   CU_ALLOC(rlcBearerList, sizeof(struct CellGroupConfigRrc__rlc_BearerToAddModList));
+   if(!rlcBearerList)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in CellGrpConfig");
       return RFAILED;
    }
+   rlcBearerList->list.count = elementCnt;
+   rlcBearerList->list.size  = elementCnt * sizeof(struct RLC_BearerConfig *);
 
-   puschCfg->choice.setup->ext1->maxMIMO_Layers = NULLP;
-   CU_ALLOC(puschCfg->choice.setup->ext1->maxMIMO_Layers, sizeof(long));
-   if(!puschCfg->choice.setup->ext1->maxMIMO_Layers)
+   rlcBearerList->list.array = NULLP;
+   CU_ALLOC(rlcBearerList->list.array, rlcBearerList->list.size);
+   if(!rlcBearerList->list.array)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschSrvCellCfg");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
       return RFAILED;
    }
-   *(puschCfg->choice.setup->ext1->maxMIMO_Layers) = PUSCH_MAX_MIMO_LAYERS;
 
-   puschCfg->choice.setup->ext1->processingType2Enabled= NULLP;
-   CU_ALLOC(puschCfg->choice.setup->ext1->processingType2Enabled,sizeof(BOOLEAN_t));
-   if(!puschCfg->choice.setup->ext1->processingType2Enabled)
+   for(idx=0; idx<rlcBearerList->list.count; idx++)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPuschSrvCellCfg");
-      return RFAILED;
+      rlcBearerList->list.array[idx] = NULLP;
+      CU_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;
+
+   for(srbIdx=0; srbIdx < ueCb->numSrb; srbIdx++)
+   {
+      if(!updateAllRbCfg && ueCb->srbList[srbIdx].cfgSentToUe)
+         continue;
+
+      rlcBearerList->list.array[idx]->logicalChannelIdentity = ueCb->srbList[srbIdx].lcId;
+
+      CU_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 = ueCb->srbList[srbIdx].srbId;
+
+      rlcBearerList->list.array[idx]->reestablishRLC = NULLP;
+      rlcBearerList->list.array[idx]->rlc_Config = NULLP;
+      CU_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->srbList[srbIdx].rlcLcCfg, rlcBearerList->list.array[idx]->rlc_Config) != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildRlcConfig failed");
+         return RFAILED;
+      }
+
+      rlcBearerList->list.array[idx]->mac_LogicalChannelConfig = NULLP;
+      CU_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(ueCb->srbList[srbIdx].macLcCfg, rlcBearerList->list.array[idx]->mac_LogicalChannelConfig) != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildMacLCConfig failed");
+         return RFAILED;
+      }
+      idx++;
+   }
+
+   for(drbIdx=0; drbIdx < ueCb->numDrb; drbIdx++)
+   {
+      if(!updateAllRbCfg && ueCb->drbList[drbIdx].cfgSentToUe)
+         continue;
+
+      rlcBearerList->list.array[idx]->logicalChannelIdentity = ueCb->drbList[drbIdx].lcId;
+
+      CU_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_drb_Identity;
+      rlcBearerList->list.array[idx]->servedRadioBearer->choice.drb_Identity = ueCb->drbList[drbIdx].drbId;
+
+      rlcBearerList->list.array[idx]->reestablishRLC = NULLP;
+      rlcBearerList->list.array[idx]->rlc_Config = NULLP;
+      CU_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->drbList[drbIdx].rlcLcCfg, rlcBearerList->list.array[idx]->rlc_Config) != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildRlcConfig failed");
+         return RFAILED;
+      }
+
+      rlcBearerList->list.array[idx]->mac_LogicalChannelConfig = NULLP;
+      CU_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(ueCb->drbList[drbIdx].macLcCfg, rlcBearerList->list.array[idx]->mac_LogicalChannelConfig) != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildMacLCConfig failed");
+         return RFAILED;
+      }
+      idx++;
    }
-   *(puschCfg->choice.setup->ext1->processingType2Enabled) = PUSCH_PROCESS_TYPE2_ENABLED;
    return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Builds UL config
+ * @brief Free memory allocated for CellGroupConfig 
+ *
  * @details
  *
- *    Function : BuildUlCfg 
+ *    Function : FreeMemCellGrpCfg
  *
- *    Functionality: Builds UL config in spCellCfgDed
+ *    Functionality: Deallocating memory of CellGroupConfig
  *
- * @params[in] UplinkConfig_t *ulCfg
+ * @params[in] pointer to CellGroupConfigRrc_t
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
- * ****************************************************************/
-uint8_t BuildUlCfg(UplinkConfig_t *ulCfg)
+ ******************************************************************/
+uint8_t FreeMemCellGrpCfg(CellGroupConfigRrc_t *cellGrpCfg)
 {
-   ulCfg->initialUplinkBWP = NULLP;
-   CU_ALLOC(ulCfg->initialUplinkBWP, sizeof(BWP_UplinkDedicated_t));
-   if(!ulCfg->initialUplinkBWP)
+   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;
+
+   rlcBearerList = cellGrpCfg->rlc_BearerToAddModList;
+   if(rlcBearerList)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory Allocation failed in BuildUlCfg");
-      return RFAILED;
+      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)
+                 {
+                    CU_FREE(rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength, sizeof(SN_FieldLengthAM_t));
+                    CU_FREE(rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength, sizeof(SN_FieldLengthAM_t)); 
+                    CU_FREE(rlcConfig->choice.am, sizeof(struct RLC_Config__am));
+                 }     
+                 CU_FREE(rlcConfig, sizeof(struct RLC_Config));
+              }
+              CU_FREE(rlcBearerList->list.array[idx]->servedRadioBearer, sizeof(struct RLC_BearerConfig__servedRadioBearer));
+              if(macLcConfig)
+              {
+                 if(macLcConfig->ul_SpecificParameters)
+                 {
+                    CU_FREE(macLcConfig->ul_SpecificParameters->schedulingRequestID,   sizeof(SchedulingRequestId_t));
+                    CU_FREE(macLcConfig->ul_SpecificParameters->logicalChannelGroup,   sizeof(long));
+                    CU_FREE(macLcConfig->ul_SpecificParameters, sizeof(struct LogicalChannelConfig__ul_SpecificParameters));
+                 }
+                 CU_FREE(rlcBearerList->list.array[idx]->mac_LogicalChannelConfig, sizeof(struct LogicalChannelConfig));
+              }
+              CU_FREE(rlcBearerList->list.array[idx], sizeof(struct RLC_BearerConfig));
+           }   
+        }
+        CU_FREE(rlcBearerList->list.array, rlcBearerList->list.size);
+      }
+      CU_FREE(cellGrpCfg->rlc_BearerToAddModList, sizeof(struct CellGroupConfigRrc__rlc_BearerToAddModList));
    }
 
-   if(BuildInitialUlBWP(ulCfg->initialUplinkBWP) != ROK)
-   {
-      return RFAILED;
-   }
+   macCellGrpCfg = cellGrpCfg->mac_CellGroupConfig;
+   if(macCellGrpCfg)
+   {
+      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])
+                 {
+                    CU_FREE(schReqList->list.array[idx]->sr_ProhibitTimer, sizeof(long));
+                    CU_FREE(schReqList->list.array[idx], sizeof(struct SchedulingRequestToAddMod));
+                 }
+              }
+              CU_FREE(schReqList->list.array, schReqList->list.size);
+           }
+           CU_FREE(schedulingRequestConfig->schedulingRequestToAddModList,\
+                 sizeof(struct SchedulingRequestConfig__schedulingRequestToAddModList));    }
+           CU_FREE(macCellGrpCfg->schedulingRequestConfig, sizeof(struct SchedulingRequestConfig));
+      }
+      if(macCellGrpCfg->bsr_Config)
+      {
+        CU_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++)
+              {
+                 CU_FREE(tagList->list.array[idx], sizeof(struct TAG));
+              }
+              CU_FREE(tagList->list.array, tagList->list.size);
+           }
+           CU_FREE(tagConfig->tag_ToAddModList, sizeof(struct TAG_Config__tag_ToAddModList));
+        }
+        CU_FREE(tagConfig, sizeof(struct TAG_Config));
+      }
+
+      phrConfig = macCellGrpCfg->phr_Config;
+      if(phrConfig)
+      {
+        CU_FREE(phrConfig->choice.setup, sizeof(struct PHR_Config));
+        CU_FREE(phrConfig, sizeof(struct MAC_CellGroupConfig__phr_Config));
+      }
 
-   ulCfg->uplinkBWP_ToReleaseList = NULLP;
-   ulCfg->uplinkBWP_ToAddModList = NULLP;
-   ulCfg->firstActiveUplinkBWP_Id = NULLP;
-   CU_ALLOC(ulCfg->firstActiveUplinkBWP_Id, sizeof(BWP_Id_t));
-   if(!ulCfg->firstActiveUplinkBWP_Id)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory Allocation failed in BuildUlCfg");
-      return RFAILED;
+      CU_FREE(macCellGrpCfg, sizeof(MAC_CellGroupConfig_t));
    }
-   *(ulCfg->firstActiveUplinkBWP_Id) = ACTIVE_UL_BWP_ID;
 
-   ulCfg->pusch_ServingCellConfig = NULLP;
-   CU_ALLOC(ulCfg->pusch_ServingCellConfig, \
-        sizeof(struct UplinkConfig__pusch_ServingCellConfig));
-   if(!ulCfg->pusch_ServingCellConfig)
+   phyCellGrpCfg = cellGrpCfg->physicalCellGroupConfig;
+   if(phyCellGrpCfg)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory Allocation failed in BuildUlCfg");
-      return RFAILED;
+      CU_FREE(phyCellGrpCfg->p_NR_FR1, sizeof(long));
+      CU_FREE(phyCellGrpCfg, sizeof(PhysicalCellGroupConfig_t));
    }
 
-   if(BuildPuschSrvCellCfg(ulCfg->pusch_ServingCellConfig) != ROK)
+   spCellCfg = cellGrpCfg->spCellConfig;
+   if(spCellCfg)
    {
-      return RFAILED;
+      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)
+                             {
+                                CU_FREE(pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH,sizeof(long));
+                                CU_FREE(pdschCfg->choice.setup, sizeof( struct PDSCH_ServingCellConfig));
+                             }
+                             CU_FREE(srvCellCfg->pdsch_ServingCellConfig, sizeof(struct
+                                      ServingCellConfig__pdsch_ServingCellConfig));
+                          }
+                          FreeinitialUplinkBWP(srvCellCfg->uplinkConfig);
+                          CU_FREE(srvCellCfg->uplinkConfig, sizeof(UplinkConfig_t));   
+                       }
+                       CU_FREE(srvCellCfg->defaultDownlinkBWP_Id, sizeof(long));
+                    }
+                    CU_FREE(srvCellCfg->firstActiveDownlinkBWP_Id, sizeof(long));
+                 }
+                 if(dlBwp->pdcch_Config)
+                 {
+                    if(dlBwp->pdsch_Config)
+                    {
+                       FreeBWPDlDedPdschCfg(dlBwp);
+                       CU_FREE(dlBwp->pdsch_Config, sizeof(struct BWP_DownlinkDedicated__pdsch_Config));
+                    }
+                    FreeBWPDlDedPdcchCfg(dlBwp);
+                    CU_FREE(dlBwp->pdcch_Config, sizeof(struct BWP_DownlinkDedicated__pdcch_Config));
+                 }
+                 CU_FREE(srvCellCfg->initialDownlinkBWP, sizeof(BWP_DownlinkDedicated_t));
+              }
+              CU_FREE(spCellCfg->spCellConfigDedicated, sizeof(ServingCellConfig_t));
+           }
+           CU_FREE(spCellCfg->rlmInSyncOutOfSyncThreshold, sizeof(long));
+        }
+        CU_FREE(spCellCfg->servCellIndex, sizeof(long));
+      }
+      CU_FREE(spCellCfg,sizeof(SpCellConfig_t));
    }
-
-   ulCfg->carrierSwitching = NULLP;
-   ulCfg->ext1 = NULLP;
    return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Builds PDSCH serving cell config
+ * @brief Fills CellGroupConfig 
+ *
  * @details
  *
- *    Function : BuildPdschSrvCellCfg
+ *    Function : fillCellGrpCfg
  *
- *    Functionality: Builds PDSCH serving cell config in spCellCfgDed
+ *    Functionality: Fills CellGroupConfig
  *
- * @params[in] struct ServingCellConfig__pdsch_ServingCellConfig *pdschCfg 
+ * @params[in] pointer to CellGroupConfigRrc_t
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
- * ****************************************************************/
-uint8_t BuildPdschSrvCellCfg(struct ServingCellConfig__pdsch_ServingCellConfig *pdschCfg)
+ ******************************************************************/
+
+uint8_t fillCellGrpCfg(CuUeCb *ueCb, OCTET_STRING_t *cellGrp, bool updateAllRbCfg)
 {
-   pdschCfg->present =  ServingCellConfig__pdsch_ServingCellConfig_PR_setup;
-   pdschCfg->choice.setup = NULLP;
-   CU_ALLOC(pdschCfg->choice.setup, sizeof( struct PDSCH_ServingCellConfig));
-   if(!pdschCfg->choice.setup)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschSrvCellCfg");
-      return RFAILED;
-   }
+   uint8_t               ret = RFAILED;
+   CellGroupConfigRrc_t  cellGrpCfg;
+   asn_enc_rval_t        encRetVal;
 
-   pdschCfg->choice.setup->codeBlockGroupTransmission = NULLP;
-   pdschCfg->choice.setup->xOverhead = NULLP;
-   pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH = NULLP;
-   CU_ALLOC(pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH, sizeof(long));
-   if(!pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH)
+   while(true)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildPdschSrvCellCfg");
-      return RFAILED;
-   }
-   *(pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH)= PDSCH_NUM_HARQ_PROC;
-   pdschCfg->choice.setup->pucch_Cell = NULLP;
-   pdschCfg->choice.setup->ext1 = NULLP;
+      cellGrpCfg.cellGroupId = CELL_GRP_ID;
 
-   return ROK;
-}
+      cellGrpCfg.rlc_BearerToAddModList = NULLP;
+      
+      if(BuildRlcBearerToAddModList(ueCb, cellGrpCfg.rlc_BearerToAddModList, updateAllRbCfg) != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : fillCellGrpCfg failed");
+         break;
+      }
 
-/*******************************************************************
- *
- * @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)
-{
+      cellGrpCfg.rlc_BearerToReleaseList = NULLP;
+      cellGrpCfg.mac_CellGroupConfig = NULLP;
+      CU_ALLOC(cellGrpCfg.mac_CellGroupConfig, sizeof(MAC_CellGroupConfig_t));
+      if(!cellGrpCfg.mac_CellGroupConfig)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in fillCellGrpCfg");
+         break;
+      }
+      if(BuildMacCellGrpCfg(cellGrpCfg.mac_CellGroupConfig) != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildMacCellGrpCfg failed");
+         break;
+      }
 
-   return ROK;
+      cellGrpCfg.physicalCellGroupConfig = NULLP;
+      CU_ALLOC(cellGrpCfg.physicalCellGroupConfig, sizeof(PhysicalCellGroupConfig_t));
+      if(!cellGrpCfg.physicalCellGroupConfig)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildDuToCuRrcContainer");
+         break;
+      }
+      if(BuildPhyCellGrpCfg(cellGrpCfg.physicalCellGroupConfig) != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildPhyCellGrpCfg failed");
+         break;
+      }
+
+      cellGrpCfg.spCellConfig = NULLP;
+      CU_ALLOC(cellGrpCfg.spCellConfig, sizeof(SpCellConfig_t));
+      if(!cellGrpCfg.spCellConfig)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildDuToCuRrcContainer");
+         break;
+      }
+      if(BuildSpCellCfg(cellGrpCfg.spCellConfig) != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildSpCellCfg failed");
+         break;
+      }
+
+      cellGrpCfg.sCellToAddModList = NULLP;
+      cellGrpCfg.sCellToReleaseList = NULLP;
+      cellGrpCfg.ext1 = NULLP;
+
+      /* encode cellGrpCfg into duToCuRrcContainer */
+      xer_fprint(stdout, &asn_DEF_CellGroupConfigRrc, &cellGrpCfg);
+      cmMemset((uint8_t *)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");
+         break;
+      }
+      else
+      {
+         DU_LOG("\nDEBUG  -->  F1AP : Created APER encodedbuffer for DuToCuRrcContainer\n");
+         for(int i=0; i< encBufSize; i++)
+         {
+            DU_LOG("%x",encBuf[i]);
+         }
+      }
+
+      cellGrp->size = encBufSize;
+      CU_ALLOC(cellGrp->buf, cellGrp->size);
+      if(!cellGrp->buf)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDuToCuRrcContainer");
+         break;
+      }
+      memcpy(cellGrp->buf, encBuf, cellGrp->size);
+      ret = ROK;
+      break;
+   }
+   FreeMemCellGrpCfg(&cellGrpCfg);
+   return ret;
 }
 
 /*******************************************************************
  *
- * @brief Builds Spcell config dedicated
- * @details
+ * @brief Free UE Capability RAT container
  *
- *    Function : BuildSpCellCfgDed
+ * @details
  *
- *    Functionality: Builds sp cell config dedicated in spCellCfg
+ *    Function : freeUeCapRatCont
  *
- * @params[in] ServingCellConfig_t srvCellCfg
+ *    Functionality:
+ *       Free UE Capability RAT conatiner
  *
+ * @params[in]
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildSpCellCfgDed(ServingCellConfig_t *srvCellCfg)
+void freeUeCapRatCont(UE_NR_Capability_t *ueNrCap)
 {
-   srvCellCfg->tdd_UL_DL_ConfigurationDedicated = NULLP;
-
-   srvCellCfg->initialDownlinkBWP = NULLP;
-   CU_ALLOC(srvCellCfg->initialDownlinkBWP, sizeof(BWP_DownlinkDedicated_t));
-   if(!srvCellCfg->initialDownlinkBWP)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
-      return RFAILED;
-   }
-
-   if(BuildInitialDlBWP(srvCellCfg->initialDownlinkBWP) != ROK)
-   {
-      DU_LOG("\nERROR  -->  F1AP : BuildInitialDlBWP failed");
-      return RFAILED;
-   }
-   srvCellCfg->downlinkBWP_ToReleaseList = NULLP;
-   srvCellCfg->downlinkBWP_ToAddModList = NULLP;
-
-   srvCellCfg->firstActiveDownlinkBWP_Id = NULLP;
-   CU_ALLOC(srvCellCfg->firstActiveDownlinkBWP_Id, sizeof(long));
-   if(!srvCellCfg->firstActiveDownlinkBWP_Id)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
-      return RFAILED;
-   }
-   *(srvCellCfg->firstActiveDownlinkBWP_Id) = ACTIVE_DL_BWP_ID;
-
-   srvCellCfg->bwp_InactivityTimer = NULLP;
-
-   srvCellCfg->defaultDownlinkBWP_Id = NULLP;
-   CU_ALLOC(srvCellCfg->defaultDownlinkBWP_Id, sizeof(long));
-   if(!srvCellCfg->defaultDownlinkBWP_Id)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
-      return RFAILED;
-   }
-   *(srvCellCfg->defaultDownlinkBWP_Id) = ACTIVE_DL_BWP_ID;
-
-   srvCellCfg->uplinkConfig = NULLP;
-   CU_ALLOC(srvCellCfg->uplinkConfig, sizeof(UplinkConfig_t));
-   if(!srvCellCfg->uplinkConfig)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
-      return RFAILED;
-   }
-
-   if(BuildUlCfg(srvCellCfg->uplinkConfig) != ROK)
-   {
-      DU_LOG("\nERROR  -->  F1AP : BuildUlCfg failed");
-      return RFAILED;
-   }
-   srvCellCfg->supplementaryUplink = NULLP;
-   srvCellCfg->pdcch_ServingCellConfig = NULLP;
+   uint8_t idx;
+   FeatureSets_t *featureSets;
 
-   srvCellCfg->pdsch_ServingCellConfig = NULLP;
-   CU_ALLOC(srvCellCfg->pdsch_ServingCellConfig, sizeof(struct ServingCellConfig__pdsch_ServingCellConfig));
-   if(!srvCellCfg->pdsch_ServingCellConfig)
+   if(ueNrCap->rf_Parameters.supportedBandListNR.list.array)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
-      return RFAILED;
+      for(idx = 0; idx < ueNrCap->rf_Parameters.supportedBandListNR.list.count; idx++)
+      {
+         if(ueNrCap->rf_Parameters.supportedBandListNR.list.array[idx])
+            CU_FREE(ueNrCap->rf_Parameters.supportedBandListNR.list.array[idx], sizeof(struct BandNR));
+      }
+      CU_FREE(ueNrCap->rf_Parameters.supportedBandListNR.list.array, ueNrCap->rf_Parameters.supportedBandListNR.list.size);
    }
 
-   if(BuildPdschSrvCellCfg(srvCellCfg->pdsch_ServingCellConfig) != ROK)
+   if(ueNrCap->featureSets)
    {
-      DU_LOG("\nERROR  -->  F1AP : BuildPdschSrvCellCfg failed");
-      return RFAILED;
-   }
-
-   srvCellCfg->csi_MeasConfig = NULLP;
-#if 0
-   CU_ALLOC(srvCellCfg->csi_MeasConfig, sizeof(struct  ServingCellConfig__csi_MeasConfig))
-      if(!srvCellCfg->csi_MeasConfig)
+      featureSets = ueNrCap->featureSets;
+      if(featureSets->featureSetsDownlinkPerCC)
       {
-        DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfgDed");
-        return RFAILED;
+         if(featureSets->featureSetsDownlinkPerCC->list.array)
+         {
+            for(idx = 0; idx < featureSets->featureSetsDownlinkPerCC->list.count; idx++)
+            {
+                  if(featureSets->featureSetsDownlinkPerCC->list.array[idx]->supportedModulationOrderDL)
+                     CU_FREE(featureSets->featureSetsDownlinkPerCC->list.array[idx]->supportedModulationOrderDL, \
+                        sizeof(ModulationOrder_t));
+                  CU_FREE(featureSets->featureSetsDownlinkPerCC->list.array[idx], sizeof(struct FeatureSetDownlinkPerCC));
+            }
+            CU_FREE(featureSets->featureSetsDownlinkPerCC->list.array, featureSets->featureSetsDownlinkPerCC->list.size);
+         }
+         CU_FREE(featureSets->featureSetsDownlinkPerCC, sizeof(struct FeatureSets__featureSetsDownlinkPerCC));
       }
 
-   if(BuildCsiMeasCfg(srvCellCfg->csi_MeasConfig) != ROK)
-   {
-      DU_LOG("\nF1AP : BuildCsiMeasCfg failed");
-      return RFAILED;
+      if(featureSets->featureSetsUplinkPerCC)
+      {
+         if(featureSets->featureSetsUplinkPerCC->list.array)
+         {
+            for(idx = 0; idx < featureSets->featureSetsUplinkPerCC->list.count; idx++)
+            {
+               if(featureSets->featureSetsUplinkPerCC->list.array[idx])
+               {
+                  if(featureSets->featureSetsUplinkPerCC->list.array[idx]->supportedModulationOrderUL)
+                     CU_FREE(featureSets->featureSetsUplinkPerCC->list.array[idx]->supportedModulationOrderUL,\
+                         sizeof(ModulationOrder_t));
+                  CU_FREE(featureSets->featureSetsUplinkPerCC->list.array[idx], sizeof(struct FeatureSetUplinkPerCC));
+               }
+            }
+            CU_FREE(featureSets->featureSetsUplinkPerCC->list.array,  featureSets->featureSetsUplinkPerCC->list.size);
+         }
+         CU_FREE(featureSets->featureSetsUplinkPerCC, sizeof(struct FeatureSets__featureSetsUplinkPerCC));
+      }
+      CU_FREE(ueNrCap->featureSets, sizeof(struct FeatureSets));
    }
-#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 
+ * @brief Free UE capability RAT container list
  *
  * @details
  *
- *    Function : BuildSpCellCfg 
- *
- *    Functionality: Builds sp cell config in DuToCuRrcContainer
+ *    Function : freeUeCapRatContList
  *
- * @params[in] SpCellConfig_t spCellCfg
+ *    Functionality: Free UE capability RAT container list
  *
+ * @params[in] 
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildSpCellCfg(SpCellConfig_t *spCellCfg)
+void freeUeCapRatContList(UE_CapabilityRAT_ContainerListRRC_t *ueCapablityList)
 {
-
-   spCellCfg->servCellIndex = NULLP;
-   CU_ALLOC(spCellCfg->servCellIndex, sizeof(long));
-   if(!spCellCfg->servCellIndex)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfg");
-      return RFAILED;
-   }
-   *(spCellCfg->servCellIndex) = SERV_CELL_IDX;
-
-   spCellCfg->reconfigurationWithSync = NULLP;
-   spCellCfg->rlf_TimersAndConstants = NULLP;
-   spCellCfg->rlmInSyncOutOfSyncThreshold = NULLP;
-   CU_ALLOC(spCellCfg->rlmInSyncOutOfSyncThreshold, sizeof(long));
-   if(!spCellCfg->rlmInSyncOutOfSyncThreshold)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfg");
-      return RFAILED;
-   }
-   *(spCellCfg->rlmInSyncOutOfSyncThreshold) = RLM_SYNC_OUT_SYNC_THRESHOLD;
-
-   spCellCfg->spCellConfigDedicated = NULLP;
-   CU_ALLOC(spCellCfg->spCellConfigDedicated, sizeof(ServingCellConfig_t));
-   if(!spCellCfg->spCellConfigDedicated)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSpCellCfg");
-      return RFAILED;
-   }
-   if(BuildSpCellCfgDed(spCellCfg->spCellConfigDedicated) != ROK)
+   uint8_t idx;
+   if(ueCapablityList->list.array)
    {
-      DU_LOG("\nERROR  -->  F1AP : BuildSpCellCfgDed failed");
-      return RFAILED;
+      for(idx = 0; idx < ueCapablityList->list.count; idx++)
+      {
+         if(ueCapablityList->list.array[idx])
+            CU_FREE(ueCapablityList->list.array[idx], sizeof(UE_CapabilityRAT_Container_t));
+      }
+      CU_FREE(ueCapablityList->list.array, ueCapablityList->list.size);
    }
-   return ROK;
 }
+
 /*******************************************************************
  *
- * @brief Builds Phy cell group config 
+ * @brief Free Handover preparation information
  *
  * @details
  *
- *    Function : BuildPhyCellGrpCfg 
- *
- *    Functionality: Builds Phy cell group config in DuToCuRrcContainer
+ *    Function : freeHOPreparationInfo
  *
- * @params[in] PhysicalCellGroupConfig_t *phyCellGrpCfg 
+ *    Functionality: Free Handover preparation information
  *
+ * @params[in] 
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildPhyCellGrpCfg(PhysicalCellGroupConfig_t *phyCellGrpCfg)
+void freeHOPreparationInfo(HandoverPreparationInformationRrc_t *hoPrep)
 {
-   phyCellGrpCfg->harq_ACK_SpatialBundlingPUCCH = NULLP;
-   phyCellGrpCfg->harq_ACK_SpatialBundlingPUSCH = NULLP;
+   HandoverPreparationInformationRrc_IEs_t *hoPrepInfoIe;
 
-   phyCellGrpCfg->p_NR_FR1 = NULLP;
-   CU_ALLOC(phyCellGrpCfg->p_NR_FR1, sizeof(long));
-   if(!phyCellGrpCfg->p_NR_FR1)
+   if(hoPrep->criticalExtensions.choice.c1)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildPhyCellGrpCfg");
-      return RFAILED;
+      if(hoPrep->criticalExtensions.choice.c1->choice.handoverPreparationInformation)
+      {
+         hoPrepInfoIe = hoPrep->criticalExtensions.choice.c1->choice.handoverPreparationInformation;
+         freeUeCapRatContList(&hoPrepInfoIe->ue_CapabilityRAT_List);
+         CU_FREE(hoPrep->criticalExtensions.choice.c1->choice.handoverPreparationInformation , \
+               sizeof(HandoverPreparationInformationRrc_IEs_t));
+      }
+      CU_FREE(hoPrep->criticalExtensions.choice.c1, sizeof(struct HandoverPreparationInformationRrc__criticalExtensions__c1));
    }
-   *(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;
-
-   return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Builds tag config 
+ * @brief Fill feature sets
  *
  * @details
  *
- *    Function : BuildTagConfig 
- *
- *    Functionality: Builds tag config in MacCellGroupConfig
+ *    Function : fillFeatureSets
  *
- * @params[in] TAG_Config *tag_Config
+ *    Functionality: Fill feature sets
  *
+ * @params[in] 
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildTagConfig(struct TAG_Config *tagConfig)
+uint8_t fillFeatureSets(FeatureSets_t *featureSets)
 {
-   struct TAG_Config__tag_ToAddModList *tagList;
-   uint8_t                     idx, elementCnt;
+   uint8_t idx, elementCnt;
+
+   featureSets->featureSetsDownlink = NULLP;
+   CU_ALLOC(featureSets->featureSetsDownlinkPerCC, sizeof(struct FeatureSets__featureSetsDownlinkPerCC));
+   if(!featureSets->featureSetsDownlinkPerCC)
+   {
+      DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillFeatureSets");
+      return RFAILED;
+   }
+
+   elementCnt = 1;
+   featureSets->featureSetsDownlinkPerCC->list.count = elementCnt;
+   featureSets->featureSetsDownlinkPerCC->list.size = elementCnt * sizeof(struct FeatureSetDownlinkPerCC *);
+   CU_ALLOC(featureSets->featureSetsDownlinkPerCC->list.array, featureSets->featureSetsDownlinkPerCC->list.size);
+   if(!featureSets->featureSetsDownlinkPerCC->list.array)
+   {
+      DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillFeatureSets");
+      return RFAILED;
+   }
+
+   for(idx = 0; idx < elementCnt; idx++)
+   {
+      CU_ALLOC(featureSets->featureSetsDownlinkPerCC->list.array[idx], sizeof(struct FeatureSetDownlinkPerCC));
+      if(!featureSets->featureSetsDownlinkPerCC->list.array[idx])
+      {
+        DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillFeatureSets");
+        return RFAILED;
+      }
+   }
+
+   idx = 0;
+   featureSets->featureSetsDownlinkPerCC->list.array[idx]->supportedSubcarrierSpacingDL = SubcarrierSpacing_kHz15;
+   featureSets->featureSetsDownlinkPerCC->list.array[idx]->supportedBandwidthDL.present = SupportedBandwidth_PR_fr1;
+   featureSets->featureSetsDownlinkPerCC->list.array[idx]->supportedBandwidthDL.choice.fr1 = SupportedBandwidth__fr1_mhz20;
+   featureSets->featureSetsDownlinkPerCC->list.array[idx]->channelBW_90mhz = NULLP;
+   featureSets->featureSetsDownlinkPerCC->list.array[idx]->maxNumberMIMO_LayersPDSCH = NULLP;
 
-   tagConfig->tag_ToReleaseList = NULLP;
-   tagConfig->tag_ToAddModList = NULLP;
-   CU_ALLOC(tagConfig->tag_ToAddModList, sizeof(struct TAG_Config__tag_ToAddModList));
-   if(!tagConfig->tag_ToAddModList)
+   CU_ALLOC(featureSets->featureSetsDownlinkPerCC->list.array[idx]->supportedModulationOrderDL, sizeof(ModulationOrder_t));
+   if(!featureSets->featureSetsDownlinkPerCC->list.array[idx]->supportedModulationOrderDL)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildTagConfig");
+      DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillFeatureSets");
       return RFAILED;
    }
+   *(featureSets->featureSetsDownlinkPerCC->list.array[idx]->supportedModulationOrderDL) = ModulationOrder_qam64;
 
-   elementCnt = 1; //ODU_VALUE_ONE;
-   tagList = tagConfig->tag_ToAddModList;
-   tagList->list.count = elementCnt;
-   tagList->list.size  =  elementCnt * sizeof(struct TAG *);
+   featureSets->featureSetsUplink = NULLP;
+   CU_ALLOC(featureSets->featureSetsUplinkPerCC, sizeof(struct FeatureSets__featureSetsUplinkPerCC));
+   if(!featureSets->featureSetsUplinkPerCC)
+   {
+      DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillFeatureSets");
+      return RFAILED;
+   }
 
-   tagList->list.array = NULLP;
-   CU_ALLOC(tagList->list.array, tagList->list.size);
-   if(!tagList->list.array)
+   elementCnt = 1;
+   featureSets->featureSetsUplinkPerCC->list.count = elementCnt;
+   featureSets->featureSetsUplinkPerCC->list.size = elementCnt * sizeof(struct FeatureSetUplinkPerCC *);
+   CU_ALLOC(featureSets->featureSetsUplinkPerCC->list.array, featureSets->featureSetsUplinkPerCC->list.size);
+   if(!featureSets->featureSetsUplinkPerCC->list.array)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildTagConfig");
+      DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillFeatureSets");
       return RFAILED;
    }
 
-   for(idx=0; idx<tagList->list.count; idx++)
+   for(idx = 0; idx < elementCnt; idx++)
    {
-      tagList->list.array[idx] = NULLP;
-      CU_ALLOC(tagList->list.array[idx], sizeof(struct TAG));
-      if(!tagList->list.array[idx])
+      CU_ALLOC(featureSets->featureSetsUplinkPerCC->list.array[idx], sizeof(struct FeatureSetUplinkPerCC));
+      if(!featureSets->featureSetsUplinkPerCC->list.array[idx])
       {
-         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildTagConfig");
+         DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillFeatureSets");
          return RFAILED;
       }
    }
 
    idx = 0;
-   tagList->list.array[idx]->tag_Id = TAG_ID;
-   tagList->list.array[idx]->timeAlignmentTimer = TIME_ALIGNMENT_TMR;
+   featureSets->featureSetsUplinkPerCC->list.array[idx]->supportedSubcarrierSpacingUL = SubcarrierSpacing_kHz15;
+   featureSets->featureSetsUplinkPerCC->list.array[idx]->supportedBandwidthUL.present = SupportedBandwidth_PR_fr1;
+   featureSets->featureSetsUplinkPerCC->list.array[idx]->supportedBandwidthUL.choice.fr1 = SupportedBandwidth__fr1_mhz20;
+   featureSets->featureSetsUplinkPerCC->list.array[idx]->channelBW_90mhz = NULLP;
+   featureSets->featureSetsUplinkPerCC->list.array[idx]->mimo_CB_PUSCH = NULLP;
+   featureSets->featureSetsUplinkPerCC->list.array[idx]->maxNumberMIMO_LayersNonCB_PUSCH = NULLP;
+
+   CU_ALLOC(featureSets->featureSetsUplinkPerCC->list.array[idx]->supportedModulationOrderUL, sizeof(ModulationOrder_t));
+   if(!featureSets->featureSetsUplinkPerCC->list.array[idx]->supportedModulationOrderUL)
+   {
+      DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillFeatureSets");
+      return RFAILED;
+   }
+   *(featureSets->featureSetsUplinkPerCC->list.array[idx]->supportedModulationOrderUL) = ModulationOrder_qam16;
 
    return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Builds PHR Config 
+ * @brief Fill UE capability RAT container
  *
  * @details
  *
- *    Function : BuildPhrConfig
- *
- *    Functionality: Builds phrConfig in MacCellGroupConfig
+ *    Function : fillUeCapRatCont 
  *
- * @params[in] PHR Config *
+ *    Functionality: Fill UE capability RAT container
  *
+ * @params[in] UE Capability RAT container buffer 
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildPhrConfig(struct MAC_CellGroupConfig__phr_Config *phrConfig)
+uint8_t fillUeCapRatCont(OCTET_STRING_t *ueCapRatContBuf)
 {
+   uint8_t             ret = ROK;
+   uint8_t             idx, elementCnt;
+   asn_enc_rval_t      encRetVal;
+   UE_NR_Capability_t  ueNrCap;
 
-   phrConfig->present = MAC_CellGroupConfig__phr_Config_PR_setup;
-   phrConfig->choice.setup = NULLP;
-   CU_ALLOC(phrConfig->choice.setup, sizeof(struct PHR_Config));
-   if(!phrConfig->choice.setup)
+   while(true)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildPhrConfig");
-      return RFAILED;
-   }
+      ueNrCap.accessStratumRelease = AccessStratumRelease_rel15;
 
-   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;
+      /* Filling PDCP parameters */
+      ueNrCap.pdcp_Parameters.supportedROHC_Profiles.profile0x0000 = false;
+      ueNrCap.pdcp_Parameters.supportedROHC_Profiles.profile0x0001 = false;
+      ueNrCap.pdcp_Parameters.supportedROHC_Profiles.profile0x0002 = false;
+      ueNrCap.pdcp_Parameters.supportedROHC_Profiles.profile0x0003 = false;
+      ueNrCap.pdcp_Parameters.supportedROHC_Profiles.profile0x0004 = false;
+      ueNrCap.pdcp_Parameters.supportedROHC_Profiles.profile0x0006 = false;
+      ueNrCap.pdcp_Parameters.supportedROHC_Profiles.profile0x0101 = false;
+      ueNrCap.pdcp_Parameters.supportedROHC_Profiles.profile0x0102 = false;
+      ueNrCap.pdcp_Parameters.supportedROHC_Profiles.profile0x0103 = false;
+      ueNrCap.pdcp_Parameters.supportedROHC_Profiles.profile0x0104 = false;
+      ueNrCap.pdcp_Parameters.maxNumberROHC_ContextSessions = PDCP_Parameters__maxNumberROHC_ContextSessions_cs2;
+      ueNrCap.pdcp_Parameters.uplinkOnlyROHC_Profiles = NULLP;
+      ueNrCap.pdcp_Parameters.continueROHC_Context = NULLP;
+      ueNrCap.pdcp_Parameters.outOfOrderDelivery = NULLP;
+      ueNrCap.pdcp_Parameters.shortSN = NULLP;
+      ueNrCap.pdcp_Parameters.pdcp_DuplicationSRB = NULLP;
+      ueNrCap.pdcp_Parameters.pdcp_DuplicationMCG_OrSCG_DRB = NULLP;
 
-   return ROK;
-}
+      ueNrCap.rlc_Parameters = NULLP;
+      ueNrCap.mac_Parameters = NULLP;
 
-/*******************************************************************
- *
- * @brief Builds BSR Config 
- *
- * @details
- *
- *    Function : BuildBsrConfig
- *
- *    Functionality: Builds BuildBsrConfig in MacCellGroupConfig
- *
- * @params[in] BSR_Config *bsrConfig
- *
- * @return ROK     - success
- *         RFAILED - failure
- *
- * ****************************************************************/
-uint8_t BuildBsrConfig(struct BSR_Config *bsrConfig)
-{
-   bsrConfig->periodicBSR_Timer = PERIODIC_BSR_TMR;
-   bsrConfig->retxBSR_Timer     = RETX_BSR_TMR;
-   bsrConfig->logicalChannelSR_DelayTimer = NULLP;
+      /* Filling PHY parameters */
+      ueNrCap.phy_Parameters.phy_ParametersCommon = NULLP;
+      ueNrCap.phy_Parameters.phy_ParametersXDD_Diff = NULLP;
+      ueNrCap.phy_Parameters.phy_ParametersFRX_Diff = NULLP;
+      ueNrCap.phy_Parameters.phy_ParametersFR1 = NULLP;
+      ueNrCap.phy_Parameters.phy_ParametersFR2 = NULLP;
 
-   return ROK;
-}
+      /* Filling RF parameters */
+      elementCnt = 1;
+      ueNrCap.rf_Parameters.supportedBandListNR.list.count = elementCnt;
+      ueNrCap.rf_Parameters.supportedBandListNR.list.size = elementCnt * sizeof(struct BandNR *);
+      CU_ALLOC(ueNrCap.rf_Parameters.supportedBandListNR.list.array, ueNrCap.rf_Parameters.supportedBandListNR.list.size);
+      if(!ueNrCap.rf_Parameters.supportedBandListNR.list.array)
+      {
+         DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillUeCapRatCont");
+         ret = RFAILED;
+         break;
+      }
 
-/*******************************************************************
- *
- * @brief Builds scheduling request config 
- *
- * @details
- *
- *    Function : BuildSchedulingReqConfig 
- *
- *    Functionality: Builds BuildSchedulingReqConfig in MacCellGroupConfig
- *
- * @params[in] SchedulingRequestConfig *schedulingRequestConfig
- *
- * @return ROK     - success
- *         RFAILED - failure
- *
- * ****************************************************************/
-uint8_t BuildSchedulingReqConfig(struct SchedulingRequestConfig *schedulingRequestConfig)
-{
-   struct SchedulingRequestConfig__schedulingRequestToAddModList *schReqList;
-   uint8_t                     idx, elementCnt;
+      for(idx = 0; idx < elementCnt; idx++)
+      {
+         CU_ALLOC(ueNrCap.rf_Parameters.supportedBandListNR.list.array[idx], sizeof(struct BandNR));
+         if(!ueNrCap.rf_Parameters.supportedBandListNR.list.array[idx])
+         {
+            ret = RFAILED;
+            break;
+         }
+      }
+      if(ret == RFAILED)
+         break;
+      
+      idx = 0;
+      ueNrCap.rf_Parameters.supportedBandListNR.list.array[idx]->bandNR = 1;
+      ueNrCap.rf_Parameters.supportedBandCombinationList = NULLP;
+      ueNrCap.rf_Parameters.appliedFreqBandListFilter = NULLP;
 
-   schedulingRequestConfig->schedulingRequestToAddModList = NULLP;
-   CU_ALLOC(schedulingRequestConfig->schedulingRequestToAddModList,
-        sizeof(struct SchedulingRequestConfig__schedulingRequestToAddModList));
-   if(!schedulingRequestConfig->schedulingRequestToAddModList)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSchedulingReqConfig");
-      return RFAILED;
-   }
+      ueNrCap.measAndMobParameters = NULLP;
+      ueNrCap.fdd_Add_UE_NR_Capabilities = NULLP;
+      ueNrCap.tdd_Add_UE_NR_Capabilities = NULLP;
+      ueNrCap.fr1_Add_UE_NR_Capabilities = NULLP;
+      ueNrCap.fr2_Add_UE_NR_Capabilities = NULLP;
+      ueNrCap.featureSets = NULLP;
 
-   elementCnt = 1; //ODU_VALUE_ONE;
-   schReqList = schedulingRequestConfig->schedulingRequestToAddModList;
-   schReqList->list.count = elementCnt;
-   schReqList->list.size  = elementCnt * sizeof(struct SchedulingRequestToAddMod *);
+      CU_ALLOC(ueNrCap.featureSets, sizeof(struct FeatureSets));
+      if(!ueNrCap.featureSets)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in fillUeCapRatCont");
+        ret = RFAILED;
+        break;
+      }
 
-   schReqList->list.array = NULLP;
-   CU_ALLOC(schReqList->list.array, schReqList->list.size);
-   if(!schReqList->list.array)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSchedulingReqConfig");
-      return RFAILED;
-   }
+      if(fillFeatureSets(ueNrCap.featureSets) != ROK)
+      {
+         DU_LOG("\nERROR  -->  fillDLFeatureSets() failed ");
+         ret = RFAILED;
+         break;
+      }
 
-   for(idx=0;idx<schReqList->list.count; idx++)
-   {
-      schReqList->list.array[idx] = NULLP;
-      CU_ALLOC(schReqList->list.array[idx], sizeof(struct SchedulingRequestToAddMod));
-      if(!schReqList->list.array[idx])
+      ueNrCap.featureSetCombinations = NULLP;
+      ueNrCap.lateNonCriticalExtension = NULLP;
+      ueNrCap.nonCriticalExtension = NULLP;
+
+      /* encode UE Capability RAT Container List into duToCuRrcContainer */
+      xer_fprint(stdout, &asn_DEF_UE_NR_Capability, &ueNrCap);
+      cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
+      encBufSize = 0;
+      encRetVal = aper_encode(&asn_DEF_UE_NR_Capability, 0, &ueNrCap, PrepFinalEncBuf, encBuf);
+   
+      /* Encode results */
+      if(encRetVal.encoded == ENCODE_FAIL)
       {
-         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildSchedulingReqConfig");
-         return RFAILED;
+         DU_LOG( "\nERROR  -->  F1AP : Could not encode UE Capability RAT Container (at %s)\n",\
+            encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+         break;
+      }
+      else
+      {
+         DU_LOG("\nDEBUG  -->  F1AP : Created APER encodedbuffer for UE Capability RAT Container\n");
+         for(int i=0; i< encBufSize; i++)
+         {
+            DU_LOG("%x",encBuf[i]);
+         }
       }
-   }
-
-   idx = 0;
-   schReqList->list.array[idx]->schedulingRequestId = SCH_REQ_ID;
 
-   schReqList->list.array[idx]->sr_ProhibitTimer = NULLP;
-   CU_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;
+      ueCapRatContBuf->size = encBufSize;
+      CU_ALLOC(ueCapRatContBuf->buf, ueCapRatContBuf->size);
+      if(!ueCapRatContBuf->buf)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in fillUeCapabilityContainer");
+         break;
+      }
+      memcpy(ueCapRatContBuf->buf, encBuf, ueCapRatContBuf->size);
+      ret = ROK;
+      break;
    }
-   *(schReqList->list.array[idx]->sr_ProhibitTimer) = SR_PROHIBIT_TMR;
-   schReqList->list.array[idx]->sr_TransMax = SR_TRANS_MAX;
-   schedulingRequestConfig->schedulingRequestToReleaseList = NULLP;
-
+   freeUeCapRatCont(&ueNrCap);
    return ROK;
 }
+
 /*******************************************************************
  *
- * @brief Builds Mac cell group config 
+ * @brief Fill UE Capability RAT container list
  *
  * @details
  *
- *    Function : BuildMacCellGrpCfg 
- *
- *    Functionality: Builds Mac cell group config in DuToCuRrcContainer
+ *    Function : fillUeCapRatContList
  *
- * @params[in] MAC_CellGroupConfig_t *macCellGrpCfg
+ *    Functionality: Fill UE Capability RAT container list
  *
+ * @params[in] UE capability RAT container list
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildMacCellGrpCfg(MAC_CellGroupConfig_t *macCellGrpCfg)
+uint8_t fillUeCapRatContList(UE_CapabilityRAT_ContainerListRRC_t  *ueCapablityList)
 {
-   macCellGrpCfg->drx_Config = NULLP;
-   macCellGrpCfg->schedulingRequestConfig = NULLP;
-   CU_ALLOC(macCellGrpCfg->schedulingRequestConfig, sizeof(struct SchedulingRequestConfig));
-   if(!macCellGrpCfg->schedulingRequestConfig)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacCellGrpCfg");
-      return RFAILED;
-   }
-
-   if(BuildSchedulingReqConfig(macCellGrpCfg->schedulingRequestConfig) != ROK)
-   {
-      DU_LOG("\nERROR  -->  F1AP : BuildSchedulingReqConfig failed");
-      return RFAILED;
-   }
-
-   macCellGrpCfg->bsr_Config = NULLP;
-   CU_ALLOC(macCellGrpCfg->bsr_Config, sizeof(struct BSR_Config));
-   if(!macCellGrpCfg->bsr_Config)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacCellGrpCfg");
-      return RFAILED;
-   }
-
-   if(BuildBsrConfig(macCellGrpCfg->bsr_Config) != ROK)
-   {
-      DU_LOG("\nERROR  -->  F1AP : BuildBsrConfig failed");
-      return RFAILED;
-   }
-
-   macCellGrpCfg->tag_Config = NULLP;
-   CU_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(macCellGrpCfg->tag_Config) != ROK)
-   {
-      DU_LOG("\nERROR  -->  F1AP : BuildTagConfig failed");
-      return RFAILED;
-   }
+    uint8_t          ret = RFAILED;
+    uint8_t          idx, elementCnt;
 
-   macCellGrpCfg->phr_Config = NULLP;
-   CU_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;
-   }
+    while(true)
+    {
+       elementCnt = 1;
+       ueCapablityList->list.count = elementCnt;
+       ueCapablityList->list.size = elementCnt * sizeof(UE_CapabilityRAT_Container_t *);
 
-   if(BuildPhrConfig(macCellGrpCfg->phr_Config) != ROK)
-   {
-      DU_LOG("\nERROR  -->  F1AP : BuildPhrConfig failed");
-      return RFAILED;
-   }
+       CU_ALLOC(ueCapablityList->list.array, ueCapablityList->list.size);
+       if(!ueCapablityList->list.array)
+       {
+          DU_LOG("\nERROR  -->  Memory allocation failed in fillUeCapRatContList");
+          ret = RFAILED;
+          break;
+       }
 
-   macCellGrpCfg->skipUplinkTxDynamic = false;
-   macCellGrpCfg->ext1 = NULLP;
+       for(idx=0; idx<elementCnt; idx++)
+       {
+          CU_ALLOC(ueCapablityList->list.array[idx], sizeof(UE_CapabilityRAT_Container_t));
+          if(ueCapablityList->list.array[idx] == NULLP)
+          {
+             DU_LOG("\nERROR  -->  Memory allocation failed in fillUeCapRatContList");
+             ret = RFAILED;
+             break;
+          }
+       }
+       idx = 0;
+       ueCapablityList->list.array[idx]->rat_Type = RAT_Type_nr;
+       if(fillUeCapRatCont(&ueCapablityList->list.array[idx]->ue_CapabilityRAT_Container) != ROK)
+       {
+          DU_LOG("\nERROR  -->  F1AP : Failed to fill UE capability RAT Conatiner");
+          ret = RFAILED;
+          break;
+       }
 
-   return ROK;
+       ret = ROK;
+       break;
+    }
+    return ret;
 }
+
 /*******************************************************************
  *
- * @brief Frees memeory allocated for SearchSpcToAddModList
+ * @brief Fill UE Capability RAT container list octet string
  *
  * @details
  *
- *    Function : FreeSearchSpcToAddModList
- *
- *    Functionality: Deallocating memory of SearchSpcToAddModList
+ *    Function : fillUeCapRatContListBuf
  *
- * @params[in] struct PDCCH_Config__searchSpacesToAddModList *searchSpcList
+ *    Functionality: Fill UE Capability RAT container list octet string
  *
- * @return void
+ * @params[in] UE capability RAT container list buffer
+ * @return ROK     - success
+ *         RFAILED - failure
  *
4221 * ****************************************************************/
-void FreeSearchSpcToAddModList(struct PDCCH_Config__searchSpacesToAddModList *searchSpcList)
+ * ****************************************************************/
+uint8_t fillUeCapRatContListBuf(UE_CapabilityRAT_ContainerList_t *ueCapablityListBuf)
 {
-   uint8_t idx1=0;
-   uint8_t idx2=0;
-   struct  SearchSpace *searchSpc=NULLP;
+   uint8_t          ret = RFAILED;
+   asn_enc_rval_t   encRetVal;
+   UE_CapabilityRAT_ContainerListRRC_t  ueCapablityList;
 
-   if(searchSpcList->list.array)
+   while(true)
    {
-      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)
-                       {
-                          CU_FREE(searchSpc->searchSpaceType->choice.ue_Specific,\
-                                sizeof(struct SearchSpace__searchSpaceType__ue_Specific));
-                          CU_FREE(searchSpc->searchSpaceType, sizeof(struct
-                                   SearchSpace__searchSpaceType));
-                       }
-                       CU_FREE(searchSpc->nrofCandidates,
-                             sizeof(struct SearchSpace__nrofCandidates));
-                    }
-                    CU_FREE(searchSpc->monitoringSymbolsWithinSlot->buf, \
-                          searchSpc->monitoringSymbolsWithinSlot->size);
-                 }
-                 CU_FREE(searchSpc->monitoringSymbolsWithinSlot,
-                       sizeof(BIT_STRING_t));
-              }
-              CU_FREE(searchSpc->monitoringSlotPeriodicityAndOffset, \
-                    sizeof(struct SearchSpace__monitoringSlotPeriodicityAndOffset));
-           }
-           CU_FREE(searchSpc->controlResourceSetId,
-                 sizeof(ControlResourceSetId_t));
-        }
-      }
-      for(idx1 = 0; idx1 < searchSpcList->list.count; idx1++)
+      ret = fillUeCapRatContList(&ueCapablityList);
+      if(ret != ROK)
       {
-        CU_FREE(searchSpcList->list.array[idx1],
-              sizeof(struct SearchSpace));
+         DU_LOG( "\nERROR  -->  F1AP : Failed to fill UE Capability RAT container list");
+         break;
       }
-      CU_FREE(searchSpcList->list.array,searchSpcList->list.size);
-   }
-}
-/*******************************************************************
- *
- * @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(timeDomAllocList->choice.setup->list.array)
+      /* encode UE Capability RAT Container List into duToCuRrcContainer */
+      xer_fprint(stdout, &asn_DEF_UE_CapabilityRAT_ContainerListRRC, &ueCapablityList);
+      cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
+      encBufSize = 0;
+      encRetVal = aper_encode(&asn_DEF_UE_CapabilityRAT_ContainerListRRC, 0, \
+            &ueCapablityList, PrepFinalEncBuf, encBuf);
+
+      /* Encode results */
+      if(encRetVal.encoded == ENCODE_FAIL)
       {
-        for(idx1 = 0; idx1 <timeDomAllocList->choice.setup->list.count ; idx1++)
-        {
-           CU_FREE(timeDomAllocList->choice.setup->list.array[idx1],
-                 sizeof(struct PDSCH_TimeDomainResourceAllocation));
-        }
-        CU_FREE(timeDomAllocList->choice.setup->list.array, \
-              timeDomAllocList->choice.setup->list.size);
+         DU_LOG( "\nERROR  -->  F1AP : Could not encode UE Capability RAT Container (at %s)\n",\
+               encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+         break;
       }
-      CU_FREE(timeDomAllocList->choice.setup,\
-           sizeof(struct PDSCH_TimeDomainResourceAllocationList));
-   }
-}
-/*******************************************************************
- *
- * @brief Frees memory allocated for PuschTimeDomAllocList
- *
- *@details
- *
- *    Function : FreePuschTimeDomAllocList
- *
- *    Functionality: Deallocating memory of PuschTimeDomAllocList
- *
- * @params[in] PUSCH_Config_t *puschCfg
- *
- * @return void
- *
- ***********************************************************************/
-void FreePuschTimeDomAllocList(PUSCH_Config_t *puschCfg)
-{
-   uint8_t idx1=0;
-   uint8_t idx2=0;
-   struct PUSCH_Config__pusch_TimeDomainAllocationList *timeDomAllocList_t=NULLP;
-
-   if(puschCfg->pusch_TimeDomainAllocationList)
-   {
-      timeDomAllocList_t=puschCfg->pusch_TimeDomainAllocationList;
-      if(timeDomAllocList_t->choice.setup)
+      else
+      {
+         DU_LOG("\nDEBUG  -->  F1AP : Created APER encodedbuffer for UE Capability RAT Container\n");
+         for(int i=0; i< encBufSize; i++)
+         {
+            DU_LOG("%x",encBuf[i]);
+         }
+      }
+
+      ueCapablityListBuf->size = encBufSize;
+      CU_ALLOC(ueCapablityListBuf->buf, ueCapablityListBuf->size);
+      if(!ueCapablityListBuf->buf)
       {
-        if(timeDomAllocList_t->choice.setup->list.array)
-        {
-           CU_FREE(timeDomAllocList_t->choice.setup->list.array[idx2]->k2, sizeof(long));
-           for(idx1 = 0; idx1<timeDomAllocList_t->choice.setup->list.count; idx1++)
-           {
-              CU_FREE(timeDomAllocList_t->choice.setup->list.array[idx1],\
-                    sizeof(PUSCH_TimeDomainResourceAllocation_t));
-           }
-           CU_FREE(timeDomAllocList_t->choice.setup->list.array, \
-                 timeDomAllocList_t->choice.setup->list.size);
-        }
-        CU_FREE(timeDomAllocList_t->choice.setup, \
-              sizeof(struct PUSCH_TimeDomainResourceAllocationList));
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in fillUeCapabilityContainer");
+         break;
       }
-      CU_FREE(puschCfg->transformPrecoder, sizeof(long));
-      CU_FREE(puschCfg->pusch_TimeDomainAllocationList, \
-           sizeof(struct PUSCH_Config__pusch_TimeDomainAllocationList));
+      memcpy(ueCapablityListBuf->buf, encBuf, ueCapablityListBuf->size);
+      ret = ROK;
+      break;
    }
-
+   freeUeCapRatContList(&ueCapablityList);
+   return ret;
 }
 
 /*******************************************************************
  *
- * @brief Frees memory allocated for Dedicated PUCCH config
+ * @brief Free Measurement Timing Configuration
  *
  * @details
  *
- *    Function : FreeBWPUlDedPucchCfg
- *
- *    Functionality: Deallocating memory of Dedicated PUCCH cfg
+ *    Function : freeMeasuementTimingConfig
  *
- * @params[in] BWP_UplinkDedicated__pucch_Config *ulBwpPucchCfg
+ *    Functionality: Free Measurement Timing Configuration
  *
+ * @params[in] MeasurementTimingConfiguration_IEs_t measTimingCfg
  * @return void
  *
  * ****************************************************************/
-void FreeBWPUlDedPucchCfg(struct BWP_UplinkDedicated__pucch_Config *ulBwpPucchCfg)
-{  
-   uint8_t arrIdx, rsrcIdx, rsrcSetIdx;
-   PUCCH_Config_t *pucchCfg = NULLP;
-   PUCCH_ResourceSet_t *rsrcSet = NULLP;
-   PUCCH_Resource_t *rsrc = NULLP;
+void freeMeasuementTimingConfig(MeasurementTimingConfigurationRrc_t measTimingConfig)
+{
+   uint8_t measCfgIdx;
+   MeasurementTimingConfigurationRrc_IEs_t *measTimingCfg = NULLP;
+   MeasTiming_t *measTiming = NULLP;
 
-   if(ulBwpPucchCfg)
+   if(measTimingConfig.criticalExtensions.choice.c1)
    {
-      if(ulBwpPucchCfg->choice.setup)
+      if(measTimingConfig.criticalExtensions.choice.c1->choice.measTimingConf)
       {
-         pucchCfg = ulBwpPucchCfg->choice.setup;
-
-         //Free resource set list
-         if(pucchCfg->resourceSetToAddModList)
+         measTimingCfg = measTimingConfig.criticalExtensions.choice.c1->choice.measTimingConf;
+         if(measTimingCfg->measTiming)
          {
-            if(pucchCfg->resourceSetToAddModList->list.array)
+            if(measTimingCfg->measTiming->list.array)
             {
-               for(rsrcSetIdx=0; rsrcSetIdx < pucchCfg->resourceSetToAddModList->list.count; rsrcSetIdx++)
+               for(measCfgIdx = 0; measCfgIdx < measTimingCfg->measTiming->list.count; measCfgIdx++)
                {
-                  rsrcSet = pucchCfg->resourceSetToAddModList->list.array[rsrcSetIdx];
-                  if(rsrcSet->resourceList.list.array)
-                  {
-                     for(rsrcIdx=0; rsrcIdx < rsrcSet->resourceList.list.count; rsrcIdx++)
-                     {
-                        CU_FREE(rsrcSet->resourceList.list.array[rsrcIdx], sizeof(PUCCH_ResourceId_t));
-                     }
-                     CU_FREE(rsrcSet->resourceList.list.array, rsrcSet->resourceList.list.size);
-                  }
-                  CU_FREE(pucchCfg->resourceSetToAddModList->list.array[rsrcSetIdx], sizeof(PUCCH_ResourceSet_t));
+                  measTiming = measTimingCfg->measTiming->list.array[measCfgIdx];
+                  CU_FREE(measTiming->frequencyAndTiming, sizeof(struct MeasTiming__frequencyAndTiming));
+                  CU_FREE(measTimingCfg->measTiming->list.array[measCfgIdx], sizeof(MeasTiming_t));
                }
-               CU_FREE(pucchCfg->resourceSetToAddModList->list.array, pucchCfg->resourceSetToAddModList->list.size);
+               CU_FREE(measTimingCfg->measTiming->list.array, measTimingCfg->measTiming->list.size);
             }
-            CU_FREE(pucchCfg->resourceSetToAddModList, sizeof(struct PUCCH_Config__resourceSetToAddModList));
+            CU_FREE(measTimingCfg->measTiming, sizeof(MeasTimingList_t));
          }
+         CU_FREE(measTimingConfig.criticalExtensions.choice.c1->choice.measTimingConf, sizeof(struct MeasurementTimingConfigurationRrc_IEs));
+      }
+      CU_FREE(measTimingConfig.criticalExtensions.choice.c1, sizeof(struct MeasurementTimingConfigurationRrc__criticalExtensions__c1));
+   }
+}
 
-         //Free resource list
-         if(pucchCfg->resourceToAddModList)
-         {
-            if(pucchCfg->resourceToAddModList->list.array)
-            {
-               for(rsrcIdx=0; rsrcIdx < pucchCfg->resourceToAddModList->list.count; rsrcIdx++)
-               {
-                  rsrc = pucchCfg->resourceToAddModList->list.array[rsrcIdx];
-                  CU_FREE(rsrc->format.choice.format1, sizeof(PUCCH_format1_t));
-                  CU_FREE(pucchCfg->resourceToAddModList->list.array[rsrcIdx], sizeof(PUCCH_Resource_t));
-               }
-               CU_FREE(pucchCfg->resourceToAddModList->list.array, pucchCfg->resourceToAddModList->list.size);
-            }
-            CU_FREE(pucchCfg->resourceToAddModList, sizeof(struct PUCCH_Config__resourceToAddModList));
-         }
-         
-         //PUCCH Format 1
-         if(pucchCfg->format1)
-         {
-            if(pucchCfg->format1->choice.setup)
-            {
-               CU_FREE(pucchCfg->format1->choice.setup->nrofSlots, sizeof(long));
-               CU_FREE(pucchCfg->format1->choice.setup, sizeof(PUCCH_FormatConfig_t));
-            }
-            CU_FREE(pucchCfg->format1, sizeof(struct PUCCH_Config__format1));
-         }
+/*******************************************************************
+ *
+ * @brief Fill Measurement Timing Configuration
+ *
+ * @details
+ *
+ *    Function : fillMeasTimingCfg
+ *
+ *    Functionality: Fill Measurement Timing Configuration
+ *
+ * @params[in] MeasurementTimingConfiguration_IEs_t measTimingCfg
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillMeasTimingCfg(MeasurementTimingConfigurationRrc_IEs_t *measTimingCfg)
+{
+   uint8_t elementCnt = 0;
+   uint8_t measCfgIdx = 0; 
+   MeasTiming_t *measTiming;
+   SSB_MTC_t *smtc;
 
-         //DL DATA TO UL ACK
-         if(pucchCfg->dl_DataToUL_ACK)
-         {
-            if(pucchCfg->dl_DataToUL_ACK->list.array)
-            {
-               for(arrIdx = 0; arrIdx <  pucchCfg->dl_DataToUL_ACK->list.count; arrIdx++)
-               {
-                  CU_FREE(pucchCfg->dl_DataToUL_ACK->list.array[arrIdx], sizeof(long));
-               }
-               CU_FREE(pucchCfg->dl_DataToUL_ACK->list.array, pucchCfg->dl_DataToUL_ACK->list.size);
-            }
-            CU_FREE(pucchCfg->dl_DataToUL_ACK, sizeof(struct PUCCH_Config__dl_DataToUL_ACK));
-         }
+   CU_ALLOC(measTimingCfg->measTiming, sizeof(MeasTimingList_t));
+   if(!measTimingCfg->measTiming)
+   {
+      DU_LOG( "\nERROR  -->  F1AP : Failed to allocated memory  for measTiming in fillMeasTimingCfg");
+      return RFAILED;
+   }
 
-         CU_FREE(ulBwpPucchCfg->choice.setup, sizeof(PUCCH_Config_t));
+   elementCnt = 1;
+   measTimingCfg->measTiming->list.count = elementCnt;
+   measTimingCfg->measTiming->list.size = measTimingCfg->measTiming->list.count * sizeof(MeasTiming_t *);
+   CU_ALLOC(measTimingCfg->measTiming->list.array, measTimingCfg->measTiming->list.size);
+   if(!measTimingCfg->measTiming->list.array)
+   {
+      DU_LOG( "\nERROR  -->  F1AP : Failed to allocated memory for measTiming array in fillMeasTimingCfg");
+      return RFAILED;
+   }
+
+   for(measCfgIdx = 0; measCfgIdx < measTimingCfg->measTiming->list.count; measCfgIdx++)
+   {
+      CU_ALLOC(measTimingCfg->measTiming->list.array[measCfgIdx], sizeof(MeasTiming_t));
+      if(!measTimingCfg->measTiming->list.array[measCfgIdx])
+      {
+         DU_LOG( "\nERROR  -->  F1AP : Failed to allocated memory for measTiming array element in fillMeasTimingCfg");
+         return RFAILED;
       }
-      CU_FREE(ulBwpPucchCfg, sizeof(struct BWP_UplinkDedicated__pucch_Config));
    }
+
+   measCfgIdx = 0;
+   measTiming = measTimingCfg->measTiming->list.array[measCfgIdx];
+   CU_ALLOC(measTiming->frequencyAndTiming, sizeof(struct MeasTiming__frequencyAndTiming));
+   if(!measTiming->frequencyAndTiming)
+   {
+      DU_LOG( "\nERROR  -->  F1AP : Failed to allocated memory for frequency and timing IE in fillMeasTimingCfg");
+      return RFAILED;
+   }
+
+   measTiming->frequencyAndTiming->carrierFreq =  623800; /* This is a randomly chosen value since ARFCN configured in DU is 623400 */
+   measTiming->frequencyAndTiming->ssbSubcarrierSpacing = SubcarrierSpacing_kHz15;
+
+   smtc = &measTiming->frequencyAndTiming->ssb_MeasurementTimingConfiguration;
+   smtc->periodicityAndOffset.present = SSB_MTC__periodicityAndOffset_PR_sf20;
+   smtc->periodicityAndOffset.choice.sf20 = 0;
+   smtc->duration = SSB_MTC__duration_sf1;
+   return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Frees memory allocated for InitialUlBWP
+ * @brief Fill Measurement Timing Configuration Octet string
  *
  * @details
  *
- *    Function : FreeInitialUlBWP
- *
- *    Functionality: Deallocating memory of InitialUlBWP
+ *    Function : fillMeasConfigBuf
  *
- * @params[in] BWP_UplinkDedicated_t *ulBwp
+ *    Functionality: Fill Measurement Timing Configuration Octet string
  *
- * @return void
+ * @params[in] MeasConfig_t *measConfgBuf
+ * @return ROK     - success
+ *         RFAILED - failure
  *
  * ****************************************************************/
-void FreeInitialUlBWP(BWP_UplinkDedicated_t *ulBwp)
+uint8_t fillMeasTimingConfigBuf(MeasConfig_t *measTimingConfigBuf)
 {
-   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);
+   uint8_t          ret = RFAILED;
+   asn_enc_rval_t   encRetVal;
+   MeasurementTimingConfigurationRrc_t measTimingConfig;
 
-   if(ulBwp->pusch_Config)
+   while(true)
    {
-      if(ulBwp->pusch_Config->choice.setup)
+      measTimingConfig.criticalExtensions.present = MeasurementTimingConfigurationRrc__criticalExtensions_PR_c1;
+      CU_ALLOC(measTimingConfig.criticalExtensions.choice.c1, sizeof(struct MeasurementTimingConfigurationRrc__criticalExtensions__c1));
+      if(!measTimingConfig.criticalExtensions.choice.c1)
       {
-         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)
-                     {
-                        CU_FREE(dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0,\
-                              sizeof(long));
-                        CU_FREE(dmrsUlCfg->choice.setup->transformPrecodingDisabled,
-                              sizeof(struct DMRS_UplinkConfig__transformPrecodingDisabled));
-                     }
-                     CU_FREE(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition,
-                           sizeof(long));
-                  }
-                  CU_FREE(dmrsUlCfg->choice.setup,sizeof(DMRS_UplinkConfig_t));
-               }
-               CU_FREE(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA, \
-                     sizeof(struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA));
-            }
-            CU_FREE(puschCfg->dataScramblingIdentityPUSCH, sizeof(long));
-         }
-         CU_FREE(ulBwp->pusch_Config->choice.setup, sizeof(PUSCH_Config_t));
+         DU_LOG( "\nERROR  -->  F1AP : Failed to allocated memory for measurement configuration extension");
+         return RFAILED;
+      } 
+      measTimingConfig.criticalExtensions.choice.c1->present = MeasurementTimingConfigurationRrc__criticalExtensions__c1_PR_measTimingConf;
+
+      CU_ALLOC(measTimingConfig.criticalExtensions.choice.c1->choice.measTimingConf, sizeof(struct MeasurementTimingConfigurationRrc_IEs));
+      if(!measTimingConfig.criticalExtensions.choice.c1->choice.measTimingConf)
+      {
+         DU_LOG( "\nERROR  -->  F1AP : Failed to allocated memory for measurement timing configuration IE");
+         return RFAILED;
       }
-      CU_FREE(ulBwp->pusch_Config, sizeof(struct BWP_UplinkDedicated__pusch_Config));
 
-      /* Free SRS-Config */
-      if(ulBwp->srs_Config)
+      ret = fillMeasTimingCfg(measTimingConfig.criticalExtensions.choice.c1->choice.measTimingConf);
+      if(ret != ROK)
       {
-         if(ulBwp->srs_Config->choice.setup)
-         {
-            srsCfg = ulBwp->srs_Config->choice.setup;
+         DU_LOG( "\nERROR  -->  F1AP : Failed to fill measurement timing configuration IE");
+         break;
+      }
 
-            /* Free Resource Set to add/mod list */
-            if(srsCfg->srs_ResourceSetToAddModList)
-            {
-               rsrcSetList = srsCfg->srs_ResourceSetToAddModList;
-               if(rsrcSetList->list.array)
-               {
-                  rSetIdx = 0;
+      /* Encode measurement timing configuration into octet string */
+      xer_fprint(stdout, &asn_DEF_MeasurementTimingConfigurationRrc, &measTimingConfig);
+      cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
+      encBufSize = 0;
+      encRetVal = aper_encode(&asn_DEF_MeasurementTimingConfigurationRrc, 0, &measTimingConfig, PrepFinalEncBuf, encBuf);
 
-                  /* Free SRS resource Id list in this SRS resource set */
-                  if(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList)
-                  {
-                     rsrcIdList = rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList;
+      /* Encode results */
+      if(encRetVal.encoded == ENCODE_FAIL)
+      {
+         DU_LOG( "\nERROR  -->  F1AP : Could not encode Measurement Timing Configuration (at %s)\n",\
+               encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+         break;
+      }
+      else
+      {
+         DU_LOG("\nDEBUG  -->  F1AP : Created APER encodedbuffer for Measurement timing configuration\n");
+         for(int i=0; i< encBufSize; i++)
+         {
+            DU_LOG("%x",encBuf[i]);
+         }
+      }
 
-                     if(rsrcIdList->list.array)
-                     {
-                        for(rsrcIdx = 0; rsrcIdx < rsrcIdList->list.count; rsrcIdx++)
-                        {
-                           CU_FREE(rsrcIdList->list.array[rsrcIdx], sizeof(SRS_ResourceId_t));
-                        }
-                        CU_FREE(rsrcIdList->list.array, rsrcIdList->list.size);
-                     }
-                     CU_FREE(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList,\
-                           sizeof(struct SRS_ResourceSet__srs_ResourceIdList));
-                  }
+      measTimingConfigBuf->size = encBufSize;
+      CU_ALLOC(measTimingConfigBuf->buf, measTimingConfigBuf->size);
+      if(!measTimingConfigBuf->buf)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed fillMeasTimingConfigBuf");
+         break;
+      }
+      memcpy(measTimingConfigBuf->buf, encBuf, measTimingConfigBuf->size);
+      ret = ROK;
+      break;
+   }
+   freeMeasuementTimingConfig(measTimingConfig);
+   return ret;
+}
 
-                  /* Free resource type info for this SRS resource set */
-                  CU_FREE(rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic, \
-                        sizeof(struct SRS_ResourceSet__resourceType__aperiodic));
+/******************************************************************
+ *
+ * @brief Free RRC reconfiguration non-critical extension
+ *
+ * @details
+ *
+ *    Function : freeRrcReconfigNonCriticalExt
+ *
+ *    Functionality: Free RRC reconfiguration non-critical extension
+ *
+ * @params[in] RRC reconfiguration IE
+ * @return void
+ *
+ * ****************************************************************/
+void freeRrcReconfigNonCriticalExt(RRCReconfiguration_v1530_IEs_t *rrcRecfg)
+{
+   if(rrcRecfg->masterCellGroup)
+   {
+      CU_FREE(rrcRecfg->masterCellGroup, sizeof(OCTET_STRING_t));
+   }
+}
 
-                  /* Free memory for each resource set */
-                  for(rSetIdx = 0; rSetIdx < rsrcSetList->list.count; rSetIdx++)
-                  {
-                     CU_FREE(rsrcSetList->list.array[rSetIdx], sizeof(SRS_ResourceSet_t));
-                  }
-                  CU_FREE(rsrcSetList->list.array, rsrcSetList->list.size); 
-               }
-               CU_FREE(srsCfg->srs_ResourceSetToAddModList, \
-                     sizeof(struct SRS_Config__srs_ResourceSetToAddModList));
-            }
+/******************************************************************
+ *
+ * @brief Free measurement object addmod list
+ *
+ * @details
+ *
+ *    Function : freeMeasObjToAddModList
+ *
+ *    Functionality: Free measurement object add mod list
+ *
+ * @params[in] Measurement object add/mod list
+ * @return void
+ *
+ * ****************************************************************/
+void freeMeasObjToAddModList(MeasObjectToAddModList_t *measObjList)
+{
+   uint8_t objIdx;
+   MeasObjectNR_t *measObject;
 
-            /* Free resource to add/modd list */
-            if(srsCfg->srs_ResourceToAddModList)
+   if(measObjList->list.array)
+   {
+      for(objIdx = 0; objIdx < measObjList->list.size; objIdx++)
+      {
+         if(measObjList->list.array[objIdx])
+         {
+            if(measObjList->list.array[objIdx]->measObject.choice.measObjectNR)
             {
-               resourceList = srsCfg->srs_ResourceToAddModList;
-               if(resourceList->list.array)
+               measObject = measObjList->list.array[objIdx]->measObject.choice.measObjectNR;
+               CU_FREE(measObject->ssbFrequency, sizeof(ARFCN_ValueNR_t));
+               CU_FREE(measObject->ssbSubcarrierSpacing, sizeof(SubcarrierSpacing_t));
+               CU_FREE(measObject->smtc1 , sizeof(SSB_MTC_t));
+               if(measObject->absThreshSS_BlocksConsolidation)
                {
-                  rsrcIdx = 0;
-                  CU_FREE(resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2,\
-                        sizeof(struct SRS_Resource__transmissionComb__n2));
-                  CU_FREE(resourceList->list.array[rsrcIdx]->resourceType.choice.aperiodic,\
-                        sizeof(struct SRS_Resource__resourceType__aperiodic));
-
-                  for(rsrcIdx = 0; rsrcIdx < resourceList->list.count; rsrcIdx++)
-                  {
-                     CU_FREE(resourceList->list.array[rsrcIdx], sizeof(SRS_Resource_t));
-                  }
-                  CU_FREE(resourceList->list.array, resourceList->list.size);
+                  CU_FREE(measObject->absThreshSS_BlocksConsolidation->thresholdRSRP, sizeof(RSRP_Range_t));
+                  CU_FREE(measObject->absThreshSS_BlocksConsolidation->thresholdRSRQ, sizeof(RSRQ_Range_t));
+                  CU_FREE(measObject->absThreshSS_BlocksConsolidation->thresholdSINR, sizeof(SINR_Range_t));
+                  CU_FREE(measObject->absThreshSS_BlocksConsolidation, sizeof(ThresholdNR_t));
                }
-               CU_FREE(srsCfg->srs_ResourceToAddModList, \
-                     sizeof(struct SRS_Config__srs_ResourceToAddModList));
+               CU_FREE(measObject->nrofSS_BlocksToAverage, sizeof(long));
+               CU_FREE(measObject->offsetMO.rsrpOffsetSSB, sizeof(Q_OffsetRange_t));
+               CU_FREE(measObject->offsetMO.rsrqOffsetSSB, sizeof(Q_OffsetRange_t));
+               CU_FREE(measObject->offsetMO.sinrOffsetSSB, sizeof(Q_OffsetRange_t));
+               CU_FREE(measObjList->list.array[objIdx]->measObject.choice.measObjectNR, sizeof(MeasObjectNR_t));
             }
-
-            CU_FREE(ulBwp->srs_Config->choice.setup, sizeof(SRS_Config_t));
+            CU_FREE(measObjList->list.array[objIdx], sizeof(MeasObjectToAddMod_t));
          }
-         CU_FREE(ulBwp->srs_Config, sizeof(struct BWP_UplinkDedicated__srs_Config));
       }
+      CU_FREE(measObjList->list.array, measObjList->list.size);
    }
-}      
-/*******************************************************************
+}
+
+/******************************************************************
  *
- * @brief Frees memory allocated for initialUplinkBWP
+ * @brief Free report config add mod list
  *
  * @details
  *
- *    Function : FreeinitialUplinkBWP
- *
- *    Functionality: Deallocating memory of initialUplinkBWP
+ *    Function : freeReportCfgToAddModList
  *
- * @params[in] UplinkConfig_t *ulCfg
+ *    Functionality: Free report config add mod list
  *
+ * @params[in] Report config list
  * @return void
- *         
  *
  * ****************************************************************/
-void FreeinitialUplinkBWP(UplinkConfig_t *ulCfg)
+void freeReportCfgToAddModList(ReportConfigToAddModList_t *reportCfgList)
 {
-   BWP_UplinkDedicated_t *ulBwp=NULLP; 
-   struct UplinkConfig__pusch_ServingCellConfig *puschCfg=NULLP;
+   uint8_t reportCfgIdx;
+   ReportConfigToAddMod_t *reportCfg;
+   ReportConfigNR_t *reportCfgNr;
+   EventTriggerConfig_t *eventTriggCfg;
 
-   if(ulCfg->initialUplinkBWP)
+   if(reportCfgList->list.array)
    {
-      ulBwp=ulCfg->initialUplinkBWP;
-      if(ulCfg->firstActiveUplinkBWP_Id)
+      for(reportCfgIdx=0; reportCfgIdx < reportCfgList->list.count; reportCfgIdx++)
       {
-        if(ulCfg->pusch_ServingCellConfig)
-        {
-           puschCfg=ulCfg->pusch_ServingCellConfig;
-           if(puschCfg->choice.setup)
-           {
-              if(puschCfg->choice.setup->ext1)
-              {
-                 CU_FREE(puschCfg->choice.setup->ext1->\
-                       processingType2Enabled,sizeof(BOOLEAN_t));
-                 CU_FREE(puschCfg->choice.setup->ext1->\
-                       maxMIMO_Layers,sizeof(long));
-                 CU_FREE(puschCfg->choice.setup->ext1, \
-                       sizeof(struct PUSCH_ServingCellConfig__ext1));
-              }
-              CU_FREE(puschCfg->choice.setup, sizeof(struct PUSCH_ServingCellConfig));
-           }
-           CU_FREE(ulCfg->pusch_ServingCellConfig, sizeof(struct UplinkConfig__pusch_ServingCellConfig));
-        }
-        CU_FREE(ulCfg->firstActiveUplinkBWP_Id, sizeof(BWP_Id_t));
+         if(reportCfgList->list.array[reportCfgIdx])
+         {
+            reportCfg = reportCfgList->list.array[reportCfgIdx];
+            if(reportCfg->reportConfig.choice.reportConfigNR)
+            {
+               reportCfgNr = reportCfg->reportConfig.choice.reportConfigNR;
+               if(reportCfgNr->reportType.choice.eventTriggered)
+               {
+                  eventTriggCfg = reportCfgNr->reportType.choice.eventTriggered;
+                  CU_FREE(eventTriggCfg->eventId.choice.eventA3, sizeof(struct EventTriggerConfig__eventId__eventA3));
+                  CU_FREE(eventTriggCfg->reportQuantityRS_Indexes, sizeof(MeasReportQuantity_t));
+                  CU_FREE(eventTriggCfg->maxNrofRS_IndexesToReport, sizeof(long));
+                  CU_FREE(reportCfgNr->reportType.choice.eventTriggered, sizeof(EventTriggerConfig_t));
+               }
+            }
+         }
+         CU_FREE(reportCfgList->list.array[reportCfgIdx], sizeof(ReportConfigToAddMod_t));
       }
-      FreeInitialUlBWP(ulBwp);
-      CU_FREE(ulCfg->initialUplinkBWP, sizeof(BWP_UplinkDedicated_t));
+      CU_FREE(reportCfgList->list.array, reportCfgList->list.size);
    }
 }
-/*******************************************************************
+
+/******************************************************************
  *
- * @brief Frees emmory allocated for BWPDlDedPdschCfg
+ * @brief Free measurement id to add mod list
  *
  * @details
  *
- *    Function : FreeBWPDlDedPdschCfg
- *
- *    Functionality: Deallocating memory of BWPDlDedPdschCfg
+ *    Function : freeMeasIdToAddModList
  *
- * @params[in] BWP_DownlinkDedicated_t *dlBwp
+ *    Functionality: Free measurement id to add mod list
  *
+ * @params[in] Measurement id to add mod list
  * @return void
  *
- *
  * ****************************************************************/
-void FreeBWPDlDedPdschCfg(BWP_DownlinkDedicated_t *dlBwp)
+void freeMeasIdToAddModList(MeasIdToAddModList_t *measIdList)
 {
-   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)
+   uint8_t measIdIdx;
+   if(measIdList->list.array)
    {
-      pdschCfg=dlBwp->pdsch_Config->choice.setup;
-      if(pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA)
+      for(measIdIdx=0; measIdIdx < measIdList->list.count; measIdIdx++)
       {
-        if(pdschCfg->pdsch_TimeDomainAllocationList)
-        {
-           timeDomAllocList=pdschCfg->pdsch_TimeDomainAllocationList;
-           if(pdschCfg->maxNrofCodeWordsScheduledByDCI)
-           {
-              prbBndlType=&pdschCfg->prb_BundlingType;
-              CU_FREE(prbBndlType->choice.staticBundling,\
-                    sizeof(struct PDSCH_Config__prb_BundlingType__staticBundling));
-              CU_FREE(pdschCfg->maxNrofCodeWordsScheduledByDCI, sizeof(long));
-           }
-           FreePdschTimeDomAllocList(timeDomAllocList);
-           CU_FREE(pdschCfg->pdsch_TimeDomainAllocationList, \
-                 sizeof(struct PDSCH_Config__pdsch_TimeDomainAllocationList));
-        }
-        dmrsDlCfg=pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA;
-        if(dmrsDlCfg->choice.setup)
-        {
-           CU_FREE(dmrsDlCfg->choice.setup->dmrs_AdditionalPosition,
-                 sizeof(long));
-           CU_FREE(dmrsDlCfg->choice.setup, sizeof(struct DMRS_DownlinkConfig));
-        }
-        CU_FREE(pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA, \
-              sizeof(struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA));
+         CU_FREE(measIdList->list.array[measIdIdx], sizeof(MeasIdToAddMod_t));
       }
-      CU_FREE(dlBwp->pdsch_Config->choice.setup, sizeof(struct PDSCH_Config));
+      CU_FREE(measIdList->list.array, measIdList->list.size);
    }
 }
+
 /*******************************************************************
  *
- * @brief Frees emmory allocated for BWPDlDedPdcchCfg
+ * @brief Free quantity config
  *
  * @details
  *
- *    Function : FreeBWPDlDedPdcchCfg
- *
- *    Functionality: Deallocating memory of BWPDlDedPdcchCfg
+ *    Function : freeQunatityConfig
  *
- * @params[in] BWP_DownlinkDedicated_t *dlBwp
+ *    Functionality: Free quantity config
  *
+ * @params[in] Quantity Config
  * @return void
- *         
  *
  * ****************************************************************/
-void FreeBWPDlDedPdcchCfg(BWP_DownlinkDedicated_t *dlBwp)
+void freeQuantityConfig(QuantityConfig_t *quantityCfg)
 {
-   uint8_t idx1=0;
-   uint8_t idx2=0;
-   struct PDCCH_Config *pdcchCfg=NULLP;
-   struct ControlResourceSet *controlRSet=NULLP;
-   struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList=NULLP;
+   uint8_t quanCfgIdx;
+   QuantityConfigNR_t *quantityCfgNr;
 
-   if(dlBwp->pdcch_Config->choice.setup)
+   if(quantityCfg->quantityConfigNR_List)
    {
-      pdcchCfg=dlBwp->pdcch_Config->choice.setup;
-      if(pdcchCfg->controlResourceSetToAddModList)
+      if(quantityCfg->quantityConfigNR_List->list.array)
       {
-        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);
-                       CU_FREE(pdcchCfg->searchSpacesToAddModList, \
-                             sizeof(struct PDCCH_Config__searchSpacesToAddModList));
-                    }
-                    CU_FREE(controlRSet->pdcch_DMRS_ScramblingID, sizeof(long));
-                 }
-                 CU_FREE(controlRSet->frequencyDomainResources.buf, \
-                       controlRSet->frequencyDomainResources.size);
-              }
-           }
-           for(idx1 = 0; idx1 <controlRSetList->list.count; idx1++)
-           {
-              CU_FREE(controlRSetList->list.array[idx1], sizeof(struct ControlResourceSet));
-           }
-           CU_FREE(controlRSetList->list.array, controlRSetList->list.size);
-        }
-        CU_FREE(pdcchCfg->controlResourceSetToAddModList, \
-              sizeof(struct PDCCH_Config__controlResourceSetToAddModList));
+         for(quanCfgIdx = 0; quanCfgIdx < quantityCfg->quantityConfigNR_List->list.count; quanCfgIdx++)
+         {
+            if(quantityCfg->quantityConfigNR_List->list.array[quanCfgIdx])
+            {
+               quantityCfgNr = quantityCfg->quantityConfigNR_List->list.array[quanCfgIdx];
+               CU_FREE(quantityCfgNr->quantityConfigCell.ssb_FilterConfig.filterCoefficientRSRP, sizeof(FilterCoefficient_t));
+               CU_FREE(quantityCfgNr->quantityConfigCell.ssb_FilterConfig.filterCoefficientRSRQ, sizeof(FilterCoefficient_t));
+               CU_FREE(quantityCfgNr->quantityConfigCell.ssb_FilterConfig.filterCoefficientRS_SINR, sizeof(FilterCoefficient_t));
+               if(quantityCfgNr->quantityConfigRS_Index)
+               {
+                  CU_FREE(quantityCfgNr->quantityConfigRS_Index->ssb_FilterConfig.filterCoefficientRSRP, sizeof(FilterCoefficient_t));
+                  CU_FREE(quantityCfgNr->quantityConfigRS_Index->ssb_FilterConfig.filterCoefficientRSRQ, sizeof(FilterCoefficient_t));
+                  CU_FREE(quantityCfgNr->quantityConfigRS_Index->ssb_FilterConfig.filterCoefficientRS_SINR, sizeof(FilterCoefficient_t));
+                  CU_FREE(quantityCfgNr->quantityConfigRS_Index, sizeof(QuantityConfigRS_t));
+               }
+               CU_FREE(quantityCfg->quantityConfigNR_List->list.array[quanCfgIdx], sizeof(QuantityConfigNR_t));
+            }
+         }
+         CU_FREE(quantityCfg->quantityConfigNR_List->list.array, quantityCfg->quantityConfigNR_List->list.size);
       }
-      CU_FREE(dlBwp->pdcch_Config->choice.setup, sizeof(struct PDCCH_Config));
+      CU_FREE(quantityCfg->quantityConfigNR_List, sizeof(struct QuantityConfig__quantityConfigNR_List));
    }
 }
-/*******************************************************************
+
+/******************************************************************
  *
- * @brief Builds RLC Config
+ * @brief Free measurement Config
  *
  * @details
  *
- *    Function : BuildRlcConfig
- *
- *    Functionality: Builds RLC Config in BuildRlcBearerToAddModList 
+ *    Function : freeMeasConfig
  *
- * @params[in] RLC_Config *rlcConfig
+ *    Functionality: Free measurement config
  *
- * @return ROK     - success
- *         RFAILED - failure
+ * @params[in] Measurement config
+ * @return void
  *
  * ****************************************************************/
-uint8_t BuildRlcConfig(struct RLC_Config *rlcConfig)
+void freeMeasConfig(MeasConfigRrc_t *measConfig)
 {
-
-   rlcConfig->present = RLC_Config_PR_am;
-
-   rlcConfig->choice.am = NULLP;
-   CU_ALLOC(rlcConfig->choice.am, sizeof(struct RLC_Config__am));
-   if(!rlcConfig->choice.am)
+   if(measConfig->measObjectToAddModList)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfig");
-      return RFAILED;
+      freeMeasObjToAddModList(measConfig->measObjectToAddModList);
+      CU_FREE(measConfig->measObjectToAddModList, sizeof(MeasObjectToAddModList_t));
    }
-
-   /* UL */
-   rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength = NULLP;
-   CU_ALLOC(rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength, sizeof(SN_FieldLengthAM_t));
-   if(!rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength)
+   if(measConfig->reportConfigToAddModList)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfig");
-      return RFAILED;
+      freeReportCfgToAddModList(measConfig->reportConfigToAddModList);
+      CU_FREE(measConfig->reportConfigToAddModList, sizeof(ReportConfigToAddModList_t));
    }
-   *(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 */
-   rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength = NULLP;
-   CU_ALLOC(rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength, sizeof(SN_FieldLengthAM_t)); 
-   if(!rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength)
+   if(measConfig->measIdToAddModList)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcConfig");
-      return RFAILED;
+      freeMeasIdToAddModList(measConfig->measIdToAddModList);
+      CU_FREE(measConfig->measIdToAddModList, sizeof(MeasIdToAddModList_t));
+   }
+   if(measConfig->s_MeasureConfig)
+   {
+      CU_FREE(measConfig->s_MeasureConfig, sizeof(struct MeasConfigRrc__s_MeasureConfig));
+   }
+   if(measConfig->quantityConfig)
+   {
+      freeQuantityConfig(measConfig->quantityConfig);
+      CU_FREE(measConfig->quantityConfig, sizeof(QuantityConfig_t));
    }
-   *(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;
-
-   return ROK;
 }
-
-/*******************************************************************
+/******************************************************************
  *
- * @brief Builds MAC LC Config
+ * @brief Free DRB to AddMod List
  *
  * @details
  *
- *    Function : BuildMacLCConfig 
- *
- *    Functionality: Builds MAC LC Config in BuildRlcBearerToAddModList 
+ *    Function : freeDrbToAddModList
  *
- * @params[in] struct LogicalChannelConfig macLcConfig
+ *    Functionality: Free SRB to AddMod List
  *
- * @return ROK     - success
- *         RFAILED - failure
+ * @params[in] SBR to add/mod list
+ * @return void
  *
  * ****************************************************************/
-uint8_t BuildMacLCConfig(struct LogicalChannelConfig *macLcConfig)
+void freeDrbToAddModList(DRB_ToAddModList_t *drbToAddList)
 {
-
-   macLcConfig->ul_SpecificParameters = NULLP;
-   CU_ALLOC(macLcConfig->ul_SpecificParameters, sizeof(struct LogicalChannelConfig__ul_SpecificParameters));
-   if(!macLcConfig->ul_SpecificParameters)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacLCConfig");
-      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;
-   CU_ALLOC(macLcConfig->ul_SpecificParameters->logicalChannelGroup,   sizeof(long));
-   if(!macLcConfig->ul_SpecificParameters->logicalChannelGroup)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacLCConfig");
-      return RFAILED;
-   }
-   *(macLcConfig->ul_SpecificParameters->logicalChannelGroup) = LC_GRP;
-
-   macLcConfig->ul_SpecificParameters->schedulingRequestID = NULLP;
-   CU_ALLOC(macLcConfig->ul_SpecificParameters->schedulingRequestID,   sizeof(SchedulingRequestId_t));
-   if(!macLcConfig->ul_SpecificParameters->schedulingRequestID)
+   uint8_t drbIdx;
+   if(drbToAddList->list.array)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildMacLCConfig");
-      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;
-
-   return ROK;
+      for(drbIdx = 0; drbIdx < drbToAddList->list.count; drbIdx++)
+      {
+         if(drbToAddList->list.array[drbIdx]->pdcp_Config)
+         {
+            if(drbToAddList->list.array[drbIdx]->pdcp_Config->drb)
+            {
+               CU_FREE(drbToAddList->list.array[drbIdx]->pdcp_Config->drb->discardTimer, sizeof(long));
+               CU_FREE(drbToAddList->list.array[drbIdx]->pdcp_Config->drb->pdcp_SN_SizeUL, sizeof(long));
+               CU_FREE(drbToAddList->list.array[drbIdx]->pdcp_Config->drb->pdcp_SN_SizeDL, sizeof(long));
+               CU_FREE(drbToAddList->list.array[drbIdx]->pdcp_Config->drb, sizeof(struct PDCP_Config__drb));
+            }
+            CU_FREE(drbToAddList->list.array[drbIdx]->pdcp_Config->t_Reordering, sizeof(long));
+            CU_FREE(drbToAddList->list.array[drbIdx]->pdcp_Config, sizeof(PDCP_Config_t));
+         }
+         CU_FREE(drbToAddList->list.array[drbIdx], sizeof(DRB_ToAddMod_t));
+      }
+      CU_FREE(drbToAddList->list.array, drbToAddList->list.size);
+   }
 }
-/*******************************************************************
+
+/******************************************************************
  *
- * @brief Builds RLC Bearer to Add/Mod list
+ * @brief Free SRB to AddMod List
  *
  * @details
  *
- *    Function :BuildRlcBearerToAddModList 
- *
- *    Functionality: Builds RLC Bearer to Add/Mod list in DuToCuRrcContainer
+ *    Function : freeSrbToAddModList
  *
- * @params[in] rlc_BearerToAddModList
+ *    Functionality: Free SRB to AddMod List
  *
- * @return ROK     - success
- *         RFAILED - failure
+ * @params[in] SBR to add/mod list
+ * @return void
  *
  * ****************************************************************/
-uint8_t BuildRlcBearerToAddModList(struct CellGroupConfigRrc__rlc_BearerToAddModList *rlcBearerList)
+void freeSrbToAddModList(SRB_ToAddModList_t *srbToAddList)
 {
-   uint8_t                     idx, elementCnt;
-
-   elementCnt = 1;
-   rlcBearerList->list.count = elementCnt;
-   rlcBearerList->list.size  = elementCnt * sizeof(struct RLC_BearerConfig *);
-
-   rlcBearerList->list.array = NULLP;
-   CU_ALLOC(rlcBearerList->list.array, rlcBearerList->list.size);
-   if(!rlcBearerList->list.array)
-   {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
-      return RFAILED;
-   }
-
-   for(idx=0; idx<rlcBearerList->list.count; idx++)
+   uint8_t srbIdx;
+   if(srbToAddList->list.array)
    {
-      rlcBearerList->list.array[idx] = NULLP;
-      CU_ALLOC(rlcBearerList->list.array[idx], sizeof(struct RLC_BearerConfig));
-      if(!rlcBearerList->list.array[idx])
+      for(srbIdx = 0; srbIdx < srbToAddList->list.count; srbIdx++)
       {
-        DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
-        return RFAILED;
-      }
-   }
-
-   idx = 0;
-   rlcBearerList->list.array[idx]->logicalChannelIdentity = RLC_LCID;
-
-   CU_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 = SRB_ID_1;
+         CU_FREE(srbToAddList->list.array[srbIdx]->reestablishPDCP, sizeof(long));
+         if(srbToAddList->list.array[srbIdx]->pdcp_Config)
+         {
+            CU_FREE(srbToAddList->list.array[srbIdx]->pdcp_Config->t_Reordering, sizeof(long));
+            CU_FREE(srbToAddList->list.array[srbIdx]->pdcp_Config, sizeof(PDCP_Config_t));
+         }
 
-   rlcBearerList->list.array[idx]->reestablishRLC = NULLP;
-   rlcBearerList->list.array[idx]->rlc_Config = NULLP;
-   CU_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;
+         CU_FREE(srbToAddList->list.array[srbIdx], sizeof(SRB_ToAddMod_t));
+      }
+      CU_FREE(srbToAddList->list.array, srbToAddList->list.size);
    }
+}
 
-   if(BuildRlcConfig(rlcBearerList->list.array[idx]->rlc_Config) != ROK)
+/******************************************************************
+ *
+ * @brief Free Radio Bearer Config
+ *
+ * @details
+ *
+ *    Function : freeRadioBearerConfig 
+ *
+ *    Functionality: Free Radio Bearer config
+ *
+ * @params[in] Radio bearer config
+ * @return void
+ *
+ * ****************************************************************/
+void freeRadioBearerConfig(RadioBearerConfig_t *radioBearerConfig)
+{
+   if(radioBearerConfig->srb_ToAddModList)
    {
-      DU_LOG("\nERROR  -->  F1AP : BuildRlcConfig failed");
-      return RFAILED;
+      freeSrbToAddModList(radioBearerConfig->srb_ToAddModList);
+      CU_FREE(radioBearerConfig->srb_ToAddModList, sizeof(SRB_ToAddModList_t));
    }
-
-   rlcBearerList->list.array[idx]->mac_LogicalChannelConfig = NULLP;
-   CU_ALLOC(rlcBearerList->list.array[idx]->mac_LogicalChannelConfig, sizeof(struct LogicalChannelConfig));
-   if(!rlcBearerList->list.array[idx]->mac_LogicalChannelConfig)
+   if(radioBearerConfig->drb_ToAddModList)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
-      return RFAILED;
+      freeDrbToAddModList(radioBearerConfig->drb_ToAddModList);
+      CU_FREE(radioBearerConfig->drb_ToAddModList, sizeof(DRB_ToAddModList_t));
    }
+}
 
-   if(BuildMacLCConfig(rlcBearerList->list.array[idx]->mac_LogicalChannelConfig) != ROK)
+/******************************************************************
+ *
+ * @brief Free reconfiguration message
+ *
+ * @details
+ *
+ *    Function : freeRrcReconfig
+ *
+ *    Functionality: Free reconfiguration message
+ *
+ * @params[in] RRC Reconfiguration message
+ * @return void
+ *
+ * ****************************************************************/
+void freeRrcReconfig(RRCReconfiguration_t *rrcReconfig)
+{
+   if(rrcReconfig->criticalExtensions.choice.rrcReconfiguration)
    {
-      DU_LOG("\nERROR  -->  F1AP : BuildMacLCConfig failed");
-      return RFAILED;
+      if(rrcReconfig->criticalExtensions.choice.rrcReconfiguration->radioBearerConfig)
+      {
+         freeRadioBearerConfig(rrcReconfig->criticalExtensions.choice.rrcReconfiguration->radioBearerConfig);
+         CU_FREE(rrcReconfig->criticalExtensions.choice.rrcReconfiguration->radioBearerConfig, sizeof(RadioBearerConfig_t));
+      }
+      if(rrcReconfig->criticalExtensions.choice.rrcReconfiguration->measConfig)
+      {
+         freeMeasConfig(rrcReconfig->criticalExtensions.choice.rrcReconfiguration->measConfig);
+         CU_FREE(rrcReconfig->criticalExtensions.choice.rrcReconfiguration->measConfig, sizeof(MeasConfigRrc_t));
+      }
+      if(rrcReconfig->criticalExtensions.choice.rrcReconfiguration->nonCriticalExtension)
+      {
+         freeRrcReconfigNonCriticalExt(rrcReconfig->criticalExtensions.choice.rrcReconfiguration->nonCriticalExtension);
+         CU_FREE(rrcReconfig->criticalExtensions.choice.rrcReconfiguration->nonCriticalExtension, sizeof(struct RRCReconfiguration_v1530_IEs));
+      }
+      CU_FREE(rrcReconfig->criticalExtensions.choice.rrcReconfiguration, sizeof(RRCReconfiguration_IEs_t));
    }
-
-   return ROK;
 }
 
-/*******************************************************************
+/******************************************************************
  *
- * @brief Free memory allocated for CellGroupConfig 
+ * @brief Fill SRB To Add Mod list
  *
  * @details
  *
- *    Function : FreeMemCellGrpCfg
- *
- *    Functionality: Deallocating memory of CellGroupConfig
+ *    Function : fillSrbToAddModList
  *
- * @params[in] pointer to CellGroupConfigRrc_t
+ *    Functionality: fill SRB to Add Mod list
  *
+ * @params[in] UE control block
+ *             SRB to Add/Mod list
  * @return ROK     - success
  *         RFAILED - failure
  *
- ******************************************************************/
-uint8_t FreeMemCellGrpCfg(CellGroupConfigRrc_t *cellGrpCfg)
+ * ****************************************************************/
+uint8_t fillSrbToAddModList(CuUeCb *ueCb, SRB_ToAddModList_t *srbToAddList, bool updateAllRbCfg)
 {
-   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 srbIdx, srbDbIdx, elementCnt = 0;
 
-   rlcBearerList = cellGrpCfg->rlc_BearerToAddModList;
-   if(rlcBearerList)
+   if(updateAllRbCfg)
+      elementCnt = ueCb->numSrb;
+   else
    {
-      if(rlcBearerList->list.array)
+      for(srbDbIdx=0; srbDbIdx < ueCb->numSrb; srbDbIdx++)
       {
-        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)
-                 {
-                    CU_FREE(rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength, sizeof(SN_FieldLengthAM_t));
-                    CU_FREE(rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength, sizeof(SN_FieldLengthAM_t)); 
-                    CU_FREE(rlcConfig->choice.am, sizeof(struct RLC_Config__am));
-                 }     
-                 CU_FREE(rlcConfig, sizeof(struct RLC_Config));
-              }
-              CU_FREE(rlcBearerList->list.array[idx]->servedRadioBearer, sizeof(struct RLC_BearerConfig__servedRadioBearer));
-              if(macLcConfig)
-              {
-                 if(macLcConfig->ul_SpecificParameters)
-                 {
-                    CU_FREE(macLcConfig->ul_SpecificParameters->schedulingRequestID,   sizeof(SchedulingRequestId_t));
-                    CU_FREE(macLcConfig->ul_SpecificParameters->logicalChannelGroup,   sizeof(long));
-                    CU_FREE(macLcConfig->ul_SpecificParameters, sizeof(struct LogicalChannelConfig__ul_SpecificParameters));
-                 }
-                 CU_FREE(rlcBearerList->list.array[idx]->mac_LogicalChannelConfig, sizeof(struct LogicalChannelConfig));
-              }
-              CU_FREE(rlcBearerList->list.array[idx], sizeof(struct RLC_BearerConfig));
-           }   
-        }
-        CU_FREE(rlcBearerList->list.array, rlcBearerList->list.size);
+         if(ueCb->srbList[srbDbIdx].cfgSentToUe == false)
+            elementCnt++;
       }
-      CU_FREE(cellGrpCfg->rlc_BearerToAddModList, sizeof(struct CellGroupConfigRrc__rlc_BearerToAddModList));
    }
 
-   macCellGrpCfg = cellGrpCfg->mac_CellGroupConfig;
-   if(macCellGrpCfg)
+   if(!elementCnt)
    {
-      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])
-                 {
-                    CU_FREE(schReqList->list.array[idx]->sr_ProhibitTimer, sizeof(long));
-                    CU_FREE(schReqList->list.array[idx], sizeof(struct SchedulingRequestToAddMod));
-                 }
-              }
-              CU_FREE(schReqList->list.array, schReqList->list.size);
-           }
-           CU_FREE(schedulingRequestConfig->schedulingRequestToAddModList,\
-                 sizeof(struct SchedulingRequestConfig__schedulingRequestToAddModList));    }
-           CU_FREE(macCellGrpCfg->schedulingRequestConfig, sizeof(struct SchedulingRequestConfig));
-      }
-      if(macCellGrpCfg->bsr_Config)
-      {
-        CU_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++)
-              {
-                 CU_FREE(tagList->list.array[idx], sizeof(struct TAG));
-              }
-              CU_FREE(tagList->list.array, tagList->list.size);
-           }
-           CU_FREE(tagConfig->tag_ToAddModList, sizeof(struct TAG_Config__tag_ToAddModList));
-        }
-        CU_FREE(tagConfig, sizeof(struct TAG_Config));
-      }
-
-      phrConfig = macCellGrpCfg->phr_Config;
-      if(phrConfig)
-      {
-        CU_FREE(phrConfig->choice.setup, sizeof(struct PHR_Config));
-        CU_FREE(phrConfig, sizeof(struct MAC_CellGroupConfig__phr_Config));
-      }
-
-      CU_FREE(macCellGrpCfg, sizeof(MAC_CellGroupConfig_t));
+      DU_LOG("INFO  --> F1AP : No SRB available to add or modify");
+      return ROK;
    }
 
-   phyCellGrpCfg = cellGrpCfg->physicalCellGroupConfig;
-   if(phyCellGrpCfg)
+   srbToAddList->list.count = elementCnt;
+   srbToAddList->list.size = srbToAddList->list.count * sizeof(SRB_ToAddMod_t *);
+
+   CU_ALLOC(srbToAddList->list.array, srbToAddList->list.size);
+   if(!srbToAddList->list.array)
    {
-      CU_FREE(phyCellGrpCfg->p_NR_FR1, sizeof(long));
-      CU_FREE(phyCellGrpCfg, sizeof(PhysicalCellGroupConfig_t));
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for SRB to AddMod list array in fillSrbToAddModList");
+      return RFAILED;
    }
 
-   spCellCfg = cellGrpCfg->spCellConfig;
-   if(spCellCfg)
+   srbIdx = 0;
+   for(srbDbIdx = 0; srbDbIdx < ueCb->numSrb; srbDbIdx++)
    {
-      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)
-                             {
-                                CU_FREE(pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH,sizeof(long));
-                                CU_FREE(pdschCfg->choice.setup, sizeof( struct PDSCH_ServingCellConfig));
-                             }
-                             CU_FREE(srvCellCfg->pdsch_ServingCellConfig, sizeof(struct
-                                      ServingCellConfig__pdsch_ServingCellConfig));
-                          }
-                          FreeinitialUplinkBWP(srvCellCfg->uplinkConfig);
-                          CU_FREE(srvCellCfg->uplinkConfig, sizeof(UplinkConfig_t));   
-                       }
-                       CU_FREE(srvCellCfg->defaultDownlinkBWP_Id, sizeof(long));
-                    }
-                    CU_FREE(srvCellCfg->firstActiveDownlinkBWP_Id, sizeof(long));
-                 }
-                 if(dlBwp->pdcch_Config)
-                 {
-                    if(dlBwp->pdsch_Config)
-                    {
-                       FreeBWPDlDedPdschCfg(dlBwp);
-                       CU_FREE(dlBwp->pdsch_Config, sizeof(struct BWP_DownlinkDedicated__pdsch_Config));
-                    }
-                    FreeBWPDlDedPdcchCfg(dlBwp);
-                    CU_FREE(dlBwp->pdcch_Config, sizeof(struct BWP_DownlinkDedicated__pdcch_Config));
-                 }
-                 CU_FREE(srvCellCfg->initialDownlinkBWP, sizeof(BWP_DownlinkDedicated_t));
-              }
-              CU_FREE(spCellCfg->spCellConfigDedicated, sizeof(ServingCellConfig_t));
-           }
-           CU_FREE(spCellCfg->rlmInSyncOutOfSyncThreshold, sizeof(long));
-        }
-        CU_FREE(spCellCfg->servCellIndex, sizeof(long));
+      if(!updateAllRbCfg && ueCb->srbList[srbDbIdx].cfgSentToUe)
+         continue;
+
+      CU_ALLOC(srbToAddList->list.array[srbIdx], sizeof(SRB_ToAddMod_t));
+      if(!srbToAddList->list.array[srbIdx])
+      {
+         DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for SRB to AddMod list element in fillSrbToAddModList");
+         return RFAILED;
       }
-      CU_FREE(spCellCfg,sizeof(SpCellConfig_t));
+
+      srbToAddList->list.array[srbIdx]->srb_Identity = ueCb->srbList[srbDbIdx].srbId;
+
+      /* Reestablish PDCP */
+      CU_ALLOC(srbToAddList->list.array[srbIdx]->reestablishPDCP, sizeof(long));
+      if(!srbToAddList->list.array[srbIdx]->reestablishPDCP)
+      {
+         DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for reestablish PDCP IE in fillSrbToAddModList");
+         return RFAILED;
+      }
+      *(srbToAddList->list.array[srbIdx]->reestablishPDCP) = SRB_ToAddMod__reestablishPDCP_true;
+
+      /* PDCP configuration */
+      CU_ALLOC(srbToAddList->list.array[srbIdx]->pdcp_Config, sizeof(PDCP_Config_t));
+      if(!srbToAddList->list.array[srbIdx]->pdcp_Config)
+      {
+         DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for PDCP config IE in fillSrbToAddModList");
+         return RFAILED;
+      }
+
+      /* Reordering timer */
+      CU_ALLOC(srbToAddList->list.array[srbIdx]->pdcp_Config->t_Reordering, sizeof(long));
+      if(!srbToAddList->list.array[srbIdx]->pdcp_Config->t_Reordering)
+      {
+         DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for reordering timer in fillSrbToAddModList");
+         return RFAILED;
+      }
+      *(srbToAddList->list.array[srbIdx]->pdcp_Config->t_Reordering) = PDCP_Config__t_Reordering_ms40;
+      
+      srbIdx++;
    }
    return ROK;
 }
 
-/*******************************************************************
+/******************************************************************
  *
- * @brief Fills CellGroupConfig 
+ * @biief Fill DRBeTo Add Mod list
  *
  * @details
  *
- *    Function : fillCellGrpCfg
- *
- *    Functionality: Fills CellGroupConfig
+ *    Function : fillDrbToAddModList
  *
- * @params[in] pointer to CellGroupConfigRrc_t
+ *    Functionality: fill DRB to Add Mod list
  *
+ * @params[in] UE control block
+ *             DRB to Add/Mod list
  * @return ROK     - success
  *         RFAILED - failure
  *
- ******************************************************************/
-
-uint8_t fillCellGrpCfg(CellGroupConfig_t *cellGrp)
+ * ****************************************************************/
+uint8_t fillDrbToAddModList(CuUeCb *ueCb, DRB_ToAddModList_t *drbToAddList, bool updateAllRbCfg)
 {
-   uint8_t               ret = RFAILED;
-   CellGroupConfigRrc_t  cellGrpCfg;
-   asn_enc_rval_t        encRetVal;
+   uint8_t drbIdx, drbDbIdx, elementCnt = 0;
 
-   while(true)
+   if(updateAllRbCfg)
+      elementCnt = ueCb->numDrb;
+   else
    {
-      cellGrpCfg.cellGroupId = CELL_GRP_ID;
+      for(drbDbIdx=0; drbDbIdx < ueCb->numDrb; drbDbIdx++)
+      {     
+         if(ueCb->drbList[drbDbIdx].cfgSentToUe == false)
+            elementCnt++;
+      }     
+   }
 
-      cellGrpCfg.rlc_BearerToAddModList = NULLP;
-      CU_ALLOC(cellGrpCfg.rlc_BearerToAddModList, sizeof(struct CellGroupConfigRrc__rlc_BearerToAddModList));
-      if(!cellGrpCfg.rlc_BearerToAddModList)
-      {
-         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in CellGrpConfig");
-         break;
-      }
-      if(BuildRlcBearerToAddModList(cellGrpCfg.rlc_BearerToAddModList) != ROK)
+   if(!elementCnt)
+   {
+      DU_LOG("INFO  --> F1AP : No DRB available to add or modify");
+      return ROK;
+   }
+   
+
+   drbToAddList->list.count = elementCnt;
+   drbToAddList->list.size = drbToAddList->list.count * sizeof(DRB_ToAddMod_t *);
+
+   CU_ALLOC(drbToAddList->list.array, drbToAddList->list.size);
+   if(!drbToAddList->list.array)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for DRB to AddMod list array in fillDrbToAddModList");
+      return RFAILED;
+   }
+
+   drbIdx = 0;
+   for(drbDbIdx=0; drbDbIdx < ueCb->numDrb; drbDbIdx++)
+   {
+      if(!updateAllRbCfg && ueCb->drbList[drbDbIdx].cfgSentToUe)
+         continue;
+
+      CU_ALLOC(drbToAddList->list.array[drbIdx], sizeof(DRB_ToAddMod_t));
+      if(!drbToAddList->list.array[drbIdx])
       {
-         DU_LOG("\nERROR  -->  F1AP : fillCellGrpCfg failed");
-         break;
+         DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for DRB to AddMod list elements in fillDrbToAddModList");
+         return RFAILED;
       }
 
-      cellGrpCfg.rlc_BearerToReleaseList = NULLP;
-      cellGrpCfg.mac_CellGroupConfig = NULLP;
-      CU_ALLOC(cellGrpCfg.mac_CellGroupConfig, sizeof(MAC_CellGroupConfig_t));
-      if(!cellGrpCfg.mac_CellGroupConfig)
+      /* DRB Id */
+      drbToAddList->list.array[drbIdx]->drb_Identity = ueCb->drbList[drbDbIdx].drbId;
+
+      /* PDCP Config */
+      CU_ALLOC(drbToAddList->list.array[drbIdx]->pdcp_Config, sizeof(PDCP_Config_t));
+      if(!drbToAddList->list.array[drbIdx]->pdcp_Config)
       {
-         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in fillCellGrpCfg");
-         break;
+         DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for PDCP config IE in fillDrbToAddModList");
+         return RFAILED;
       }
-      if(BuildMacCellGrpCfg(cellGrpCfg.mac_CellGroupConfig) != ROK)
+
+      /* PDCP Config -> DRB */
+      CU_ALLOC(drbToAddList->list.array[drbIdx]->pdcp_Config->drb, sizeof(struct PDCP_Config__drb));
+      if(!drbToAddList->list.array[drbIdx]->pdcp_Config->drb)
       {
-         DU_LOG("\nERROR  -->  F1AP : BuildMacCellGrpCfg failed");
-         break;
+         DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for PDCP config drb in fillDrbToAddModList");
+         return RFAILED;
       }
 
-      cellGrpCfg.physicalCellGroupConfig = NULLP;
-      CU_ALLOC(cellGrpCfg.physicalCellGroupConfig, sizeof(PhysicalCellGroupConfig_t));
-      if(!cellGrpCfg.physicalCellGroupConfig)
+      /* DRB -> Discard Timer */
+      CU_ALLOC(drbToAddList->list.array[drbIdx]->pdcp_Config->drb->discardTimer, sizeof(long));
+      if(!drbToAddList->list.array[drbIdx]->pdcp_Config->drb->discardTimer)
       {
-         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildDuToCuRrcContainer");
-         break;
+         DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for DRB discard timer in fillDrbToAddModList");
+         return RFAILED;
       }
-      if(BuildPhyCellGrpCfg(cellGrpCfg.physicalCellGroupConfig) != ROK)
+      *(drbToAddList->list.array[drbIdx]->pdcp_Config->drb->discardTimer) = PDCP_Config__drb__discardTimer_infinity;
+
+      /* UL PDCP SN length */
+      CU_ALLOC(drbToAddList->list.array[drbIdx]->pdcp_Config->drb->pdcp_SN_SizeUL, sizeof(long));
+      if(!drbToAddList->list.array[drbIdx]->pdcp_Config->drb->pdcp_SN_SizeUL)
       {
-         DU_LOG("\nERROR  -->  F1AP : BuildPhyCellGrpCfg failed");
-         break;
+         DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for UL SN length in fillDrbToAddModList");
+         return RFAILED;
       }
+      *(drbToAddList->list.array[drbIdx]->pdcp_Config->drb->pdcp_SN_SizeUL) = PDCP_Config__drb__pdcp_SN_SizeUL_len12bits;
 
-      cellGrpCfg.spCellConfig = NULLP;
-      CU_ALLOC(cellGrpCfg.spCellConfig, sizeof(SpCellConfig_t));
-      if(!cellGrpCfg.spCellConfig)
+      /* DL PDCP SN length */
+      CU_ALLOC(drbToAddList->list.array[drbIdx]->pdcp_Config->drb->pdcp_SN_SizeDL, sizeof(long));
+      if(!drbToAddList->list.array[drbIdx]->pdcp_Config->drb->pdcp_SN_SizeDL)
       {
-         DU_LOG("\nERROR  -->  F1AP : Memory allocation failure in BuildDuToCuRrcContainer");
-         break;
+         DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for DL SN length in fillDrbToAddModList");
+         return RFAILED;
       }
-      if(BuildSpCellCfg(cellGrpCfg.spCellConfig) != ROK)
+      *(drbToAddList->list.array[drbIdx]->pdcp_Config->drb->pdcp_SN_SizeDL) = PDCP_Config__drb__pdcp_SN_SizeDL_len12bits;
+
+      /* Header Compression */
+      drbToAddList->list.array[drbIdx]->pdcp_Config->drb->headerCompression.present = PDCP_Config__drb__headerCompression_PR_notUsed;
+       drbToAddList->list.array[drbIdx]->pdcp_Config->drb->headerCompression.choice.notUsed = NULLP;
+
+      /* Reordering timer */
+      CU_ALLOC(drbToAddList->list.array[drbIdx]->pdcp_Config->t_Reordering, sizeof(long));
+      if(!drbToAddList->list.array[drbIdx]->pdcp_Config->t_Reordering)
       {
-         DU_LOG("\nERROR  -->  F1AP : BuildSpCellCfg failed");
-         break;
+         DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for reordering timer in fillDrbToAddModList");
+         return RFAILED;
       }
+      *(drbToAddList->list.array[drbIdx]->pdcp_Config->t_Reordering) = PDCP_Config__t_Reordering_ms40;
 
-      cellGrpCfg.sCellToAddModList = NULLP;
-      cellGrpCfg.sCellToReleaseList = NULLP;
-      cellGrpCfg.ext1 = NULLP;
+      drbIdx++;
+   }
 
-      /* encode cellGrpCfg into duToCuRrcContainer */
-      xer_fprint(stdout, &asn_DEF_CellGroupConfigRrc, &cellGrpCfg);
-      cmMemset((uint8_t *)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)
+   return ROK;
+}
+
+/******************************************************************
+ *
+ * @brief Fill Radio bearer configuration
+ *
+ * @details
+ *
+ *    Function : fillRadioBearerConfig
+ *
+ *    Functionality: Fill Radio bearer configuration
+ *
+ * @params[in] UE control block
+ *             Radio bearer config pointer
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillRadioBearerConfig(CuUeCb *ueCb, RadioBearerConfig_t *radioBearerConfig, bool updateAllRbCfg)
+{
+   /* SRB To Add/Mod List */
+   CU_ALLOC(radioBearerConfig->srb_ToAddModList, sizeof(SRB_ToAddModList_t));
+   if(!radioBearerConfig->srb_ToAddModList)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for SRB to AddMod List in fillRadioBearerConfig");
+      return RFAILED;
+   }
+   if(fillSrbToAddModList(ueCb, radioBearerConfig->srb_ToAddModList, updateAllRbCfg) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP: failed to fill SRB to AddMod List");
+      return RFAILED;
+   }
+
+   /* DRB To Add/Mod List */
+   CU_ALLOC(radioBearerConfig->drb_ToAddModList, sizeof(DRB_ToAddModList_t));
+   if(!radioBearerConfig->drb_ToAddModList)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for DRB to AddMod List in fillRadioBearerConfig");
+      return RFAILED;
+    }
+   if(fillDrbToAddModList(ueCb, radioBearerConfig->drb_ToAddModList, updateAllRbCfg) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP: failed to fill DRB to AddMod List ");
+      return RFAILED;
+   }
+
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Fill measurement object to add/mod list
+ *
+ * @details
+ *
+ *    Function : fillMeasObjToAddModList
+ *
+ *    Functionality: Fill measurement object to add/mod list
+ *
+ * @params[in] Measurement object to add/mod list
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillMeasObjToAddModList(MeasObjectToAddModList_t *measObjList)
+{
+   uint8_t elementCnt, objIdx;
+   MeasObjectNR_t *measObject;
+
+   elementCnt = 1;
+   measObjList->list.count = elementCnt;
+   measObjList->list.size = measObjList->list.count * sizeof(MeasObjectToAddMod_t *);
+
+   CU_ALLOC(measObjList->list.array, measObjList->list.size);
+   if(!measObjList->list.array)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for measurement object list's array");
+      return RFAILED;
+   }
+
+   for(objIdx = 0; objIdx < measObjList->list.size; objIdx++)
+   {
+      CU_ALLOC(measObjList->list.array[objIdx], sizeof(MeasObjectToAddMod_t));
+      if(!measObjList->list.array[objIdx])
       {
-         DU_LOG( "\nERROR  -->  F1AP : Could not encode DuToCuRrcContainer (at %s)\n",\
-               encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
-         break;
+         DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for measurement object list's array element");
+         return RFAILED;
       }
-      else
+   }
+
+   objIdx = 0;
+   measObjList->list.array[objIdx]->measObjectId = 1;
+   measObjList->list.array[objIdx]->measObject.present = MeasObjectToAddMod__measObject_PR_measObjectNR;
+   CU_ALLOC(measObjList->list.array[objIdx]->measObject.choice.measObjectNR, sizeof(MeasObjectNR_t));
+   if(!measObjList->list.array[objIdx]->measObject.choice.measObjectNR)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for mesurement object NR");
+      return RFAILED;
+   }
+
+   measObject = measObjList->list.array[objIdx]->measObject.choice.measObjectNR;
+
+   /* SSB frequency */
+   CU_ALLOC(measObject->ssbFrequency, sizeof(ARFCN_ValueNR_t));
+   if(!measObject->ssbFrequency)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for SSB frequency in fillMeasObjToAddModList"); 
+      return RFAILED;
+   }
+   *(measObject->ssbFrequency) = 620736; /* Value picked from reference PCAP logs */
+
+   /* Subcarrier spacing */
+   CU_ALLOC(measObject->ssbSubcarrierSpacing, sizeof(SubcarrierSpacing_t));
+   if(!measObject->ssbSubcarrierSpacing)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for SSB subcarrier spacing in fillMeasObjToAddModList");
+      return RFAILED;
+   }
+   *(measObject->ssbSubcarrierSpacing) = SubcarrierSpacing_kHz15;
+
+   /* SMTC1 */
+   CU_ALLOC(measObject->smtc1 , sizeof(SSB_MTC_t));
+   if(!measObject->smtc1)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for SMTC1 in fillMeasObjToAddModList");
+      return RFAILED;
+   }
+   measObject->smtc1->duration = SSB_MTC__duration_sf1;
+   measObject->smtc1->periodicityAndOffset.present = SSB_MTC__periodicityAndOffset_PR_sf20;
+   measObject->smtc1->periodicityAndOffset.choice.sf20 = 0;
+
+   /* Absoulute threshold SSB consolidation */
+   CU_ALLOC(measObject->absThreshSS_BlocksConsolidation, sizeof(ThresholdNR_t));
+   if(!measObject->absThreshSS_BlocksConsolidation)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for absolute threshold SSB consolidation in fillMeasObjToAddModList");
+      return RFAILED;
+   }
+
+   /* RSRP threshold */
+   CU_ALLOC(measObject->absThreshSS_BlocksConsolidation->thresholdRSRP, sizeof(RSRP_Range_t));
+   if(!measObject->absThreshSS_BlocksConsolidation->thresholdRSRP)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for threshold RSRP in fillMeasObjToAddModList");
+      return RFAILED;
+   }
+   *(measObject->absThreshSS_BlocksConsolidation->thresholdRSRP) = 1;
+
+   /* RSRQ threshold */
+   CU_ALLOC(measObject->absThreshSS_BlocksConsolidation->thresholdRSRQ, sizeof(RSRQ_Range_t));
+   if(!measObject->absThreshSS_BlocksConsolidation->thresholdRSRQ)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for threshold RSRQ in fillMeasObjToAddModList");
+      return RFAILED;
+   }
+   *(measObject->absThreshSS_BlocksConsolidation->thresholdRSRQ) = 1;
+
+   /* SINR threshold */
+   CU_ALLOC(measObject->absThreshSS_BlocksConsolidation->thresholdSINR, sizeof(SINR_Range_t));
+   if(!measObject->absThreshSS_BlocksConsolidation->thresholdSINR)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for threshold SINR in fillMeasObjToAddModList");
+      return RFAILED;
+   }
+   *(measObject->absThreshSS_BlocksConsolidation->thresholdSINR) = 1;
+
+   /* Number of SSBs to average */
+   CU_ALLOC(measObject->nrofSS_BlocksToAverage, sizeof(long));
+   if(!measObject->nrofSS_BlocksToAverage)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for number of SSB to average in fillMeasObjToAddModList");
+      return RFAILED;
+   }
+   *(measObject->nrofSS_BlocksToAverage) = 2;
+
+   /* Quantity Config index */
+   measObject->quantityConfigIndex = 1;
+
+   /* Offset MO */
+   /* RSRP offset for SSB */
+   CU_ALLOC(measObject->offsetMO.rsrpOffsetSSB, sizeof(Q_OffsetRange_t));
+   if(!measObject->offsetMO.rsrpOffsetSSB)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for SSB RSRP offset in fillMeasObjToAddModList");
+      return RFAILED;
+   }
+   *(measObject->offsetMO.rsrpOffsetSSB) = Q_OffsetRange_dB0;
+
+   /* RSRQ offset for SSB */
+   CU_ALLOC(measObject->offsetMO.rsrqOffsetSSB, sizeof(Q_OffsetRange_t));
+   if(!measObject->offsetMO.rsrpOffsetSSB)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for SSB RSRQ offset in fillMeasObjToAddModList");
+      return RFAILED;
+   }
+   *(measObject->offsetMO.rsrqOffsetSSB) = Q_OffsetRange_dB0;
+
+   /* SINR offset for SSB */
+   CU_ALLOC(measObject->offsetMO.sinrOffsetSSB, sizeof(Q_OffsetRange_t));
+   if(!measObject->offsetMO.sinrOffsetSSB)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for SSB SINR offset in fillMeasObjToAddModList");
+      return RFAILED;
+   }
+   *(measObject->offsetMO.sinrOffsetSSB) = Q_OffsetRange_dB0;
+
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Fill Report configuration to Add/mod list
+ *
+ * @details
+ *
+ *    Function : fillReportCfgToAddModList
+ *
+ *    Functionality: Fill Report configuration to Add/mod list
+ *
+ * @params[in] Report Config To Add/Mod List
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillReportCfgToAddModList(ReportConfigToAddModList_t *reportCfgList)
+{
+   uint8_t elementCnt;
+   uint8_t reportCfgIdx;
+   ReportConfigToAddMod_t *reportCfg;
+   ReportConfigNR_t *reportCfgNr;
+   EventTriggerConfig_t *eventTriggCfg;
+
+   elementCnt = 1;
+   reportCfgList->list.count = elementCnt;
+   reportCfgList->list.size = reportCfgList->list.count * sizeof(ReportConfigToAddMod_t *);
+
+   CU_ALLOC(reportCfgList->list.array, reportCfgList->list.size);
+   if(!reportCfgList->list.array)
+   {
+      DU_LOG("\nERROR  -->  F1AP: fillReportCfgToAddModList() :Memory allocation failed for report config list's array");
+      return RFAILED;
+   }
+
+   for(reportCfgIdx=0; reportCfgIdx < reportCfgList->list.count; reportCfgIdx++)
+   {
+      CU_ALLOC(reportCfgList->list.array[reportCfgIdx], sizeof(ReportConfigToAddMod_t));
+      if(!reportCfgList->list.array[reportCfgIdx])
       {
-         DU_LOG("\nDEBUG  -->  F1AP : Created APER encodedbuffer for DuToCuRrcContainer\n");
-         for(int i=0; i< encBufSize; i++)
-         {
-            DU_LOG("%x",encBuf[i]);
-         }
+         DU_LOG("\nERROR  -->  F1AP: fillReportCfgToAddModList(): Memory allocation failed for report config list's array element");
+         return RFAILED;
       }
+   }
+
+   reportCfgIdx = 0;
+   reportCfg = reportCfgList->list.array[reportCfgIdx];
+   reportCfg->reportConfigId = 1;
+   reportCfg->reportConfig.present = ReportConfigToAddMod__reportConfig_PR_reportConfigNR;
+
+   /* Report Configuration for NR */
+   CU_ALLOC(reportCfg->reportConfig.choice.reportConfigNR, sizeof(ReportConfigNR_t));
+   if(!reportCfg->reportConfig.choice.reportConfigNR)
+   {
+      DU_LOG("\nERROR  -->  F1AP: fillReportCfgToAddModList(): Memory allocation failed for report config NR");
+      return RFAILED;
+   }
+   reportCfgNr = reportCfg->reportConfig.choice.reportConfigNR;
+
+   /* Report Type */
+   reportCfgNr->reportType.present = ReportConfigNR__reportType_PR_eventTriggered;
+   CU_ALLOC(reportCfgNr->reportType.choice.eventTriggered, sizeof(EventTriggerConfig_t));
+   if(!reportCfgNr->reportType.choice.eventTriggered)
+   {
+      DU_LOG("\nERROR  -->  F1AP: fillReportCfgToAddModList(): Memory allocation failed for event triggerred");
+      return RFAILED;
+   }
+   eventTriggCfg = reportCfgNr->reportType.choice.eventTriggered;
+
+   /* Event 3 */
+   eventTriggCfg->eventId.present = EventTriggerConfig__eventId_PR_eventA3;
+   CU_ALLOC(eventTriggCfg->eventId.choice.eventA3, sizeof(struct EventTriggerConfig__eventId__eventA3));
+   if(!eventTriggCfg->eventId.choice.eventA3)
+   {
+      DU_LOG("\nERROR  -->  F1AP: fillReportCfgToAddModList(): Memory allocation failed for event A3");
+      return RFAILED;
+   }
+
+   eventTriggCfg->eventId.choice.eventA3->a3_Offset.present = MeasTriggerQuantityOffset_PR_rsrp;
+   eventTriggCfg->eventId.choice.eventA3->a3_Offset.choice.rsrp = 6; /* i.e. 3.0db . From Reference pcap log */
+   eventTriggCfg->eventId.choice.eventA3->reportOnLeave = false;
+   eventTriggCfg->eventId.choice.eventA3->hysteresis = 0;
+   eventTriggCfg->eventId.choice.eventA3->timeToTrigger = TimeToTrigger_ms40;
+   eventTriggCfg->eventId.choice.eventA3->useWhiteCellList = false;
+
+   /* Reference Signal Type */
+   eventTriggCfg->rsType = NR_RS_Type_ssb;
+
+   /* Report Interval */
+   eventTriggCfg->reportInterval = ReportInterval_ms1024;
+
+   /* Report Amount */
+   eventTriggCfg->reportAmount = EventTriggerConfig__reportAmount_r8;
 
-      cellGrp->size = encBufSize;
-      CU_ALLOC(cellGrp->buf, cellGrp->size);
-      if(!cellGrp->buf)
-      {
-         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in BuildDuToCuRrcContainer");
-         break;
-      }
-      memcpy(cellGrp->buf, encBuf, cellGrp->size);
-      ret = ROK;
-      break;
+   /* Report Quantity cell */
+   eventTriggCfg->reportQuantityCell.rsrp = true;
+   eventTriggCfg->reportQuantityCell.rsrq = false;
+   eventTriggCfg->reportQuantityCell.sinr = false;
+
+   /* Maximum reported cells */
+   eventTriggCfg->maxReportCells = 3;
+
+   /* Report qunatity RS Indexes */
+   CU_ALLOC(eventTriggCfg->reportQuantityRS_Indexes, sizeof(MeasReportQuantity_t));
+   if(!eventTriggCfg->reportQuantityRS_Indexes)
+   {
+      DU_LOG("\nERROR  -->  F1AP: fillReportCfgToAddModList(): Memory allocation failed for report qunatity RS indexes");
+      return RFAILED;
    }
-   FreeMemCellGrpCfg(&cellGrpCfg);
-   return ret;
+   eventTriggCfg->reportQuantityRS_Indexes->rsrp = true;
+   eventTriggCfg->reportQuantityRS_Indexes->rsrq = false;
+   eventTriggCfg->reportQuantityRS_Indexes->sinr = false;
+
+   /* Maximum number of RS indexes to report */
+   CU_ALLOC(eventTriggCfg->maxNrofRS_IndexesToReport, sizeof(long));
+   if(!eventTriggCfg->maxNrofRS_IndexesToReport)
+   {
+      DU_LOG("\nERROR  -->  F1AP: fillReportCfgToAddModList(): Memory allocation failed for max number of RS indexes to report");
+      return RFAILED;
+   }
+   *(eventTriggCfg->maxNrofRS_IndexesToReport) = 1;
+
+   /* Include Beam measurement */
+   eventTriggCfg->includeBeamMeasurements = false;
+
+   return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Free UE Capability RAT container
- *
+ * @brief Fill measurement Id to add/mod list
  * @details
  *
- *    Function : freeUeCapRatCont
+ *    Function : fillMeasIdToAddModList
  *
- *    Functionality:
- *       Free UE Capability RAT conatiner
+ *    Functionality: Fill measurement Id to add/mod list
  *
- * @params[in]
+ * @params[in] Measurement Id to add/mod list
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-void freeUeCapRatCont(UE_NR_Capability_t *ueNrCap)
+uint8_t fillMeasIdToAddModList(MeasIdToAddModList_t *measIdList)
 {
-   uint8_t idx;
-   FeatureSets_t *featureSets;
+   uint8_t elementCnt;
+   uint8_t measIdIdx;
 
-   if(ueNrCap->rf_Parameters.supportedBandListNR.list.array)
+   elementCnt = 1;
+   measIdList->list.count = elementCnt;
+   measIdList->list.size = measIdList->list.count *sizeof(MeasIdToAddMod_t *);
+
+   CU_ALLOC(measIdList->list.array, measIdList->list.size);
+   if(!measIdList->list.array)
    {
-      for(idx = 0; idx < ueNrCap->rf_Parameters.supportedBandListNR.list.count; idx++)
-      {
-         if(ueNrCap->rf_Parameters.supportedBandListNR.list.array[idx])
-            CU_FREE(ueNrCap->rf_Parameters.supportedBandListNR.list.array[idx], sizeof(struct BandNR));
-      }
-      CU_FREE(ueNrCap->rf_Parameters.supportedBandListNR.list.array, ueNrCap->rf_Parameters.supportedBandListNR.list.size);
+      return RFAILED;
    }
 
-   if(ueNrCap->featureSets)
+   for(measIdIdx=0; measIdIdx < measIdList->list.count; measIdIdx++)
    {
-      featureSets = ueNrCap->featureSets;
-      if(featureSets->featureSetsDownlinkPerCC)
+      CU_ALLOC(measIdList->list.array[measIdIdx], sizeof(MeasIdToAddMod_t));
+      if(!measIdList->list.array[measIdIdx])
       {
-         if(featureSets->featureSetsDownlinkPerCC->list.array)
-         {
-            for(idx = 0; idx < featureSets->featureSetsDownlinkPerCC->list.count; idx++)
-            {
-                  if(featureSets->featureSetsDownlinkPerCC->list.array[idx]->supportedModulationOrderDL)
-                     CU_FREE(featureSets->featureSetsDownlinkPerCC->list.array[idx]->supportedModulationOrderDL, \
-                        sizeof(ModulationOrder_t));
-                  CU_FREE(featureSets->featureSetsDownlinkPerCC->list.array[idx], sizeof(struct FeatureSetDownlinkPerCC));
-            }
-            CU_FREE(featureSets->featureSetsDownlinkPerCC->list.array, featureSets->featureSetsDownlinkPerCC->list.size);
-         }
-         CU_FREE(featureSets->featureSetsDownlinkPerCC, sizeof(struct FeatureSets__featureSetsDownlinkPerCC));
+         return RFAILED;
       }
 
-      if(featureSets->featureSetsUplinkPerCC)
-      {
-         if(featureSets->featureSetsUplinkPerCC->list.array)
-         {
-            for(idx = 0; idx < featureSets->featureSetsUplinkPerCC->list.count; idx++)
-            {
-               if(featureSets->featureSetsUplinkPerCC->list.array[idx])
-               {
-                  if(featureSets->featureSetsUplinkPerCC->list.array[idx]->supportedModulationOrderUL)
-                     CU_FREE(featureSets->featureSetsUplinkPerCC->list.array[idx]->supportedModulationOrderUL,\
-                         sizeof(ModulationOrder_t));
-                  CU_FREE(featureSets->featureSetsUplinkPerCC->list.array[idx], sizeof(struct FeatureSetUplinkPerCC));
-               }
-            }
-            CU_FREE(featureSets->featureSetsUplinkPerCC->list.array,  featureSets->featureSetsUplinkPerCC->list.size);
-         }
-         CU_FREE(featureSets->featureSetsUplinkPerCC, sizeof(struct FeatureSets__featureSetsUplinkPerCC));
-      }
-      CU_FREE(ueNrCap->featureSets, sizeof(struct FeatureSets));
+      measIdIdx=0;
+      measIdList->list.array[measIdIdx]->measId = 1;
+      measIdList->list.array[measIdIdx]->measObjectId = 1;
+      measIdList->list.array[measIdIdx]->reportConfigId = 1;
    }
+   return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Free UE capability RAT container list
+ * @brief Fill s-measurement configuration
  *
  * @details
  *
- *    Function : freeUeCapRatContList
+ *    Function : fillSMeasConfig
  *
- *    Functionality: Free UE capability RAT container list
+ *    Functionality: Fill s-measurement configuration
  *
- * @params[in] 
+ * @params[in] s-Measurement config
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-void freeUeCapRatContList(UE_CapabilityRAT_ContainerListRRC_t *ueCapablityList)
+uint8_t fillSMeasConfig(struct MeasConfigRrc__s_MeasureConfig *sMeasCfg)
 {
-   uint8_t idx;
-   if(ueCapablityList->list.array)
+   sMeasCfg->present = MeasConfigRrc__s_MeasureConfig_PR_ssb_RSRP;
+   sMeasCfg->choice.ssb_RSRP = 100; /* Value taken from reference PCAP log */
+
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Fill quantity config
+ *
+ * @details
+ *
+ *    Function : fillQunatityConfig
+ *
+ *    Functionality: Fill quantity config
+ *
+ * @params[in] Quantity Config
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillQuantityConfig(QuantityConfig_t *quantityCfg)
+{
+   uint8_t elementCnt = 0;
+   uint8_t quanCfgIdx = 0;
+   QuantityConfigNR_t *quantityCfgNr;
+
+   CU_ALLOC(quantityCfg->quantityConfigNR_List, sizeof(struct QuantityConfig__quantityConfigNR_List));
+   if(!quantityCfg->quantityConfigNR_List)
    {
-      for(idx = 0; idx < ueCapablityList->list.count; idx++)
+      return RFAILED;
+   }
+
+   elementCnt = 1;
+   quantityCfg->quantityConfigNR_List->list.count = elementCnt;
+   quantityCfg->quantityConfigNR_List->list.size = elementCnt * sizeof(QuantityConfigNR_t *);
+
+   CU_ALLOC(quantityCfg->quantityConfigNR_List->list.array, quantityCfg->quantityConfigNR_List->list.size);
+   if(!quantityCfg->quantityConfigNR_List->list.array)
+   {
+      return RFAILED;
+   }
+
+   for(quanCfgIdx = 0; quanCfgIdx < quantityCfg->quantityConfigNR_List->list.count; quanCfgIdx++)
+   {
+      CU_ALLOC(quantityCfg->quantityConfigNR_List->list.array[quanCfgIdx], sizeof(QuantityConfigNR_t));
+      if(!quantityCfg->quantityConfigNR_List->list.array[quanCfgIdx])
       {
-         if(ueCapablityList->list.array[idx])
-            CU_FREE(ueCapablityList->list.array[idx], sizeof(UE_CapabilityRAT_Container_t));
+         return RFAILED;
       }
-      CU_FREE(ueCapablityList->list.array, ueCapablityList->list.size);
    }
+
+   quanCfgIdx = 0;
+   quantityCfgNr = quantityCfg->quantityConfigNR_List->list.array[quanCfgIdx];
+
+   /* Quantity Config of Reference signal */
+   CU_ALLOC(quantityCfgNr->quantityConfigCell.ssb_FilterConfig.filterCoefficientRSRP, sizeof(FilterCoefficient_t));
+   if(!quantityCfgNr->quantityConfigCell.ssb_FilterConfig.filterCoefficientRSRP)
+   {
+      return RFAILED;
+   }
+   *(quantityCfgNr->quantityConfigCell.ssb_FilterConfig.filterCoefficientRSRP) = FilterCoefficient_fc4;
+
+   CU_ALLOC(quantityCfgNr->quantityConfigCell.ssb_FilterConfig.filterCoefficientRSRQ, sizeof(FilterCoefficient_t));
+   if(!quantityCfgNr->quantityConfigCell.ssb_FilterConfig.filterCoefficientRSRQ)
+   {
+      return RFAILED;
+   }
+   *(quantityCfgNr->quantityConfigCell.ssb_FilterConfig.filterCoefficientRSRQ) = FilterCoefficient_fc4;
+
+   CU_ALLOC(quantityCfgNr->quantityConfigCell.ssb_FilterConfig.filterCoefficientRS_SINR, sizeof(FilterCoefficient_t));
+   if(!quantityCfgNr->quantityConfigCell.ssb_FilterConfig.filterCoefficientRS_SINR)
+   {
+      return RFAILED;
+   }
+   *(quantityCfgNr->quantityConfigCell.ssb_FilterConfig.filterCoefficientRS_SINR) = FilterCoefficient_fc4;
+
+   /* Quantity Config RS index */
+   CU_ALLOC(quantityCfgNr->quantityConfigRS_Index, sizeof(QuantityConfigRS_t));
+   if(!quantityCfgNr->quantityConfigRS_Index)
+   {
+      return RFAILED;
+   }
+
+   CU_ALLOC(quantityCfgNr->quantityConfigRS_Index->ssb_FilterConfig.filterCoefficientRSRP, sizeof(FilterCoefficient_t));
+   if(!quantityCfgNr->quantityConfigRS_Index->ssb_FilterConfig.filterCoefficientRSRP)
+   {
+      return RFAILED;
+   }
+   *(quantityCfgNr->quantityConfigRS_Index->ssb_FilterConfig.filterCoefficientRSRP) = FilterCoefficient_fc4;
+
+   CU_ALLOC(quantityCfgNr->quantityConfigRS_Index->ssb_FilterConfig.filterCoefficientRSRQ, sizeof(FilterCoefficient_t));
+   if(!quantityCfgNr->quantityConfigRS_Index->ssb_FilterConfig.filterCoefficientRSRQ)
+   {
+      return RFAILED;
+   }
+   *(quantityCfgNr->quantityConfigRS_Index->ssb_FilterConfig.filterCoefficientRSRQ) = FilterCoefficient_fc4;
+
+   CU_ALLOC(quantityCfgNr->quantityConfigRS_Index->ssb_FilterConfig.filterCoefficientRS_SINR, sizeof(FilterCoefficient_t));
+   if(!quantityCfgNr->quantityConfigRS_Index->ssb_FilterConfig.filterCoefficientRS_SINR)
+   {
+      return RFAILED;
+   }
+   *(quantityCfgNr->quantityConfigRS_Index->ssb_FilterConfig.filterCoefficientRS_SINR) = FilterCoefficient_fc4;
+
+   return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Fill feature sets
+ * @brief Fill measurement configuration
  *
  * @details
  *
- *    Function : fillFeatureSets
+ *    Function : fillMeasConfig
  *
- *    Functionality: Fill feature sets
+ *    Functionality: Fill measurement configuration
  *
- * @params[in] 
+ * @params[in] Measurement config
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t fillFeatureSets(FeatureSets_t *featureSets)
+uint8_t fillMeasConfig(MeasConfigRrc_t *measConfig)
 {
-   uint8_t idx, elementCnt;
+   /* Measurement object to add/mod list */
+   CU_ALLOC(measConfig->measObjectToAddModList, sizeof(MeasObjectToAddModList_t));
+   if(!measConfig->measObjectToAddModList)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for measurement object list in fillMeasConfig");
+      return RFAILED;
+   }
+   if(fillMeasObjToAddModList(measConfig->measObjectToAddModList) != ROK)
+   {   
+      DU_LOG("\nERROR  -->  F1AP: Failure in fillMeasObjToAddModList");
+      return RFAILED;
+   }
 
-   featureSets->featureSetsDownlink = NULLP;
-   CU_ALLOC(featureSets->featureSetsDownlinkPerCC, sizeof(struct FeatureSets__featureSetsDownlinkPerCC));
-   if(!featureSets->featureSetsDownlinkPerCC)
+   /* Report Config To add/mod list */
+   CU_ALLOC(measConfig->reportConfigToAddModList, sizeof(ReportConfigToAddModList_t));
+   if(!measConfig->reportConfigToAddModList)
    {
-      DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillFeatureSets");
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for report config list in  fillMeasConfig");
+      return RFAILED;
+   }
+   if(fillReportCfgToAddModList(measConfig->reportConfigToAddModList) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Failure in fillReportCfgToAddModList");
       return RFAILED;
    }
 
-   elementCnt = 1;
-   featureSets->featureSetsDownlinkPerCC->list.count = elementCnt;
-   featureSets->featureSetsDownlinkPerCC->list.size = elementCnt * sizeof(struct FeatureSetDownlinkPerCC *);
-   CU_ALLOC(featureSets->featureSetsDownlinkPerCC->list.array, featureSets->featureSetsDownlinkPerCC->list.size);
-   if(!featureSets->featureSetsDownlinkPerCC->list.array)
+   /* Measurement Id to add/mod list */
+   CU_ALLOC(measConfig->measIdToAddModList, sizeof(MeasIdToAddModList_t));
+   if(!measConfig->measIdToAddModList)
    {
-      DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillFeatureSets");
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for measuerment id list in  fillMeasConfig");
+      return RFAILED;
+   }
+   if(fillMeasIdToAddModList(measConfig->measIdToAddModList) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Failure in fillMeasIdToAddModList");
       return RFAILED;
    }
 
-   for(idx = 0; idx < elementCnt; idx++)
+   /* S-Measurement config */
+   CU_ALLOC(measConfig->s_MeasureConfig, sizeof(struct MeasConfigRrc__s_MeasureConfig));
+   if(!measConfig->s_MeasureConfig)
    {
-      CU_ALLOC(featureSets->featureSetsDownlinkPerCC->list.array[idx], sizeof(struct FeatureSetDownlinkPerCC));
-      if(!featureSets->featureSetsDownlinkPerCC->list.array[idx])
-      {
-        DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillFeatureSets");
-        return RFAILED;
-      }
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for s measuerment config in  fillMeasConfig");
+      return RFAILED;
+   }
+   if(fillSMeasConfig(measConfig->s_MeasureConfig) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Failure in fillSMeasConfig");
+      return RFAILED;
    }
 
-   idx = 0;
-   featureSets->featureSetsDownlinkPerCC->list.array[idx]->supportedSubcarrierSpacingDL = SubcarrierSpacing_kHz15;
-   featureSets->featureSetsDownlinkPerCC->list.array[idx]->supportedBandwidthDL.present = SupportedBandwidth_PR_fr1;
-   featureSets->featureSetsDownlinkPerCC->list.array[idx]->supportedBandwidthDL.choice.fr1 = SupportedBandwidth__fr1_mhz20;
-   featureSets->featureSetsDownlinkPerCC->list.array[idx]->channelBW_90mhz = NULLP;
-   featureSets->featureSetsDownlinkPerCC->list.array[idx]->maxNumberMIMO_LayersPDSCH = NULLP;
+   /* Qunatity Config */
+   CU_ALLOC(measConfig->quantityConfig, sizeof(QuantityConfig_t));
+   if(!measConfig->quantityConfig)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Memory allocation failed for quantity config in  fillMeasConfig");
+      return RFAILED;
+   }
+   if(fillQuantityConfig(measConfig->quantityConfig) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP: Failure in fillQuantityConfig");
+      return RFAILED;
+   }
 
-   CU_ALLOC(featureSets->featureSetsDownlinkPerCC->list.array[idx]->supportedModulationOrderDL, sizeof(ModulationOrder_t));
-   if(!featureSets->featureSetsDownlinkPerCC->list.array[idx]->supportedModulationOrderDL)
+return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Fill RRC reconfiguration non-critical extension IE
+ *
+ * @details
+ *
+ *    Function : fillRrcReconfigNonCriticalExt
+ *
+ *    Functionality: Fill RRC reconfiguration non-critical extension
+ *
+ * @params[in] RRC Reconfig Non-critical extension
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillRrcReconfigNonCriticalExt(CuUeCb *ueCb, RRCReconfiguration_v1530_IEs_t *rrcRecfg, bool updateAllRbCfg)
+{
+   CU_ALLOC(rrcRecfg->masterCellGroup, sizeof(OCTET_STRING_t));
+   if(!rrcRecfg->masterCellGroup)
    {
-      DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillFeatureSets");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in fillRrcReconfigNonCriticalExt");
       return RFAILED;
    }
-   *(featureSets->featureSetsDownlinkPerCC->list.array[idx]->supportedModulationOrderDL) = ModulationOrder_qam64;
 
-   featureSets->featureSetsUplink = NULLP;
-   CU_ALLOC(featureSets->featureSetsUplinkPerCC, sizeof(struct FeatureSets__featureSetsUplinkPerCC));
-   if(!featureSets->featureSetsUplinkPerCC)
+   rrcRecfg->masterCellGroup->size = ueCb->f1apMsgDb.duToCuContainer.size;
+   CU_ALLOC(rrcRecfg->masterCellGroup->buf, rrcRecfg->masterCellGroup->size);
+   if(!rrcRecfg->masterCellGroup->buf)
+   {     
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in fillRrcReconfigNonCriticalExt");
+      return RFAILED;
+   }     
+   memcpy(rrcRecfg->masterCellGroup->buf, ueCb->f1apMsgDb.duToCuContainer.buf, rrcRecfg->masterCellGroup->size);
+
+#if 0
+   /* Use below code if masterCEllGroup is to be filled explicitly at CU rather than copying from DUToCURRCContainer 
+    * received from DU */
+   if(fillCellGrpCfg(ueCb, rrcRecfg->masterCellGroup, updateAllRbCfg) != ROK)
    {
-      DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillFeatureSets");
+      DU_LOG("\nERROR  -->  F1AP : Failed to fill CellGroupCfg in fillRrcReconfigNonCriticalExt");
+      return RFAILED;
+   }
+#endif
+
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Fill RRC reconfiguration structure
+ *
+ * @details
+ *
+ *    Function : fillRrcReconfig
+ *
+ *    Functionality: Fill RRC reconfiguration
+ *
+ * @params[in] UE Cb
+ *             RRC reconfiguration structure
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillRrcReconfig(CuUeCb *ueCb, RRCReconfiguration_t *rrcReconfig, bool updateAllRbCfg)
+{
+   memset(rrcReconfig, 0, sizeof(RRCReconfiguration_t));
+
+   rrcReconfig->rrc_TransactionIdentifier = 1;
+   rrcReconfig->criticalExtensions.present = RRCReconfiguration__criticalExtensions_PR_rrcReconfiguration;
+
+   CU_ALLOC(rrcReconfig->criticalExtensions.choice.rrcReconfiguration, sizeof(RRCReconfiguration_IEs_t)); 
+   if(!rrcReconfig->criticalExtensions.choice.rrcReconfiguration)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memormy allocation failed for RRC reconfiguration IE in fillRrcReconfig");
+      return RFAILED;
+   }
+
+   /* Radio Bearer Configuration */
+   CU_ALLOC(rrcReconfig->criticalExtensions.choice.rrcReconfiguration->radioBearerConfig, sizeof(RadioBearerConfig_t));
+   if(!rrcReconfig->criticalExtensions.choice.rrcReconfiguration->radioBearerConfig)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memormy allocation failed for radio bearer config in fillRrcReconfig");
+      return RFAILED;
+   }
+   if(fillRadioBearerConfig(ueCb, rrcReconfig->criticalExtensions.choice.rrcReconfiguration->radioBearerConfig, updateAllRbCfg) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Failed to fill radio bearer config in fillRrcReconfig");
       return RFAILED;
    }
 
-   elementCnt = 1;
-   featureSets->featureSetsUplinkPerCC->list.count = elementCnt;
-   featureSets->featureSetsUplinkPerCC->list.size = elementCnt * sizeof(struct FeatureSetUplinkPerCC *);
-   CU_ALLOC(featureSets->featureSetsUplinkPerCC->list.array, featureSets->featureSetsUplinkPerCC->list.size);
-   if(!featureSets->featureSetsUplinkPerCC->list.array)
+   /* Measurement Configuration */
+   CU_ALLOC(rrcReconfig->criticalExtensions.choice.rrcReconfiguration->measConfig, sizeof(MeasConfigRrc_t));
+   if(!rrcReconfig->criticalExtensions.choice.rrcReconfiguration->measConfig)
    {
-      DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillFeatureSets");
+      DU_LOG("\nERROR  -->  F1AP : Memormy allocation failed for Measurement config IE in fillRrcReconfig");
       return RFAILED;
    }
-
-   for(idx = 0; idx < elementCnt; idx++)
+   if(fillMeasConfig(rrcReconfig->criticalExtensions.choice.rrcReconfiguration->measConfig) != ROK)
    {
-      CU_ALLOC(featureSets->featureSetsUplinkPerCC->list.array[idx], sizeof(struct FeatureSetUplinkPerCC));
-      if(!featureSets->featureSetsUplinkPerCC->list.array[idx])
-      {
-         DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillFeatureSets");
-         return RFAILED;
-      }
+      DU_LOG("\nERROR  -->  F1AP : Failed to fill measurement config in fillRrcReconfig");
+      return RFAILED;
    }
 
-   idx = 0;
-   featureSets->featureSetsUplinkPerCC->list.array[idx]->supportedSubcarrierSpacingUL = SubcarrierSpacing_kHz15;
-   featureSets->featureSetsUplinkPerCC->list.array[idx]->supportedBandwidthUL.present = SupportedBandwidth_PR_fr1;
-   featureSets->featureSetsUplinkPerCC->list.array[idx]->supportedBandwidthUL.choice.fr1 = SupportedBandwidth__fr1_mhz20;
-   featureSets->featureSetsUplinkPerCC->list.array[idx]->channelBW_90mhz = NULLP;
-   featureSets->featureSetsUplinkPerCC->list.array[idx]->mimo_CB_PUSCH = NULLP;
-   featureSets->featureSetsUplinkPerCC->list.array[idx]->maxNumberMIMO_LayersNonCB_PUSCH = NULLP;
-
-   CU_ALLOC(featureSets->featureSetsUplinkPerCC->list.array[idx]->supportedModulationOrderUL, sizeof(ModulationOrder_t));
-   if(!featureSets->featureSetsUplinkPerCC->list.array[idx]->supportedModulationOrderUL)
+   /* Non Critical extension */
+   CU_ALLOC(rrcReconfig->criticalExtensions.choice.rrcReconfiguration->nonCriticalExtension, sizeof(struct RRCReconfiguration_v1530_IEs));
+   if(!rrcReconfig->criticalExtensions.choice.rrcReconfiguration->nonCriticalExtension)
    {
-      DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillFeatureSets");
+      DU_LOG("\nERROR  -->  F1AP : Memormy allocation failed for non critical extension IE in fillRrcReconfig");
+      return RFAILED;
+   }
+   if(fillRrcReconfigNonCriticalExt(ueCb, rrcReconfig->criticalExtensions.choice.rrcReconfiguration->nonCriticalExtension, updateAllRbCfg) != ROK)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Failed to fill non critical extension in fillRrcReconfig");
       return RFAILED;
    }
-   *(featureSets->featureSetsUplinkPerCC->list.array[idx]->supportedModulationOrderUL) = ModulationOrder_qam16;
-
    return ROK;
 }
 
 /*******************************************************************
  *
- * @brief Fill UE capability RAT container
+ * @brief Fill RRC reconfiguration Octet string
  *
  * @details
  *
- *    Function : fillUeCapRatCont 
+ *    Function : fillRrcReconfigBuf
  *
- *    Functionality: Fill UE capability RAT container
+ *    Functionality: Fill RRC reconfiguration octet string
  *
- * @params[in] UE Capability RAT container buffer 
+ * @params[in] OCTET_STRING_t buffer
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t fillUeCapRatCont(OCTET_STRING_t *ueCapRatContBuf)
+uint8_t fillRrcReconfigBuf(CuUeCb *ueCb, OCTET_STRING_t  *rrcReconfigBuf, bool updateAllRbCfg)
 {
-   uint8_t             ret = ROK;
-   uint8_t             idx, elementCnt;
-   asn_enc_rval_t      encRetVal;
-   UE_NR_Capability_t  ueNrCap;
+   uint8_t          ret = RFAILED;
+   asn_enc_rval_t   encRetVal;
+   RRCReconfiguration_t rrcRecfg, *rrcReconfig = NULLP;
+   rrcReconfig = &rrcRecfg;
 
    while(true)
    {
-      ueNrCap.accessStratumRelease = AccessStratumRelease_rel15;
+      if(fillRrcReconfig(ueCb, rrcReconfig, updateAllRbCfg) != ROK)
+      {
+         DU_LOG( "\nERROR  -->  F1AP : Failed to fill RRC Reconfiguration in fillRrcReconfigBuf");
+         break; 
+      }
 
-      /* Filling PDCP parameters */
-      ueNrCap.pdcp_Parameters.supportedROHC_Profiles.profile0x0000 = false;
-      ueNrCap.pdcp_Parameters.supportedROHC_Profiles.profile0x0001 = false;
-      ueNrCap.pdcp_Parameters.supportedROHC_Profiles.profile0x0002 = false;
-      ueNrCap.pdcp_Parameters.supportedROHC_Profiles.profile0x0003 = false;
-      ueNrCap.pdcp_Parameters.supportedROHC_Profiles.profile0x0004 = false;
-      ueNrCap.pdcp_Parameters.supportedROHC_Profiles.profile0x0006 = false;
-      ueNrCap.pdcp_Parameters.supportedROHC_Profiles.profile0x0101 = false;
-      ueNrCap.pdcp_Parameters.supportedROHC_Profiles.profile0x0102 = false;
-      ueNrCap.pdcp_Parameters.supportedROHC_Profiles.profile0x0103 = false;
-      ueNrCap.pdcp_Parameters.supportedROHC_Profiles.profile0x0104 = false;
-      ueNrCap.pdcp_Parameters.maxNumberROHC_ContextSessions = PDCP_Parameters__maxNumberROHC_ContextSessions_cs2;
-      ueNrCap.pdcp_Parameters.uplinkOnlyROHC_Profiles = NULLP;
-      ueNrCap.pdcp_Parameters.continueROHC_Context = NULLP;
-      ueNrCap.pdcp_Parameters.outOfOrderDelivery = NULLP;
-      ueNrCap.pdcp_Parameters.shortSN = NULLP;
-      ueNrCap.pdcp_Parameters.pdcp_DuplicationSRB = NULLP;
-      ueNrCap.pdcp_Parameters.pdcp_DuplicationMCG_OrSCG_DRB = NULLP;
+      /* Encode RRC Reconfiguration */
+      xer_fprint(stdout, &asn_DEF_RRCReconfiguration, rrcReconfig);
+      cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
+      encBufSize = 0;
+      encRetVal = aper_encode(&asn_DEF_RRCReconfiguration, 0, rrcReconfig, PrepFinalEncBuf, encBuf);
 
-      ueNrCap.rlc_Parameters = NULLP;
-      ueNrCap.mac_Parameters = NULLP;
+      /* Encode results */
+      if(encRetVal.encoded == ENCODE_FAIL)
+      {     
+         DU_LOG( "\nERROR  -->  F1AP : Could not encode RRC Reconfiguration (at %s)\n",\
+               encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+         break;
+      }     
+      else  
+      {     
+         DU_LOG("\nDEBUG  -->  F1AP : Created APER encoded buffer for RRC Reconfiguration\n");
+         for(int i=0; i< encBufSize; i++)
+         {
+            DU_LOG("%x",encBuf[i]);
+         }
+      }     
 
-      /* Filling PHY parameters */
-      ueNrCap.phy_Parameters.phy_ParametersCommon = NULLP;
-      ueNrCap.phy_Parameters.phy_ParametersXDD_Diff = NULLP;
-      ueNrCap.phy_Parameters.phy_ParametersFRX_Diff = NULLP;
-      ueNrCap.phy_Parameters.phy_ParametersFR1 = NULLP;
-      ueNrCap.phy_Parameters.phy_ParametersFR2 = NULLP;
+      rrcReconfigBuf->size = encBufSize;
+      CU_ALLOC(rrcReconfigBuf->buf, rrcReconfigBuf->size);
+      if(!rrcReconfigBuf->buf)
+      {     
+         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in fillRrcReconfigBuf");
+         break;
+      }     
+      memcpy(rrcReconfigBuf->buf, encBuf, rrcReconfigBuf->size);
+      ret = ROK;
+      break;
+   }
 
-      /* Filling RF parameters */
-      elementCnt = 1;
-      ueNrCap.rf_Parameters.supportedBandListNR.list.count = elementCnt;
-      ueNrCap.rf_Parameters.supportedBandListNR.list.size = elementCnt * sizeof(struct BandNR *);
-      CU_ALLOC(ueNrCap.rf_Parameters.supportedBandListNR.list.array, ueNrCap.rf_Parameters.supportedBandListNR.list.size);
-      if(!ueNrCap.rf_Parameters.supportedBandListNR.list.array)
+   freeRrcReconfig(rrcReconfig);
+   return ret;
+}
+
+/*******************************************************************
+ *
+ * @brief Fill HO preparation information Octet string
+ *
+ * @details
+ *
+ *    Function : fillHOPreparationInfoBuf
+ *
+ *    Functionality: Fill HO preparation information Octet string
+ *
+ * @params[in] HandoverPreparationInformation_t buffer
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillHOPreparationInfoBuf(CuUeCb *ueCb, HandoverPreparationInformation_t *hoPrepInfoBuf)
+{
+   uint8_t          ret = RFAILED;
+   asn_enc_rval_t   encRetVal;
+   HandoverPreparationInformationRrc_t hoPrepInfo;
+   HandoverPreparationInformationRrc_IEs_t *hoPrepInfoIe;
+
+   while(true)
+   {
+   
+      hoPrepInfo.criticalExtensions.present = HandoverPreparationInformationRrc__criticalExtensions_PR_c1;
+      CU_ALLOC(hoPrepInfo.criticalExtensions.choice.c1, sizeof(struct HandoverPreparationInformationRrc__criticalExtensions__c1));
+      if(!hoPrepInfo.criticalExtensions.choice.c1)
       {
-         DU_LOG("\nERROR  --> F1AP : Memory allocation failed in fillUeCapRatCont");
-         ret = RFAILED;
+         DU_LOG( "\nERROR  -->  F1AP : Failed to allocate memory for c1 in fillHOPreparationInfo");
          break;
       }
-
-      for(idx = 0; idx < elementCnt; idx++)
+      hoPrepInfo.criticalExtensions.choice.c1->present = \
+         HandoverPreparationInformationRrc__criticalExtensions__c1_PR_handoverPreparationInformation;
+      
+      CU_ALLOC(hoPrepInfo.criticalExtensions.choice.c1->choice.handoverPreparationInformation , \
+         sizeof(HandoverPreparationInformationRrc_IEs_t));
+      if(!hoPrepInfo.criticalExtensions.choice.c1->choice.handoverPreparationInformation)
       {
-         CU_ALLOC(ueNrCap.rf_Parameters.supportedBandListNR.list.array[idx], sizeof(struct BandNR));
-         if(!ueNrCap.rf_Parameters.supportedBandListNR.list.array[idx])
-         {
-            ret = RFAILED;
-            break;
-         }
+         DU_LOG( "\nERROR  -->  F1AP : Failed to allocate memory for handover preparation information IE in fillHOPreparationInfo");
+         break;
       }
-      if(ret == RFAILED)
+      hoPrepInfoIe = hoPrepInfo.criticalExtensions.choice.c1->choice.handoverPreparationInformation;
+   
+      /* Fill UE Capability RAT container list */
+      ret = fillUeCapRatContList(&hoPrepInfoIe->ue_CapabilityRAT_List);
+      if(ret != ROK)
+      {
+         DU_LOG( "\nERROR  -->  F1AP : Failed to fill UE Capability RAT container list");
          break;
-      
-      idx = 0;
-      ueNrCap.rf_Parameters.supportedBandListNR.list.array[idx]->bandNR = 1;
-      ueNrCap.rf_Parameters.supportedBandCombinationList = NULLP;
-      ueNrCap.rf_Parameters.appliedFreqBandListFilter = NULLP;
-
-      ueNrCap.measAndMobParameters = NULLP;
-      ueNrCap.fdd_Add_UE_NR_Capabilities = NULLP;
-      ueNrCap.tdd_Add_UE_NR_Capabilities = NULLP;
-      ueNrCap.fr1_Add_UE_NR_Capabilities = NULLP;
-      ueNrCap.fr2_Add_UE_NR_Capabilities = NULLP;
-      ueNrCap.featureSets = NULLP;
+      }
 
-      CU_ALLOC(ueNrCap.featureSets, sizeof(struct FeatureSets));
-      if(!ueNrCap.featureSets)
+      /* Fill Source config */
+      hoPrepInfoIe->sourceConfig = NULLP;
+      CU_ALLOC(hoPrepInfoIe->sourceConfig, sizeof(AS_Config_t));
+      if(!hoPrepInfoIe->sourceConfig)
       {
-         DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in fillUeCapRatCont");
-        ret = RFAILED;
-        break;
+         DU_LOG( "\nERROR  -->  F1AP : Failed to allocate memory for source config in fillHOPreparationInfo");
+         return RFAILED;
       }
-
-      if(fillFeatureSets(ueNrCap.featureSets) != ROK)
+      ret = fillRrcReconfigBuf(ueCb, &hoPrepInfoIe->sourceConfig->rrcReconfiguration, true); 
+      
+      if(ret != ROK)
       {
-         DU_LOG("\nERROR  -->  fillDLFeatureSets() failed ");
-         ret = RFAILED;
-         break;
+         DU_LOG( "\nERROR  -->  F1AP : Failed to fill Rrc reconfiguration buffer");
+         return RFAILED;
       }
 
-      ueNrCap.featureSetCombinations = NULLP;
-      ueNrCap.lateNonCriticalExtension = NULLP;
-      ueNrCap.nonCriticalExtension = NULLP;
+      hoPrepInfoIe->rrm_Config = NULLP;
+      hoPrepInfoIe->as_Context = NULLP;
+      hoPrepInfoIe->nonCriticalExtension = NULLP;
 
       /* encode UE Capability RAT Container List into duToCuRrcContainer */
-      xer_fprint(stdout, &asn_DEF_UE_NR_Capability, &ueNrCap);
+      xer_fprint(stdout, &asn_DEF_HandoverPreparationInformationRrc, &hoPrepInfo);
       cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
       encBufSize = 0;
-      encRetVal = aper_encode(&asn_DEF_UE_NR_Capability, 0, &ueNrCap, PrepFinalEncBuf, encBuf);
-   
+      encRetVal = aper_encode(&asn_DEF_HandoverPreparationInformationRrc, 0, \
+            &hoPrepInfo, PrepFinalEncBuf, encBuf);
+
       /* Encode results */
       if(encRetVal.encoded == ENCODE_FAIL)
       {
          DU_LOG( "\nERROR  -->  F1AP : Could not encode UE Capability RAT Container (at %s)\n",\
-            encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+               encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
          break;
       }
       else
@@ -6428,177 +8950,146 @@ uint8_t fillUeCapRatCont(OCTET_STRING_t *ueCapRatContBuf)
          }
       }
 
-      ueCapRatContBuf->size = encBufSize;
-      CU_ALLOC(ueCapRatContBuf->buf, ueCapRatContBuf->size);
-      if(!ueCapRatContBuf->buf)
+      hoPrepInfoBuf->size = encBufSize;
+      CU_ALLOC(hoPrepInfoBuf->buf, hoPrepInfoBuf->size);
+      if(!hoPrepInfoBuf->buf)
       {
          DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in fillUeCapabilityContainer");
          break;
       }
-      memcpy(ueCapRatContBuf->buf, encBuf, ueCapRatContBuf->size);
+      memcpy(hoPrepInfoBuf->buf, encBuf, hoPrepInfoBuf->size);
       ret = ROK;
       break;
    }
-   freeUeCapRatCont(&ueNrCap);
-   return ROK;
+   freeHOPreparationInfo(&hoPrepInfo);
+   return ret;
 }
 
 /*******************************************************************
  *
- * @brief Fill UE Capability RAT container list
+ * @brief Fills CuToDuContainer 
  *
  * @details
  *
- *    Function : fillUeCapRatContList
+ *    Function : fillCuToDuContainer
  *
- *    Functionality: Fill UE Capability RAT container list
+ *    Functionality: Fills CuToDuContainer
+ *
+ * @params[in] pointer to CUtoDURRCInformation_t
  *
- * @params[in] UE capability RAT container list buffer
  * @return ROK     - success
  *         RFAILED - failure
  *
- * ****************************************************************/
-uint8_t fillUeCapRatContList(UE_CapabilityRAT_ContainerList_t *ueCapablityListBuf)
+ ******************************************************************/
+
+uint8_t fillCuToDuContainer(CuUeCb *ueCb, CUtoDURRCInformation_t *rrcMsg)
 {
-    uint8_t          ret = RFAILED;
-    uint8_t          idx, elementCnt;
-    asn_enc_rval_t   encRetVal;
-    UE_CapabilityRAT_ContainerListRRC_t  ueCapablityList;
+   uint8_t elementCnt = 0;
+   uint8_t ret = ROK;
+   uint8_t idx;
 
-    while(true)
-    {
-       elementCnt = 1;
-       ueCapablityList.list.count = elementCnt;
-       ueCapablityList.list.size = elementCnt * sizeof(UE_CapabilityRAT_Container_t *);
+   /* UE Capabulity RAT Container List */
+   CU_ALLOC(rrcMsg->uE_CapabilityRAT_ContainerList, sizeof(UE_CapabilityRAT_ContainerList_t));
+   if(!rrcMsg->uE_CapabilityRAT_ContainerList)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation for UE capability RAT container list failed");
+      return RFAILED;
+   }
+   ret = fillUeCapRatContListBuf(rrcMsg->uE_CapabilityRAT_ContainerList);
 
-       CU_ALLOC(ueCapablityList.list.array, ueCapablityList.list.size);
-       if(!ueCapablityList.list.array)
-       {
-          DU_LOG("\nERROR  -->  Memory allocation failed in fillUeCapRatContList");
-          ret = RFAILED;
-          break;
-       }
+   CU_ALLOC(rrcMsg->measConfig, sizeof(MeasConfig_t));
+   if(!rrcMsg->measConfig)
+   {
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation for measurement configuration failed");
+      return RFAILED;
+   }
+   ret = fillMeasTimingConfigBuf(rrcMsg->measConfig);
 
-       for(idx=0; idx<elementCnt; idx++)
-       {
-          CU_ALLOC(ueCapablityList.list.array[idx], sizeof(UE_CapabilityRAT_Container_t));
-          if(ueCapablityList.list.array[idx] == NULLP)
-          {
-             DU_LOG("\nERROR  -->  Memory allocation failed in fillUeCapRatContList");
-             ret = RFAILED;
-             break;
-          }
-       }
-       idx = 0;
-       ueCapablityList.list.array[idx]->rat_Type = RAT_Type_nr;
-       ret = fillUeCapRatCont(&ueCapablityList.list.array[idx]->ue_CapabilityRAT_Container);
-
-       /* encode UE Capability RAT Container List into duToCuRrcContainer */
-       xer_fprint(stdout, &asn_DEF_UE_CapabilityRAT_ContainerListRRC, &ueCapablityList);
-       cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
-       encBufSize = 0;
-       encRetVal = aper_encode(&asn_DEF_UE_CapabilityRAT_ContainerListRRC, 0, \
-             &ueCapablityList, PrepFinalEncBuf, encBuf);
-
-       /* Encode results */
-       if(encRetVal.encoded == ENCODE_FAIL)
-       {
-          DU_LOG( "\nERROR  -->  F1AP : Could not encode UE Capability RAT Container (at %s)\n",\
-                encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
-          break;
-       }
-       else
-       {
-          DU_LOG("\nDEBUG  -->  F1AP : Created APER encodedbuffer for UE Capability RAT Container\n");
-          for(int i=0; i< encBufSize; i++)
-          {
-             DU_LOG("%x",encBuf[i]);
-          }
-       }
+   if(ueCb->state == UE_HANDOVER_IN_PROGRESS)
+   {
+      /* IE extensions */
+      CU_ALLOC(rrcMsg->iE_Extensions, sizeof(ProtocolExtensionContainer_4624P16_t));
+      if(rrcMsg->iE_Extensions)
+      {
+         elementCnt = 1;
+         rrcMsg->iE_Extensions->list.count = elementCnt;
+         rrcMsg->iE_Extensions->list.size = elementCnt * sizeof(CUtoDURRCInformation_ExtIEs_t *);
 
-       ueCapablityListBuf->size = encBufSize;
-       CU_ALLOC(ueCapablityListBuf->buf, ueCapablityListBuf->size);
-       if(!ueCapablityListBuf->buf)
-       {
-          DU_LOG("\nERROR  -->  F1AP : Memory allocation failed in fillUeCapabilityContainer");
-          break;
-       }
-       memcpy(ueCapablityListBuf->buf, encBuf, ueCapablityListBuf->size);
-       ret = ROK;
-       break;
-    }
-    freeUeCapRatContList(&ueCapablityList);
-    return ROK;
-}
+         /* Initialize the CUtoDURRCInformation_ExtIEs */
+         CU_ALLOC(rrcMsg->iE_Extensions->list.array, rrcMsg->iE_Extensions->list.size);
+
+         if(rrcMsg->iE_Extensions->list.array == NULLP)
+         {
+            DU_LOG("\nERROR  -->  F1AP : Memory allocation for CUtoDURRCInformation_ExtIEs failed");
+            ret = RFAILED;
+         }
+
+         for(idx=0; idx<elementCnt; idx++)
+         {
+            CU_ALLOC(rrcMsg->iE_Extensions->list.array[idx], sizeof(CUtoDURRCInformation_ExtIEs_t));
+            if(rrcMsg->iE_Extensions->list.array[idx] == NULLP)
+            {
+               DU_LOG("\nERROR  -->  F1AP : Memory allocation for array elements failed");
+               ret = RFAILED;
+            }
+         }
 
+         idx = 0;
+#if 0
+         /* Cell Group Configuration */
+         rrcMsg->iE_Extensions->list.array[idx]->id = ProtocolIE_ID_id_CellGroupConfig;
+         rrcMsg->iE_Extensions->list.array[idx]->criticality = Criticality_ignore; 
+         rrcMsg->iE_Extensions->list.array[idx]->extensionValue.present  =\
+                                                                          CUtoDURRCInformation_ExtIEs__extensionValue_PR_CellGroupConfig;
+         ret = fillCellGrpCfg(ueCb, &rrcMsg->iE_Extensions->list.array[idx]->extensionValue.choice.CellGroupConfig, true);
+         idx++;
+#endif
+         /* Handover Preparation Information */
+         rrcMsg->iE_Extensions->list.array[idx]->id = ProtocolIE_ID_id_HandoverPreparationInformation; 
+         rrcMsg->iE_Extensions->list.array[idx]->criticality = Criticality_ignore;
+         rrcMsg->iE_Extensions->list.array[idx]->extensionValue.present  = \
+                                                                           CUtoDURRCInformation_ExtIEs__extensionValue_PR_HandoverPreparationInformation;
+         ret = fillHOPreparationInfoBuf(ueCb, &rrcMsg->iE_Extensions->list.array[idx]->extensionValue.choice.HandoverPreparationInformation);
+      }
+   }
+   return ret;
+}
 /*******************************************************************
  *
- * @brief Fills CuToDuContainer 
+ * @brief Build the drx cycle  
  *
  * @details
  *
- *    Function : fillCuToDuContainer
+ *    Function : BuildDrxCycle
  *
- *    Functionality: Fills CuToDuContainer
+ *    Functionality: Build drx cycle IE
  *
- * @params[in] pointer to CUtoDURRCInformation_t
+ * @params[in] pointer to DRXCycle_t
  *
  * @return ROK     - success
  *         RFAILED - failure
  *
  ******************************************************************/
-
-uint8_t fillCuToDuContainer(CUtoDURRCInformation_t *rrcMsg)
+uint8_t BuildDrxCycle(DRXCycle_t *drxCycle)
 {
-   uint8_t elementCnt = 0;
-   uint8_t ret = ROK;
-   uint8_t idx, idx2, rrcBufLen;
-
-   CU_ALLOC(rrcMsg->uE_CapabilityRAT_ContainerList, sizeof(UE_CapabilityRAT_ContainerList_t));
-   if(!rrcMsg->uE_CapabilityRAT_ContainerList)
+   drxCycle->longDRXCycleLength = LongDRXCycleLength_ms80;
+   CU_ALLOC(drxCycle->shortDRXCycleLength, sizeof(ShortDRXCycleLength_t));
+   if(!drxCycle->shortDRXCycleLength)
    {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation for CUtoDURRCInformation_ExtIEs failed");
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed for shortDRXCycleLength");
       return RFAILED;
    }
-   ret = fillUeCapRatContList(rrcMsg->uE_CapabilityRAT_ContainerList);
-
-   CU_ALLOC(rrcMsg->iE_Extensions, sizeof(ProtocolExtensionContainer_4624P16_t));
-   if(rrcMsg->iE_Extensions)
+   *(drxCycle->shortDRXCycleLength) = ShortDRXCycleLength_ms4;
+   
+   CU_ALLOC(drxCycle->shortDRXCycleTimer, sizeof(ShortDRXCycleTimer_t));
+   if(!drxCycle->shortDRXCycleTimer)
    {
-      elementCnt = 1;
-      rrcMsg->iE_Extensions->list.count = elementCnt;
-      rrcMsg->iE_Extensions->list.size = elementCnt * sizeof(CUtoDURRCInformation_ExtIEs_t);
-
-      /* Initialize the CUtoDURRCInformation_ExtIEs */
-      CU_ALLOC(rrcMsg->iE_Extensions->list.array, rrcMsg->iE_Extensions->list.size);
-
-      if(rrcMsg->iE_Extensions->list.array == NULLP)
-      {
-         DU_LOG("\nERROR  -->  F1AP : Memory allocation for CUtoDURRCInformation_ExtIEs failed");
-         ret = RFAILED;
-      }
-
-      for(idx=0; idx<elementCnt; idx++)
-      {
-         CU_ALLOC(rrcMsg->iE_Extensions->list.array[idx], sizeof(CUtoDURRCInformation_ExtIEs_t));
-         if(rrcMsg->iE_Extensions->list.array[idx] == NULLP)
-         {
-            DU_LOG("\nERROR  -->  F1AP : Memory allocation for array elements failed");
-            ret = RFAILED;
-         }
-      }
-      idx = 0;
-      /* Filling CellGroupConfig_t IE */
-      rrcMsg->iE_Extensions->list.array[idx]->id = ProtocolIE_ID_id_CellGroupConfig;
-      rrcMsg->iE_Extensions->list.array[idx]->criticality = Criticality_ignore; 
-      rrcMsg->iE_Extensions->list.array[idx]->extensionValue.present  =\
-                                                                       CUtoDURRCInformation_ExtIEs__extensionValue_PR_CellGroupConfig;
-      ret = fillCellGrpCfg(&rrcMsg->iE_Extensions->list.array[idx]->extensionValue.choice.CellGroupConfig);
+      DU_LOG("\nERROR  -->  F1AP : Memory allocation failed for shortDRXCycleTimer");
+      return RFAILED;
    }
-   return ret;
+   *(drxCycle->shortDRXCycleTimer) = 4;
+   return ROK;
 }
-
 /*******************************************************************
  *
  * @brief Free CuToDuContainer 
@@ -6680,20 +9171,19 @@ void FreeCuToDuInfo(CUtoDURRCInformation_t *rrcMsg)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildAndSendUeContextSetupReq(uint32_t duId, CuUeCb *ueCb, uint16_t rrcContLen, uint8_t *rrcContainer)
+uint8_t BuildAndSendUeContextSetupReq(uint32_t duId, CuUeCb *ueCb)
 {
-   uint8_t   Nrcgiret;
-   uint8_t   SplCellListret;
-   uint8_t   SrbSetupret;
+   uint8_t   Nrcgiret, SplCellListret, SrbSetupret;
+   uint8_t   ret= RFAILED, ret1;
    uint8_t   elementCnt;
-   uint8_t   idx, bufLen;
-   uint8_t   idx1;
+   uint8_t   idx, idx1, bufLen, duIdx;
+   uint32_t  spCellId;
+   DuDb      *targetDuDb = NULLP;
    F1AP_PDU_t          *f1apMsg = NULLP;
    UEContextSetupRequest_t *ueSetReq = NULLP;
    asn_enc_rval_t encRetVal;        /* Encoder return value */
    memset(&encRetVal, 0, sizeof(asn_enc_rval_t));
-   uint8_t ret= RFAILED;
-   uint8_t ret1;
+
    while(true)
    {
       DU_LOG("\nINFO  -->  F1AP : Building UE Context Setup Request\n");
@@ -6719,7 +9209,16 @@ uint8_t BuildAndSendUeContextSetupReq(uint32_t duId, CuUeCb *ueCb, uint16_t rrcC
 
       ueSetReq = &f1apMsg->choice.initiatingMessage->value.choice.UEContextSetupRequest;
 
-      elementCnt = 12;
+      if(ueCb->state == UE_HANDOVER_IN_PROGRESS)
+         elementCnt = 7;
+      else
+      {
+#ifdef NR_DRX
+         elementCnt = 12;
+#else
+         elementCnt = 11;
+#endif
+      }
       ueSetReq->protocolIEs.list.count = elementCnt;
       ueSetReq->protocolIEs.list.size = elementCnt * sizeof(UEContextSetupRequestIEs_t *);
 
@@ -6749,19 +9248,32 @@ uint8_t BuildAndSendUeContextSetupReq(uint32_t duId, CuUeCb *ueCb, uint16_t rrcC
       ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_GNB_CU_UE_F1AP_ID;
       ueSetReq->protocolIEs.list.array[idx]->value.choice.GNB_CU_UE_F1AP_ID = ueCb->gnbCuUeF1apId;
 
-      /*GNB DU UE F1AP ID*/
-      idx++;
-      ueSetReq->protocolIEs.list.array[idx]->id        = ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID;
-      ueSetReq->protocolIEs.list.array[idx]->criticality       =       Criticality_ignore;
-      ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_GNB_DU_UE_F1AP_ID;
-      ueSetReq->protocolIEs.list.array[idx]->value.choice.GNB_DU_UE_F1AP_ID = ueCb->gnbDuUeF1apId;
+      if(ueCb->state != UE_HANDOVER_IN_PROGRESS)
+      {
+         /*GNB DU UE F1AP ID*/
+         idx++;
+         ueSetReq->protocolIEs.list.array[idx]->id     = ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID;
+         ueSetReq->protocolIEs.list.array[idx]->criticality    =       Criticality_ignore;
+         ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_GNB_DU_UE_F1AP_ID;
+         ueSetReq->protocolIEs.list.array[idx]->value.choice.GNB_DU_UE_F1AP_ID = ueCb->gnbDuUeF1apId;
+      }
 
       /*Special Cell ID*/
       idx++;
       ueSetReq->protocolIEs.list.array[idx]->id        = ProtocolIE_ID_id_SpCell_ID;
       ueSetReq->protocolIEs.list.array[idx]->criticality       =       Criticality_reject;
       ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_NRCGI;
-      Nrcgiret = BuildNrcgi(&ueSetReq->protocolIEs.list.array[idx]->value.choice.NRCGI, ueCb->cellCb->nrCellId);
+      if(ueCb->state == UE_HANDOVER_IN_PROGRESS)
+      {
+         /* Spec 38.473 Sec 9.2.2.1 : For handover case, this IE shall be considered as target cell. */
+         SEARCH_DU_DB(duIdx, ueCb->hoInfo.targetDuId, targetDuDb);
+         /* Since we are supporting only one cell per DU, accessing 0th index to
+          * get target cell info */
+         spCellId = targetDuDb->cellCb[0].nrCellId;
+      }
+      else
+         spCellId = ueCb->cellCb->nrCellId;
+      Nrcgiret = BuildNrcgi(&ueSetReq->protocolIEs.list.array[idx]->value.choice.NRCGI, spCellId);
       if(Nrcgiret != ROK)
       {
          break;
@@ -6774,32 +9286,50 @@ uint8_t BuildAndSendUeContextSetupReq(uint32_t duId, CuUeCb *ueCb, uint16_t rrcC
       ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_ServCellIndex;
       ueSetReq->protocolIEs.list.array[idx]->value.choice.ServCellIndex = CELL_INDEX;
 
-      /*CellULConfigured*/
-      idx++;
-      ueSetReq->protocolIEs.list.array[idx]->id        = ProtocolIE_ID_id_SpCellULConfigured;
-      ueSetReq->protocolIEs.list.array[idx]->criticality       =       Criticality_ignore;
-      ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_CellULConfigured;
-      ueSetReq->protocolIEs.list.array[idx]->value.choice.CellULConfigured = CellULConfigured_none;
+      if(ueCb->state != UE_HANDOVER_IN_PROGRESS)
+      {
+         /*CellULConfigured*/
+         idx++;
+         ueSetReq->protocolIEs.list.array[idx]->id     = ProtocolIE_ID_id_SpCellULConfigured;
+         ueSetReq->protocolIEs.list.array[idx]->criticality    =       Criticality_ignore;
+         ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_CellULConfigured;
+         ueSetReq->protocolIEs.list.array[idx]->value.choice.CellULConfigured = CellULConfigured_none;
+      }
 
       /*CUtoDURRCContainer*/
       idx++;
       ueSetReq->protocolIEs.list.array[idx]->id        = ProtocolIE_ID_id_CUtoDURRCInformation;
       ueSetReq->protocolIEs.list.array[idx]->criticality       =       Criticality_reject;
       ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_CUtoDURRCInformation;
-      if(fillCuToDuContainer(&ueSetReq->protocolIEs.list.array[idx]->value.choice.CUtoDURRCInformation))
+      if(fillCuToDuContainer(ueCb, &ueSetReq->protocolIEs.list.array[idx]->value.choice.CUtoDURRCInformation))
       {
          break;
       }
 
-      /*Special Cells to be SetupList*/
-      idx++;
-      ueSetReq->protocolIEs.list.array[idx]->id        = ProtocolIE_ID_id_SCell_ToBeSetup_List;
-      ueSetReq->protocolIEs.list.array[idx]->criticality       =       Criticality_ignore;
-      ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_SCell_ToBeSetup_List;
-      SplCellListret = BuildSplCellList(ueCb, &ueSetReq->protocolIEs.list.array[idx]->value.choice.SCell_ToBeSetup_List);
-      if(SplCellListret != ROK)
-      {  
-         break;
+      if(ueCb->state != UE_HANDOVER_IN_PROGRESS)
+      {
+         /*Drx cycle*/
+#ifdef NR_DRX
+         idx++;
+         ueSetReq->protocolIEs.list.array[idx]->id     = ProtocolIE_ID_id_DRXCycle;
+         ueSetReq->protocolIEs.list.array[idx]->criticality    =       Criticality_ignore;
+         ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_DRXCycle;
+         if(BuildDrxCycle(&ueSetReq->protocolIEs.list.array[idx]->value.choice.DRXCycle) != ROK)
+         {
+            DU_LOG("\nERROR  -->  F1AP : Failed to build drx cycle");
+            break;
+         }
+#endif         
+         /*Special Cells to be SetupList*/
+         idx++;
+         ueSetReq->protocolIEs.list.array[idx]->id     = ProtocolIE_ID_id_SCell_ToBeSetup_List;
+         ueSetReq->protocolIEs.list.array[idx]->criticality    =       Criticality_ignore;
+         ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_SCell_ToBeSetup_List;
+         SplCellListret = BuildSplCellList(ueCb, &ueSetReq->protocolIEs.list.array[idx]->value.choice.SCell_ToBeSetup_List);
+         if(SplCellListret != ROK)
+         {  
+            break;
+         }
       }
 
       /*SRBs To Be Setup List*/
@@ -6807,7 +9337,7 @@ uint8_t BuildAndSendUeContextSetupReq(uint32_t duId, CuUeCb *ueCb, uint16_t rrcC
       ueSetReq->protocolIEs.list.array[idx]->id        = ProtocolIE_ID_id_SRBs_ToBeSetup_List;
       ueSetReq->protocolIEs.list.array[idx]->criticality       =       Criticality_reject;
       ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_SRBs_ToBeSetup_List;
-      SrbSetupret = BuildSRBSetup(&ueSetReq->protocolIEs.list.array[idx]->value.choice.SRBs_ToBeSetup_List);
+      SrbSetupret = BuildSRBSetup(ueCb, &ueSetReq->protocolIEs.list.array[idx]->value.choice.SRBs_ToBeSetup_List);
       if(SrbSetupret != ROK)
       {        
          break;
@@ -6818,38 +9348,23 @@ uint8_t BuildAndSendUeContextSetupReq(uint32_t duId, CuUeCb *ueCb, uint16_t rrcC
       ueSetReq->protocolIEs.list.array[idx]->id        = ProtocolIE_ID_id_DRBs_ToBeSetup_List;
       ueSetReq->protocolIEs.list.array[idx]->criticality       =       Criticality_reject;
       ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_DRBs_ToBeSetup_List;
-      ret1 = BuildDRBSetup(&ueSetReq->protocolIEs.list.array[idx]->value.choice.DRBs_ToBeSetup_List);
+      ret1 = BuildDRBSetup(duId, ueCb, &ueSetReq->protocolIEs.list.array[idx]->value.choice.DRBs_ToBeSetup_List);
       if(ret1 != ROK)
       {        
          break;
       }
-      /* RRC Container for security mode */
-      idx++;
-      ueSetReq->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_RRCContainer;
-      ueSetReq->protocolIEs.list.array[idx]->criticality = Criticality_reject;
-      ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_RRCContainer;
 
-      char secModeBuf[9]={0x00, 0x02, 0x22, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00};
-      bufLen =9;
-      ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.size = bufLen;
-      CU_ALLOC(ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf,
-            ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.size);
-      if(!ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf)
+      if(ueCb->state != UE_HANDOVER_IN_PROGRESS)
       {
-         DU_LOG("\nERROR  -->  F1AP : Memory allocation for BuildAndSendUeContextSetupReq failed");
-         break;
+         /* RRC delivery status request */
+         idx++;
+         ueSetReq->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_RRCDeliveryStatusRequest;
+         ueSetReq->protocolIEs.list.array[idx]->criticality = Criticality_ignore;
+         ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_RRCDeliveryStatusRequest;
+         ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCDeliveryStatusRequest = RRCDeliveryStatusRequest_true;
       }
-      memset(ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf, 0, bufLen);
-      memcpy(ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf, secModeBuf, bufLen);
-
-      /* RRC delivery status request */
-      idx++;
-      ueSetReq->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_RRCDeliveryStatusRequest;
-      ueSetReq->protocolIEs.list.array[idx]->criticality = Criticality_ignore;
-      ueSetReq->protocolIEs.list.array[idx]->value.present = UEContextSetupRequestIEs__value_PR_RRCDeliveryStatusRequest;
-      ueSetReq->protocolIEs.list.array[idx]->value.choice.RRCDeliveryStatusRequest = RRCDeliveryStatusRequest_true;
 
-      /* Bit Rate hardcoded as in reference logs */
+      /* GNB-DU UE Aggregate Maximum Bit Rate hardcoded as in reference logs */
       idx++;
       ueSetReq->protocolIEs.list.array[idx]->id = ProtocolIE_ID_id_GNB_DU_UE_AMBR_UL;
       ueSetReq->protocolIEs.list.array[idx]->criticality = Criticality_ignore;
@@ -6961,7 +9476,7 @@ uint8_t extractTeId(DLUPTNLInformation_ToBeSetup_List_t *dlTnlInfo)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t addDrbTunnels(uint8_t teId)
+uint8_t addDrbTunnels(uint32_t duId, uint8_t teId)
 {
    uint8_t ret = ROK;
    EgtpTnlEvt tnlEvt;
@@ -6974,7 +9489,7 @@ uint8_t addDrbTunnels(uint8_t teId)
    tnlEvt.action = EGTP_TNL_MGMT_ADD;
    tnlEvt.lclTeid = teId;
    tnlEvt.remTeid = teId;
-   ret = cuEgtpTnlMgmtReq(tnlEvt);
+   ret = cuEgtpTnlMgmtReq(duId, tnlEvt);
    if(ret != ROK)
    {
       DU_LOG("\nERROR  -->  EGTP : Tunnel management request failed for teId %x", teId);
@@ -6997,9 +9512,9 @@ uint8_t addDrbTunnels(uint8_t teId)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t procDrbSetupList(DRBs_Setup_List_t *drbSetupList)
+uint8_t procDrbSetupList(uint32_t duId, CuUeCb *ueCb, DRBs_Setup_List_t *drbSetupList)
 {
-   uint8_t arrIdx = 0;
+   uint8_t arrIdx = 0, drbIdx = 0;
    uint32_t teId = 0;
    DRBs_Setup_ItemIEs_t *drbItemIe = NULLP;
 
@@ -7014,10 +9529,21 @@ uint8_t procDrbSetupList(DRBs_Setup_List_t *drbSetupList)
             teId  = extractTeId(&drbItemIe->value.choice.DRBs_Setup_Item.dLUPTNLInformation_ToBeSetup_List);
             if(teId > 0)
             {
-              if(addDrbTunnels(teId)== ROK)
-              {
-                DU_LOG("\nDEBUG  --> EGTP: Tunnel Added for TeId %d", teId);
-              }
+               if(addDrbTunnels(duId, teId)== ROK)
+               {
+                  DU_LOG("\nDEBUG  --> EGTP: Tunnel Added for TeId %d", teId);
+               }
+               /* As per Spec 38.473, in UE COntext Response, Tunnel information
+                * are sent to CU for setting up of Tunnels in DL direction.
+                * Search for DRB ID in CU databse */
+               for(drbIdx = 0; drbIdx < ueCb->numDrb; drbIdx++)
+               {
+                  if(ueCb->drbList[drbIdx].drbId == drbItemIe->value.choice.DRBs_Setup_Item.dRBID)
+                  {
+                     fillTeIdString(3, teId, ueCb->drbList[drbIdx].dlUpTnlInfo.teId);
+                     break;
+                  }
+               }
             }
             else
                return RFAILED;
@@ -7044,34 +9570,137 @@ uint8_t procDrbSetupList(DRBs_Setup_List_t *drbSetupList)
  * ****************************************************************/
 uint8_t procUeContextSetupResponse(uint32_t duId, F1AP_PDU_t *f1apMsg)
 {
-   uint8_t idx, duUeF1apId;
-   DuDb *duDb;
-   CuUeCb *ueCb;
+   uint8_t duIdx = 0, idx = 0, ueIdx = 0, rrcMsgType=0;
+   uint8_t duUeF1apId = 0, cuUeF1apId = 0;
+   DuDb *duDb = NULLP;
+   CuUeCb *ueCb = NULLP;
    UEContextSetupResponse_t *ueCtxtSetupRsp = NULLP;
+   OCTET_STRING_t *duToCuRrcContainer;
 
-   duDb = getDuDb(duId);
+   SEARCH_DU_DB(duIdx, duId, duDb);
    ueCtxtSetupRsp = &f1apMsg->choice.successfulOutcome->value.choice.UEContextSetupResponse;
    
    for(idx=0; idx < ueCtxtSetupRsp->protocolIEs.list.count; idx++)
    {
       switch(ueCtxtSetupRsp->protocolIEs.list.array[idx]->id)
       {
+          case ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID:
+             {
+               cuUeF1apId = ueCtxtSetupRsp->protocolIEs.list.array[idx]->value.choice.GNB_CU_UE_F1AP_ID;
+               break;
+             }
           case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
              {
                 duUeF1apId = ueCtxtSetupRsp->protocolIEs.list.array[idx]->value.choice.GNB_DU_UE_F1AP_ID;
                 ueCb = &duDb->ueCb[duUeF1apId-1];
+                /* If ue context is not present in du db, then create UE context
+                 * here. This flow is hit in case of UE handover where UE
+                 * context is created before UE performs RACH on target DU */
+                if(ueCb->gnbDuUeF1apId == 0)
+                {
+                   /* Creating UE context in target DU */
+                   memset(ueCb, 0, sizeof(CuUeCb));
+                   ueCb->cellCb = &duDb->cellCb[0];
+                   ueCb->gnbDuUeF1apId = duUeF1apId;
+                   ueCb->gnbCuUeF1apId = cuUeF1apId;
+                   ueCb->state = UE_HANDOVER_IN_PROGRESS;
+                   ueCb->hoInfo.targetDuId = duId; 
+                   (duDb->numUe)++;
+
+                   ueCb->cellCb->ueCb[ueCb->cellCb->numUe] = ueCb;
+                   ueCb->cellCb->numUe++;
+                }
+                break;
+             }
+          case ProtocolIE_ID_id_C_RNTI:
+             {
+                ueCb->crnti = ueCtxtSetupRsp->protocolIEs.list.array[idx]->value.choice.C_RNTI;
                 break;
              }
           case ProtocolIE_ID_id_DRBs_Setup_List:
              {
                 /* Adding Tunnels for successful DRB */
-                procDrbSetupList(&ueCtxtSetupRsp->protocolIEs.list.array[idx]->value.choice.DRBs_Setup_List);
+                procDrbSetupList(duId, ueCb, &ueCtxtSetupRsp->protocolIEs.list.array[idx]->value.choice.DRBs_Setup_List);
                 break; 
-
              }
+         case ProtocolIE_ID_id_DUtoCURRCInformation:
+             {
+                DU_LOG("\nINFO  -->  Received Du to Cu RRC Information ");
+                duToCuRrcContainer = &ueCtxtSetupRsp->protocolIEs.list.array[idx]->value.choice.\
+                   DUtoCURRCInformation.cellGroupConfig;
+                if((extractDuToCuRrcCont(ueCb, ueCtxtSetupRsp->protocolIEs.list.array[idx]->value.choice.\
+                   DUtoCURRCInformation.cellGroupConfig)) != ROK)
+                {
+                   DU_LOG("\nERROR  -->  F1AP: Failed to extract Du to Cu RRC Information ");
+                   return RFAILED;
+                }
+                break;
+             }
+      }
+   }
+   
+   /* If the UE is in handover, UE context modification request is to be sent to
+    * source DU once UE context setup response is received from target DU */
+   if(ueCb->state == UE_HANDOVER_IN_PROGRESS)
+   {
+      DuDb *srcDuDb = NULLP;
+      CuUeCb *ueCbInSrcDu = NULLP;
+
+      /* Since Source DU Id and DU UE F1AP ID assigned to UE by source DU is not known here, we
+       * need to find Source DU and UE CB in source DU using CU UE F1AP ID */
+      for(duIdx=0; duIdx < cuCb.numDu; duIdx++)
+      {
+         /* UE context setup response is received from target DU. Search all
+          * DUs to find source DU except this target DU Id.*/
+         if(cuCb.duInfo[duIdx].duId != duId)
+         {
+            for(ueIdx = 0; ueIdx < MAX_NUM_UE; ueIdx++)
+            {
+               /* Check following:
+                * 1. CU UE F1AP ID in srcDU->ueCb should be same as cuUeF1apId
+                * received in UE context setup response since CU UE F1AP ID does not
+                * change for UE in handover.
+                * 2. srcDU->UeCb->uestate should be UE_HANDOVER_IN_PROGRESS
+                */
+               if((cuCb.duInfo[duIdx].ueCb[ueIdx].gnbCuUeF1apId == cuUeF1apId) &&
+                     (cuCb.duInfo[duIdx].ueCb[ueIdx].state == UE_HANDOVER_IN_PROGRESS))
+               {
+                  srcDuDb = &cuCb.duInfo[duIdx];
+                  ueCbInSrcDu = &cuCb.duInfo[duIdx].ueCb[ueIdx];
+
+                  /* Store source DU info in the new UE context created in
+                   * tareget DU */
+                  ueCb->hoInfo.sourceDuId = srcDuDb->duId;
+
+                  /* Copy the received container to UeCb */
+                  memcpy(&ueCbInSrcDu->f1apMsgDb.duToCuContainer, duToCuRrcContainer, sizeof(OCTET_STRING_t));
+
+                  if(BuildAndSendUeContextModificationReq(srcDuDb->duId, ueCbInSrcDu, STOP_DATA_TX) != ROK)
+                  {
+                     DU_LOG("\nERROR  ->  F1AP : Failed at BuildAndSendUeContextModificationReq()");
+                     return RFAILED;
+                  }
+                  break;
+               }
+            }
+         }
+         if(srcDuDb && ueCbInSrcDu)
+            break;
+      }
+   }
+   else
+   {
+      ueCb->f1apMsgDb.dlRrcMsgCount++;
+      rrcMsgType = setDlRRCMsgType(ueCb);
+
+      DU_LOG("\nINFO  -->  F1AP: Sending DL RRC MSG for RRC reconfiguration");
+      if(BuildAndSendDLRRCMessageTransfer(duId, ueCb, SRB1, rrcMsgType) != ROK)
+      {
+         DU_LOG("\nINFO  -->  F1AP: Failed to build and send DL RRC MSG for RRC reconfiguration");
+         return RFAILED;
       }
    }
-   ueCb->f1apMsgDb.dlRrcMsgCount++; /* keeping DL RRC Msg Count */
+
    return ROK;
 }
 
@@ -7093,16 +9722,16 @@ uint8_t procUeContextSetupResponse(uint32_t duId, F1AP_PDU_t *f1apMsg)
 
 uint8_t procUlRrcMsg(uint32_t duId, F1AP_PDU_t *f1apMsg)
 {
-   uint8_t idx, ret, srbId, rrcMsgType;
-   uint8_t cuUeF1apId, duUeF1apId;
-   uint8_t *rrcContainer = NULLP;
-   uint16_t rrcContLen;
-   DuDb     *duDb;
-   CuUeCb   *ueCb;
+   uint8_t  idx = 0, ret = ROK, srbId = 0, rrcMsgType = 0, duIdx=0;
+   uint8_t  *rrcContainer = NULLP;
+   uint16_t rrcContLen = 0;
+   uint32_t cuUeF1apId = 0, duUeF1apId = 0;
+   DuDb     *duDb = NULLP;
+   CuUeCb   *ueCb = NULLP;
    ULRRCMessageTransfer_t *ulRrcMsg = NULLP;
 
    ret = ROK;
-   duDb = getDuDb(duId);
+   SEARCH_DU_DB(duIdx, duId, duDb);
    ulRrcMsg = &f1apMsg->choice.initiatingMessage->value.choice.ULRRCMessageTransfer;
 
    for(idx=0; idx < ulRrcMsg->protocolIEs.list.count; idx++)
@@ -7133,6 +9762,34 @@ uint8_t procUlRrcMsg(uint32_t duId, F1AP_PDU_t *f1apMsg)
                   return RFAILED;
                }
                memcpy(rrcContainer, ulRrcMsg->protocolIEs.list.array[idx]->value.choice.RRCContainer.buf, rrcContLen);
+
+               if(duDb->ueCb[duUeF1apId-1].state == UE_HANDOVER_IN_PROGRESS)
+               {
+                  uint8_t ueIdx = 0;
+                  uint8_t srcDuId = duDb->ueCb[duUeF1apId-1].hoInfo.sourceDuId;
+                  DuDb *srcDuDb = NULLP;
+
+                  /* In target DU DB, mark UE as active and delete HO info */
+                  duDb->ueCb[duUeF1apId-1].state = UE_ACTIVE;
+                  memset(&duDb->ueCb[duUeF1apId-1].hoInfo, 0, sizeof(HandoverInfo));
+
+                  /* Release UE context in source DU because the UE is now
+                   * attached to target DU */
+                  SEARCH_DU_DB(duIdx, srcDuId, srcDuDb);
+                  for(ueIdx = 0; ueIdx < srcDuDb->numUe; ueIdx++)
+                  {
+                     if(srcDuDb->ueCb[ueIdx].gnbCuUeF1apId == cuUeF1apId)
+                     {
+                        ret = BuildAndSendUeContextReleaseCommand(srcDuId, srcDuDb->ueCb[ueIdx].gnbCuUeF1apId, srcDuDb->ueCb[ueIdx].gnbDuUeF1apId); 
+                        if(ret != ROK)
+                        {
+                           DU_LOG("\nINFO  -->  F1AP: Failed to build and send UE context release command to source DU Id [%d]", srcDuId);
+                        }
+                        break;
+                     }
+                  }
+                  return ret;
+               }
                break;
             }
 
@@ -7147,37 +9804,30 @@ uint8_t procUlRrcMsg(uint32_t duId, F1AP_PDU_t *f1apMsg)
       ueCb = &duDb->ueCb[duUeF1apId-1];
       ueCb->f1apMsgDb.dlRrcMsgCount++;
       rrcMsgType = setDlRRCMsgType(ueCb);
-      if(rrcMsgType == REGISTRATION_ACCEPT)
+      if(rrcMsgType == RRC_SETUP_COMPLETE)
       {
-         DU_LOG("\nINFO  -->  F1AP: Sending DL RRC MSG for RRC Registration Accept"); 
+         DU_LOG("\nINFO  -->  F1AP: Sending DL RRC MSG for NAS Security Mode Command");
          ret = BuildAndSendDLRRCMessageTransfer(duId, ueCb, srbId, rrcMsgType);
       }
-      if(rrcMsgType == UE_CONTEXT_SETUP_REQ)
+      if(rrcMsgType == NAS_SECURITY_MODE_COMPLETE)
       {
-         DU_LOG("\nINFO  -->  F1AP: Sending Ue Context Setup Req"); 
-         ret = BuildAndSendUeContextSetupReq(duId, ueCb, rrcContLen, rrcContainer);
+         DU_LOG("\nINFO  -->  F1AP: Sending DL RRC MSG for RRC Security Mode Command"); 
+         ret = BuildAndSendDLRRCMessageTransfer(duId, ueCb, srbId, rrcMsgType);
       }
-      if(rrcMsgType == SECURITY_MODE_COMPLETE)
+      else if(rrcMsgType == RRC_SECURITY_MODE_COMPLETE)
       {
-         /* To trigger the DL RRC Msg for RRC Reconfig */
-         ueCb->f1apMsgDb.dlRrcMsgCount++;
-         rrcMsgType = setDlRRCMsgType(ueCb);
-         if(rrcMsgType == RRC_RECONFIG)
-         {
-            DU_LOG("\nINFO  -->  F1AP: Sending DL RRC MSG for RRC Reconfig");
-            BuildAndSendDLRRCMessageTransfer(duId, ueCb, srbId, rrcMsgType);
-         }
+         DU_LOG("\nINFO  -->  F1AP: Sending DL RRC MSG for RRC Registration Accept");
+         BuildAndSendDLRRCMessageTransfer(duId, ueCb, srbId, rrcMsgType);
       }
-      if(rrcMsgType == RRC_RECONFIG_COMPLETE)
+      else if(rrcMsgType == REGISTRATION_COMPLETE)
       {
-         ueCb->state = ACTIVE;
-         ueCb->f1apMsgDb.dlRrcMsgCount++;
-         rrcMsgType = setDlRRCMsgType(ueCb);
-         if(rrcMsgType == UE_CONTEXT_MOD_REQ)
-         {
-            DU_LOG("\nINFO  -->  F1AP: Sending UE Context Modification Request");
-            BuildAndSendUeContextModificationReq(duId, ueCb, MODIFY_UE);
-         }
+         DU_LOG("\nINFO  -->  F1AP: Sending Ue Context Setup Request"); 
+         ret = BuildAndSendUeContextSetupReq(duId, ueCb);
+      }
+      else if(rrcMsgType == RRC_RECONFIG_COMPLETE)
+      {
+         DU_LOG("\nINFO  -->  F1AP: Sending UE Context Modification Request");
+         BuildAndSendUeContextModificationReq(duId, ueCb, RRC_RECONFIG_COMPLETE_IND);
       }
    }
    return ret;
@@ -7391,7 +10041,7 @@ void FreeUlTnlInfoforDrb2(ULUPTNLInformation_ToBeSetup_List_t *ulInfo)
 *         RFAILED - failure
 *
 * ****************************************************************/
-uint8_t deleteEgtpTunnel(uint8_t *buf)
+uint8_t deleteEgtpTunnel(uint32_t duId, uint8_t *buf)
 {
    uint32_t teId = 0;
    EgtpTnlEvt tnlEvt;
@@ -7406,7 +10056,7 @@ uint8_t deleteEgtpTunnel(uint8_t *buf)
    tnlEvt.action = EGTP_TNL_MGMT_DEL;
    tnlEvt.lclTeid = teId;
    tnlEvt.remTeid = teId;
-   if((cuEgtpTnlMgmtReq(tnlEvt)) != ROK)
+   if((cuEgtpTnlMgmtReq(duId, tnlEvt)) != ROK)
    {
       DU_LOG("\nERROR  -->  EGTP : Failed to delete tunnel Id %d", teId);
    }
@@ -7429,7 +10079,7 @@ uint8_t deleteEgtpTunnel(uint8_t *buf)
 *         RFAILED - failure
 *
 * ****************************************************************/
-uint8_t BuildUlTnlInfoforSetupMod(uint8_t ueId, uint8_t drbId, ULUPTNLInformation_ToBeSetup_List_t *ulInfo, uint8_t actionType)
+uint8_t BuildUlTnlInfoforSetupMod(uint32_t duId, uint8_t ueId, uint8_t drbId, TnlInfo *ulTnlInfo, ULUPTNLInformation_ToBeSetup_List_t *ulInfo, uint8_t actionType)
 {
    uint8_t arrIdx;
    uint8_t ulCnt;
@@ -7487,6 +10137,11 @@ uint8_t BuildUlTnlInfoforSetupMod(uint8_t ueId, uint8_t drbId, ULUPTNLInformatio
       transportLayerAddress.buf[3] = 82;
    ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->\
       transportLayerAddress.bits_unused = 0;
+
+   ulTnlInfo->address[0] = ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[0];
+   ulTnlInfo->address[1] = ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[1];
+   ulTnlInfo->address[2] = ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[2];
+   ulTnlInfo->address[3] = ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->transportLayerAddress.buf[3];
    
    /*GTP TEID*/
    ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.size\
@@ -7520,6 +10175,11 @@ uint8_t BuildUlTnlInfoforSetupMod(uint8_t ueId, uint8_t drbId, ULUPTNLInformatio
       ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->\
         gTP_TEID.buf[3] = cuCb.cuCfgParams.egtpParams.currTunnelId++;
    }
+
+   ulTnlInfo->teId[0] = ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[0];
+   ulTnlInfo->teId[1] = ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[1];
+   ulTnlInfo->teId[2] = ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[2];
+   ulTnlInfo->teId[3] = ulInfo->list.array[arrIdx]->uLUPTNLInformation.choice.gTPTunnel->gTP_TEID.buf[3];
    return ROK;
 }/*End of BuildULTnlInfo*/
 
@@ -7624,12 +10284,13 @@ void FreeDrbItem(DRBs_ToBeSetupMod_Item_t *drbItem)
 *
 * ****************************************************************/
 
-uint8_t FillDrbItemToSetupMod(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeSetupMod_Item_t *drbItem)
+uint8_t FillDrbItemToSetupMod(uint32_t duId, CuUeCb *ueCb, uint8_t arrIdx, DRBs_ToBeSetupMod_Item_t *drbItem)
 {
    uint8_t ret = ROK;
 
    /*Drb Id */
    drbItem->dRBID = arrIdx + DRB_ID_TO_ADD_MOD;
+   ueCb->drbList[ueCb->numDrb].drbId = drbItem->dRBID;
    
    /*qoSInformation*/
    drbItem->qoSInformation.present = QoSInformation_PR_choice_extension;
@@ -7673,8 +10334,8 @@ uint8_t FillDrbItemToSetupMod(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeSetupMod_It
         drbItem->qoSInformation.choice.choice_extension->id = ProtocolIE_ID_id_DRB_Information;
         drbItem->qoSInformation.choice.choice_extension->criticality = Criticality_ignore;
         drbItem->qoSInformation.choice.choice_extension->value.present = QoSInformation_ExtIEs__value_PR_DRB_Information;
-        ret =  BuildQOSInfo(&drbItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.dRB_QoS,\
-           ProtocolIE_ID_id_DRBs_ToBeSetupMod_Item, PDU_SESSION_ID_2);
+        ret =  BuildQOSInfo(&ueCb->drbList[ueCb->numDrb].qos, &drbItem->qoSInformation.choice.choice_extension->value.choice.DRB_Information.dRB_QoS,\
+           ProtocolIE_ID_id_DRBs_ToBeSetupMod_Item, PDU_SESSION_ID_2, FALSE);
         if(ret != ROK)
         {
            DU_LOG("\nERROR  -->  F1AP : BuildQOSInfo failed");
@@ -7682,8 +10343,8 @@ uint8_t FillDrbItemToSetupMod(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeSetupMod_It
         }
         
         /*SNSSAI*/
-        ret = BuildSNSSAI(&drbItem->qoSInformation.choice.\
-              choice_extension->value.choice.DRB_Information.sNSSAI, cuCb.snssaiList[1]);
+        ret = BuildSNSSAI(&ueCb->drbList[ueCb->numDrb], &drbItem->qoSInformation.choice.\
+              choice_extension->value.choice.DRB_Information.sNSSAI, cuCb.snssaiList[1], FALSE);
         if(ret != ROK)
         {
            DU_LOG("\nERROR  -->  F1AP : BuildSNSSAI failed");
@@ -7691,9 +10352,9 @@ uint8_t FillDrbItemToSetupMod(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeSetupMod_It
         }
         
         /*Flows mapped to DRB List*/
-         ret = BuildFlowsMap(&drbItem->qoSInformation.choice.\
+         ret = BuildFlowsMap(&ueCb->drbList[ueCb->numDrb], &drbItem->qoSInformation.choice.\
               choice_extension->value.choice.DRB_Information.flows_Mapped_To_DRB_List,\ 
-          ProtocolIE_ID_id_DRBs_ToBeSetupMod_Item);
+          ProtocolIE_ID_id_DRBs_ToBeSetupMod_Item, FALSE);
         if(ret != ROK)
         {
            DU_LOG("\nERROR  -->  F1AP : BuildFlowsMap failed");
@@ -7703,8 +10364,8 @@ uint8_t FillDrbItemToSetupMod(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeSetupMod_It
    }
    
    /*ULUPTNLInformation To Be Setup List*/
-   ret = BuildUlTnlInfoforSetupMod(ueId, drbItem->dRBID, &drbItem->uLUPTNLInformation_ToBeSetup_List, \
-      ProtocolIE_ID_id_DRBs_ToBeSetupMod_Item);
+   ret = BuildUlTnlInfoforSetupMod(duId, ueCb->gnbCuUeF1apId, drbItem->dRBID, &ueCb->drbList[ueCb->numDrb].ulUpTnlInfo, \
+      &drbItem->uLUPTNLInformation_ToBeSetup_List, ProtocolIE_ID_id_DRBs_ToBeSetupMod_Item);
    if(ret != ROK)
    {
       DU_LOG("\nERROR  -->  F1AP : BuildUlTnlInfoforSetupMod failed");
@@ -7713,6 +10374,9 @@ uint8_t FillDrbItemToSetupMod(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeSetupMod_It
 
    /*RLCMode*/
    drbItem->rLCMode = RLCMode_rlc_um_bidirectional;
+   ueCb->drbList[ueCb->numDrb].rlcMode = drbItem->rLCMode;
+
+   ueCb->numDrb++;
    return ROK;
 }
 
@@ -7733,13 +10397,13 @@ uint8_t FillDrbItemToSetupMod(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeSetupMod_It
 *
 * ****************************************************************/
 
-uint8_t FillDrbItemList(uint8_t ueId, uint8_t arrIdx, struct DRBs_ToBeSetupMod_ItemIEs *drbItemIe)
+uint8_t FillDrbItemList(uint32_t duId, CuUeCb *ueCb, uint8_t arrIdx, struct DRBs_ToBeSetupMod_ItemIEs *drbItemIe)
 {
    drbItemIe->id = ProtocolIE_ID_id_DRBs_ToBeSetupMod_Item;
    drbItemIe->criticality = Criticality_reject;
    drbItemIe->value.present = DRBs_ToBeSetupMod_ItemIEs__value_PR_DRBs_ToBeSetupMod_Item;
 
-   if(FillDrbItemToSetupMod(ueId, arrIdx, (&(drbItemIe->value.choice.DRBs_ToBeSetupMod_Item))) != ROK)
+   if(FillDrbItemToSetupMod(duId, ueCb, arrIdx, (&(drbItemIe->value.choice.DRBs_ToBeSetupMod_Item))) != ROK)
    {
       DU_LOG("\nERROR  -->  F1AP : FillDrbItemToSetupMod failed"); 
       return RFAILED;
@@ -7803,7 +10467,7 @@ void FreeDrbToBeSetupModList(DRBs_ToBeSetupMod_List_t *drbSet)
 *
 * ****************************************************************/
 
-uint8_t BuildDrbToBeSetupList(uint8_t ueId, DRBs_ToBeSetupMod_List_t *drbSet)
+uint8_t BuildDrbToBeSetupList(uint32_t duId, CuUeCb *ueCb, DRBs_ToBeSetupMod_List_t *drbSet)
 {
    uint8_t ret = ROK;
    uint8_t arrIdx =0;
@@ -7828,7 +10492,7 @@ uint8_t BuildDrbToBeSetupList(uint8_t ueId, DRBs_ToBeSetupMod_List_t *drbSet)
          return  RFAILED;
       }
 
-      ret = FillDrbItemList(ueId, arrIdx, (DRBs_ToBeSetupMod_ItemIEs_t *)drbSet->list.array[arrIdx]);
+      ret = FillDrbItemList(duId, ueCb, arrIdx, (DRBs_ToBeSetupMod_ItemIEs_t *)drbSet->list.array[arrIdx]);
       if(ret != ROK)
       {
          DU_LOG("\nERROR  -->  F1AP : FillDrbItemList failed");
@@ -7855,13 +10519,25 @@ uint8_t BuildDrbToBeSetupList(uint8_t ueId, DRBs_ToBeSetupMod_List_t *drbSet)
 *
 * ****************************************************************/
 
-uint8_t FillDrbToBeModItem(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeModified_Item_t *drbItem)
+uint8_t FillDrbToBeModItem(uint32_t duId, CuUeCb *ueCb, uint8_t arrIdx, DRBs_ToBeModified_Item_t *drbItem)
 {
    uint8_t ret = ROK;
+   uint drbIdx=0;
+   DrbInfo *drbToBeMod;
 
    /*Drb Id */
    drbItem->dRBID = DRB2 + arrIdx;
 
+   /* Search for DRB ID in CU databse */
+   for(drbIdx = 0; drbIdx < ueCb->numDrb; drbIdx++)
+   {
+      if(ueCb->drbList[drbIdx].drbId == drbItem->dRBID)
+      {
+         drbToBeMod = &ueCb->drbList[drbIdx];
+         break;
+      }
+   }
+
    /*qoSInformation*/
    drbItem->qoSInformation = NULLP;
    CU_ALLOC(drbItem->qoSInformation, sizeof(QoSInformation_t));
@@ -7908,8 +10584,8 @@ uint8_t FillDrbToBeModItem(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeModified_Item_
                drbItem->qoSInformation->choice.choice_extension->id = ProtocolIE_ID_id_DRB_Information;
                drbItem->qoSInformation->choice.choice_extension->criticality = Criticality_ignore;
                drbItem->qoSInformation->choice.choice_extension->value.present = QoSInformation_ExtIEs__value_PR_DRB_Information;
-               ret =  BuildQOSInfo(&drbItem->qoSInformation->choice.choice_extension->value.choice.DRB_Information.dRB_QoS,\
-                     ProtocolIE_ID_id_DRBs_ToBeModified_Item, INVALID_PDU_SESSION_ID);
+               ret =  BuildQOSInfo(&drbToBeMod->qos, &drbItem->qoSInformation->choice.choice_extension->value.choice.DRB_Information.dRB_QoS,\
+                     ProtocolIE_ID_id_DRBs_ToBeModified_Item, INVALID_PDU_SESSION_ID, FALSE);
                if(ret != ROK)
                {
                   DU_LOG("\nERROR  -->  F1AP : BuildQOSInfo failed");
@@ -7917,8 +10593,8 @@ uint8_t FillDrbToBeModItem(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeModified_Item_
                }
 
                /*SNSSAI*/
-               ret = BuildSNSSAI(&drbItem->qoSInformation->choice.\
-                     choice_extension->value.choice.DRB_Information.sNSSAI, cuCb.snssaiList[0]);
+               ret = BuildSNSSAI(drbToBeMod, &drbItem->qoSInformation->choice.\
+                     choice_extension->value.choice.DRB_Information.sNSSAI, cuCb.snssaiList[0], FALSE);
                if(ret != ROK)
                {
                   DU_LOG("\nERROR  -->  F1AP : BuildSNSSAI failed");
@@ -7926,9 +10602,9 @@ uint8_t FillDrbToBeModItem(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeModified_Item_
                }
 
                /*Flows mapped to DRB List*/
-               ret = BuildFlowsMap(&drbItem->qoSInformation->choice.\
+               ret = BuildFlowsMap(drbToBeMod, &drbItem->qoSInformation->choice.\
                      choice_extension->value.choice.DRB_Information.flows_Mapped_To_DRB_List,\
-                     ProtocolIE_ID_id_DRBs_ToBeModified_Item);
+                     ProtocolIE_ID_id_DRBs_ToBeModified_Item, FALSE);
                if(ret != ROK)
                {
                   DU_LOG("\nERROR  -->  F1AP : BuildFlowsMap failed");
@@ -7939,7 +10615,7 @@ uint8_t FillDrbToBeModItem(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeModified_Item_
    }/* End of QoS */
 
    /*ULUPTNLInformation To Be Setup List*/
-   ret = BuildUlTnlInfoforSetupMod(ueId, drbItem->dRBID, &drbItem->uLUPTNLInformation_ToBeSetup_List,\
+   ret = BuildUlTnlInfoforSetupMod(duId, ueCb->gnbCuUeF1apId, drbItem->dRBID, &drbToBeMod->ulUpTnlInfo, &drbItem->uLUPTNLInformation_ToBeSetup_List,\
             ProtocolIE_ID_id_DRBs_ToBeModified_Item);
    if(ret != ROK)
    {
@@ -7966,12 +10642,12 @@ uint8_t FillDrbToBeModItem(uint8_t ueId, uint8_t arrIdx, DRBs_ToBeModified_Item_
 *
 * ****************************************************************/
 
-uint8_t FillDrbToBeModItemList(uint8_t ueId, uint8_t arrIdx, struct DRBs_ToBeModified_ItemIEs *drbItemIe)
+uint8_t FillDrbToBeModItemList(uint32_t duId, CuUeCb *ueCb, uint8_t arrIdx, struct DRBs_ToBeModified_ItemIEs *drbItemIe)
 {
    drbItemIe->id = ProtocolIE_ID_id_DRBs_ToBeModified_Item;
    drbItemIe->criticality = Criticality_reject;
    drbItemIe->value.present = DRBs_ToBeModified_ItemIEs__value_PR_DRBs_ToBeModified_Item;
-   if(FillDrbToBeModItem(ueId, arrIdx, &(drbItemIe->value.choice.DRBs_ToBeModified_Item)) != ROK)
+   if(FillDrbToBeModItem(duId, ueCb, arrIdx, &(drbItemIe->value.choice.DRBs_ToBeModified_Item)) != ROK)
    {
       DU_LOG("\nERROR  -->  F1AP : FillDrbToBeModItem failed"); 
       return RFAILED;
@@ -7997,7 +10673,7 @@ uint8_t FillDrbToBeModItemList(uint8_t ueId, uint8_t arrIdx, struct DRBs_ToBeMod
 *
 * ****************************************************************/
 
-uint8_t BuildDrbToBeModifiedList(uint8_t ueId, DRBs_ToBeModified_List_t *drbSet)
+uint8_t BuildDrbToBeModifiedList(uint32_t duId, CuUeCb *ueCb, DRBs_ToBeModified_List_t *drbSet)
 {
    uint8_t ret = ROK;
    uint8_t arrIdx =0;
@@ -8021,7 +10697,7 @@ uint8_t BuildDrbToBeModifiedList(uint8_t ueId, DRBs_ToBeModified_List_t *drbSet)
          return  RFAILED;
       }
 
-      ret = FillDrbToBeModItemList(ueId, arrIdx, (DRBs_ToBeModified_ItemIEs_t *)drbSet->list.array[arrIdx]);
+      ret = FillDrbToBeModItemList(duId, ueCb, arrIdx, (DRBs_ToBeModified_ItemIEs_t *)drbSet->list.array[arrIdx]);
       if(ret != ROK)
       {
          DU_LOG("\nERROR  -->  F1AP : FillDrbToBeModItemList failed");
@@ -8171,20 +10847,20 @@ void FreeDrbToBeModifiedList(DRBs_ToBeModified_List_t *drbSet)
 void FreeUeContextModicationRequest(F1AP_PDU_t *f1apMsg)
 {
    uint8_t arrIdx =0 , ieId=0; 
-   UEContextModificationRequest_t *UeContextModifyReq = NULLP;
+   UEContextModificationRequest_t *ueContextModifyReq = NULLP;
 
    if(f1apMsg)
    {
       if(f1apMsg->choice.initiatingMessage)
       {
-         UeContextModifyReq =&f1apMsg->choice.initiatingMessage->value.choice.UEContextModificationRequest;
-         if(UeContextModifyReq->protocolIEs.list.array)
+         ueContextModifyReq =&f1apMsg->choice.initiatingMessage->value.choice.UEContextModificationRequest;
+         if(ueContextModifyReq->protocolIEs.list.array)
          {
-            for( arrIdx = 0 ; arrIdx<UeContextModifyReq->protocolIEs.list.count ; arrIdx++)
+            for( arrIdx = 0 ; arrIdx<ueContextModifyReq->protocolIEs.list.count ; arrIdx++)
             {
-               if(UeContextModifyReq->protocolIEs.list.array[arrIdx])
+               if(ueContextModifyReq->protocolIEs.list.array[arrIdx])
                {
-                  ieId = UeContextModifyReq->protocolIEs.list.array[arrIdx]->id;
+                  ieId = ueContextModifyReq->protocolIEs.list.array[arrIdx]->id;
                   switch(ieId)
                   {
                      case ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID:
@@ -8193,22 +10869,29 @@ void FreeUeContextModicationRequest(F1AP_PDU_t *f1apMsg)
                         break;
                      case ProtocolIE_ID_id_DRBs_ToBeSetupMod_List:
                         {
-                           FreeDrbToBeSetupModList(&UeContextModifyReq->protocolIEs.list.array[arrIdx]->value.\
+                           FreeDrbToBeSetupModList(&ueContextModifyReq->protocolIEs.list.array[arrIdx]->value.\
                                  choice.DRBs_ToBeSetupMod_List);
                            break;
                         }
                      case ProtocolIE_ID_id_DRBs_ToBeModified_List:
                         {
-                           FreeDrbToBeModifiedList(&UeContextModifyReq->protocolIEs.list.array[arrIdx]->value.\
-                                 choice.DRBs_ToBeSetupMod_List);
+                           FreeDrbToBeModifiedList(&ueContextModifyReq->protocolIEs.list.array[arrIdx]->value.\
+                                 choice.DRBs_ToBeModified_List);
                            break;
                         }
+                    case ProtocolIE_ID_id_TransmissionActionIndicator:
+                        break;
+                    case ProtocolIE_ID_id_RRCContainer:
+                    {
+                        CU_FREE(ueContextModifyReq->protocolIEs.list.array[arrIdx]->value.choice.RRCContainer.buf,\
+                        ueContextModifyReq->protocolIEs.list.array[arrIdx]->value.choice.RRCContainer.size);
+                    }
 
                   }
-                  CU_FREE(UeContextModifyReq->protocolIEs.list.array[arrIdx], sizeof(UEContextModificationRequest_t));
+                  CU_FREE(ueContextModifyReq->protocolIEs.list.array[arrIdx], sizeof(UEContextModificationRequest_t));
                }         
             }
-            CU_FREE(UeContextModifyReq->protocolIEs.list.array, UeContextModifyReq->protocolIEs.list.size);
+            CU_FREE(ueContextModifyReq->protocolIEs.list.array, ueContextModifyReq->protocolIEs.list.size);
          }
          CU_FREE(f1apMsg->choice.initiatingMessage, sizeof(InitiatingMessage_t));
       }
@@ -8240,10 +10923,8 @@ uint8_t BuildAndSendUeContextModificationReq(uint32_t duId, void *cuUeCb, UeCtxt
    CuUeCb     *ueCb = (CuUeCb *)cuUeCb;
    F1AP_PDU_t *f1apMsg = NULLP;
    UEContextModificationRequest_t *ueContextModifyReq = NULLP;
-
    asn_enc_rval_t         encRetVal;
    DU_LOG("\nINFO  -->  F1AP : Building Ue context modification request\n");
-
    while(1)
    {
       CU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t));
@@ -8271,6 +10952,15 @@ uint8_t BuildAndSendUeContextModificationReq(uint32_t duId, void *cuUeCb, UeCtxt
          elementCnt = 4;
       else if(action == QUERY_CONFIG)
          elementCnt = 3;
+      else if(action == RRC_RECONFIG_COMPLETE_IND)
+         elementCnt = 3;
+      else if((action == STOP_DATA_TX) || (action == RESTART_DATA_TX)) 
+         elementCnt = 5;
+      
+#ifdef NR_DRX
+      if(DRX_TO_BE_RELEASE && ueCb->drxCfgPresent)
+         elementCnt++;
+#endif      
       ueContextModifyReq->protocolIEs.list.count = elementCnt;
       ueContextModifyReq->protocolIEs.list.size = elementCnt*sizeof(UEContextModificationRequest_t *);
 
@@ -8314,7 +11004,7 @@ uint8_t BuildAndSendUeContextModificationReq(uint32_t duId, void *cuUeCb, UeCtxt
          ueContextModifyReq->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
          ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.present =\
                                                                            UEContextModificationRequestIEs__value_PR_DRBs_ToBeSetupMod_List;
-         ret = BuildDrbToBeSetupList(ueCb->gnbCuUeF1apId, &(ueContextModifyReq->protocolIEs.list.array[ieIdx]->\
+         ret = BuildDrbToBeSetupList(duId, ueCb, &(ueContextModifyReq->protocolIEs.list.array[ieIdx]->\
                   value.choice.DRBs_ToBeSetupMod_List));
 
          /* DRB to be modified list */
@@ -8323,15 +11013,18 @@ uint8_t BuildAndSendUeContextModificationReq(uint32_t duId, void *cuUeCb, UeCtxt
          ueContextModifyReq->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
          ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.present =\
                                                                            UEContextModificationRequestIEs__value_PR_DRBs_ToBeModified_List;
-         ret = BuildDrbToBeModifiedList(ueCb->gnbCuUeF1apId, &(ueContextModifyReq->protocolIEs.list.array[ieIdx]->\
+         ret = BuildDrbToBeModifiedList(duId, ueCb, &(ueContextModifyReq->protocolIEs.list.array[ieIdx]->\
                   value.choice.DRBs_ToBeModified_List));
 
          /* TODO: DRB to be release list */
 
          if(ret != ROK)
          {
+            DU_LOG("\nERROR  -->  F1AP : BuildAndSendUeContextModificationReq(): Failed to build drb to be modified list");
             break;
          }
+
+         /* TODO: fill the RRC reconfiguration information in RRC Contaiiner ie in case of MODIFY_UE  */
       }
       else if(action == QUERY_CONFIG)
       {
@@ -8342,6 +11035,70 @@ uint8_t BuildAndSendUeContextModificationReq(uint32_t duId, void *cuUeCb, UeCtxt
             UEContextModificationRequestIEs__value_PR_GNB_DUConfigurationQuery;
          ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.choice.GNB_DUConfigurationQuery = GNB_DUConfigurationQuery_true;
       }
+      else if(action == RRC_RECONFIG_COMPLETE_IND)
+      {
+         ieIdx++;
+         ueContextModifyReq->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_RRCReconfigurationCompleteIndicator;
+         ueContextModifyReq->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
+         ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.present = \
+            UEContextModificationRequestIEs__value_PR_RRCReconfigurationCompleteIndicator;
+         ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.choice.RRCReconfigurationCompleteIndicator = \
+            RRCReconfigurationCompleteIndicator_true;
+      }
+      else if((action == STOP_DATA_TX) || (action == RESTART_DATA_TX))
+      {
+         ieIdx++;
+         if(action == STOP_DATA_TX)
+         {
+            ueContextModifyReq->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_TransmissionActionIndicator;
+            ueContextModifyReq->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
+            ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.present = \
+            UEContextModificationRequestIEs__value_PR_TransmissionActionIndicator;
+            ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.choice.TransmissionActionIndicator = \
+            TransmissionActionIndicator_stop;
+         }
+         else if (action == RESTART_DATA_TX)
+         {
+            ueContextModifyReq->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_TransmissionActionIndicator;
+            ueContextModifyReq->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
+            ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.present = \
+            UEContextModificationRequestIEs__value_PR_TransmissionActionIndicator;
+            ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.choice.TransmissionActionIndicator = \
+            TransmissionActionIndicator_restart;
+         }
+
+         ieIdx++;
+         ueContextModifyReq->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_RRCContainer;
+         ueContextModifyReq->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
+         ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.present = \
+         UEContextModificationRequestIEs__value_PR_RRCContainer;
+         if(fillRrcReconfigBuf(ueCb, &ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer, true) != ROK)
+         {
+            DU_LOG( "\nERROR  -->  F1AP : Failed to fill Rrc reconfiguration buffer");
+            return RFAILED;
+         }
+
+         /* RRC delivery status request */
+         ieIdx++;
+         ueContextModifyReq->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_RRCDeliveryStatusRequest;
+         ueContextModifyReq->protocolIEs.list.array[ieIdx]->criticality = Criticality_ignore;
+         ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.present = UEContextModificationRequestIEs__value_PR_RRCDeliveryStatusRequest;
+         ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.choice.RRCDeliveryStatusRequest = RRCDeliveryStatusRequest_true;
+      }
+
+#ifdef NR_DRX
+      if(DRX_TO_BE_RELEASE && ueCb->drxCfgPresent)
+      {
+         /* DRX Configuration Indicator */
+         ieIdx++;
+         ueContextModifyReq->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_DRXConfigurationIndicator;
+         ueContextModifyReq->protocolIEs.list.array[ieIdx]->criticality = Criticality_ignore;
+         ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.present = UEContextModificationRequestIEs__value_PR_DRXConfigurationIndicator;
+         ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.choice.DRXConfigurationIndicator = DRXConfigurationIndicator_release;
+         ueCb->drxCfgPresent = false;
+         memset(&ueCb->drxCfg, 0, sizeof(DrxCfg));
+      }
+#endif
 
       xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
 
@@ -8360,10 +11117,15 @@ uint8_t BuildAndSendUeContextModificationReq(uint32_t duId, void *cuUeCb, UeCtxt
       else
       {
          DU_LOG("\nDEBUG  -->  F1AP : Created APER encodedbuffer for ueContextModifyReq\n");
+#if 0        
+         /* This for loop was going into an infinite loop even though encBufSize
+          * has a small value. Hence commented this
+          */
          for(ieIdx=0; ieIdx< encBufSize; ieIdx++)
          {
             DU_LOG("%x",encBuf[ieIdx]);
          }
+#endif
       }
 
       /* TODO : Hardcoding DU ID to 1 for messages other than F1 Setup Response. This will be made generic in future gerrit */
@@ -8438,7 +11200,9 @@ void FreeUeContextReleaseCommand(F1AP_PDU_t *f1apMsg)
 uint8_t BuildAndSendUeContextReleaseCommand(uint32_t duId, uint8_t cuUeF1apId, uint8_t duUeF1apId)
 {
    bool       memAllocFailed = false;
-   uint8_t    ieIdx = 0,elementCnt = 0, ret = RFAILED, bufLen=0;
+   uint8_t  duIdx = 0, ieIdx = 0,elementCnt = 0, ret = RFAILED, bufLen=0;
+   DuDb *duDb;
+   CuUeCb *ueCb;
    F1AP_PDU_t *f1apMsg = NULLP;
    UEContextReleaseCommand_t *ueContextReleaseCommand = NULLP;
 
@@ -8468,7 +11232,13 @@ uint8_t BuildAndSendUeContextReleaseCommand(uint32_t duId, uint8_t cuUeF1apId, u
 
       ueContextReleaseCommand =&f1apMsg->choice.initiatingMessage->value.choice.UEContextReleaseCommand;
 
-      elementCnt = 4;
+      SEARCH_DU_DB(duIdx, duId, duDb); 
+      ueCb = &duDb->ueCb[duUeF1apId-1];
+      if(ueCb->state == UE_HANDOVER_IN_PROGRESS)
+         elementCnt = 3;
+      else
+         elementCnt = 4;
+     
       ueContextReleaseCommand->protocolIEs.list.count = elementCnt;
       ueContextReleaseCommand->protocolIEs.list.size = elementCnt*sizeof(UEContextReleaseCommand_t*);
 
@@ -8495,6 +11265,7 @@ uint8_t BuildAndSendUeContextReleaseCommand(uint32_t duId, uint8_t cuUeF1apId, u
       {
          break;
       }
+
       ieIdx=0;
       ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID;
       ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
@@ -8509,34 +11280,36 @@ uint8_t BuildAndSendUeContextReleaseCommand(uint32_t duId, uint8_t cuUeF1apId, u
       UEContextReleaseCommandIEs__value_PR_GNB_DU_UE_F1AP_ID;
       ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_UE_F1AP_ID =duUeF1apId;
 
+      /* Cause of UE context release */
       ieIdx++;
       ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_Cause;
       ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->criticality = Criticality_ignore;
       ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.present=\
-      UEContextReleaseCommandIEs__value_PR_Cause;
+                                                                            UEContextReleaseCommandIEs__value_PR_Cause;
       ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.choice.Cause.present = Cause_PR_radioNetwork;
       ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.choice.Cause.choice.radioNetwork=\
-      CauseRadioNetwork_normal_release;
-     
-      /* RRC Container for RRC release */
-      ieIdx++;
-      ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_RRCContainer;
-      ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->criticality = Criticality_ignore;
-      ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.present = \
-      UEContextReleaseCommandIEs__value_PR_RRCContainer;
-      char secModeBuf[7]={ 0x00, 0x05, 0x13, 0x00, 0x00, 0x00, 0x00};
-      bufLen =7;
-      ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.size = bufLen;
-      CU_ALLOC(ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.buf,
-      ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.size);
-      if(!ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.buf)
-      {
-      DU_LOG("\nERROR  -->  F1AP : Memory allocation for BuildAndSendUeContextReleaseCommand failed");
-      break;
+                                                                                                     CauseRadioNetwork_normal_release;
+      if(ueCb->state != UE_HANDOVER_IN_PROGRESS)
+      {
+         /* RRC Container for RRC release */
+         ieIdx++;
+         ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_RRCContainer;
+         ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->criticality = Criticality_ignore;
+         ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.present = \
+                                                                                 UEContextReleaseCommandIEs__value_PR_RRCContainer;
+         char secModeBuf[7]={ 0x00, 0x05, 0x13, 0x00, 0x00, 0x00, 0x00};
+         bufLen =7;
+         ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.size = bufLen;
+         CU_ALLOC(ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.buf,
+               ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.size);
+         if(!ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.buf)
+         {
+            DU_LOG("\nERROR  -->  F1AP : Memory allocation for BuildAndSendUeContextReleaseCommand failed");
+            break;
+         }
+         memset(ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.buf, 0, bufLen);
+         memcpy(ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.buf, secModeBuf, bufLen);
       }
-      memset(ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.buf, 0, bufLen);
-      memcpy(ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.buf, secModeBuf, bufLen);
-      
       xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
 
       /* Encode the UE Context Release Command type as APER */
@@ -8643,8 +11416,8 @@ uint8_t procUeContextReleaseReq(uint32_t duId, F1AP_PDU_t *f1apMsg)
 uint8_t procGnbDuUpdate(uint32_t duId, F1AP_PDU_t *f1apMsg)
 {
    bool cellToBeDelete = false;
-   uint8_t ieIdx = 0, ueIdx = 0;
-   uint16_t cellId;
+   uint8_t ieIdx = 0, ueIdx = 0, duIdx = 0, cellIdx=0;
+   uint16_t nrCellId;
    DuDb *duDb;
    CuCellCb *cellCb;
    GNBDUConfigurationUpdate_t *duCfgUpdate = NULLP;
@@ -8663,8 +11436,7 @@ uint8_t procGnbDuUpdate(uint32_t duId, F1AP_PDU_t *f1apMsg)
                struct Served_Cells_To_Delete_ItemIEs *deleteItemIe = \
                   (struct Served_Cells_To_Delete_ItemIEs *)duCfgUpdate->protocolIEs.list.array[ieIdx]->value.choice.\
                   Served_Cells_To_Delete_List.list.array[0];
-               cellId = deleteItemIe->value.choice.Served_Cells_To_Delete_Item.oldNRCGI.nRCellIdentity.buf[4] >>\
-                  deleteItemIe->value.choice.Served_Cells_To_Delete_Item.oldNRCGI.nRCellIdentity.bits_unused;
+               bitStringToInt(&deleteItemIe->value.choice.Served_Cells_To_Delete_Item.oldNRCGI.nRCellIdentity, &nrCellId); 
                cellToBeDelete = true;
                break;
             }
@@ -8693,15 +11465,16 @@ uint8_t procGnbDuUpdate(uint32_t duId, F1AP_PDU_t *f1apMsg)
 #endif
    if(cellToBeDelete == true) 
    {
-      duDb = getDuDb(duId);
-      cellCb = getCellCb(duDb, cellId);
-      for(ueIdx = 0; ueIdx < cellCb->numUe; ueIdx++)
+      SEARCH_DU_DB(duIdx, duId, duDb);
+      SEARCH_CELL_DB(cellIdx, duDb, nrCellId, cellCb);
+      if(cellCb->numUe == 0)
       {
-         CU_FREE(cellCb->ueCb[ueIdx]->f1apMsgDb.duToCuContainer.buf, cellCb->ueCb[ueIdx]->f1apMsgDb.duToCuContainer.size);
-         memset(cellCb->ueCb[ueIdx], 0, sizeof(CuUeCb));
+         memset(cellCb, 0, sizeof(CuCellCb));
+         duDb->numCells--;
       }
+      else
+         cellCb->cellStatus = CELL_DELETION_IN_PROGRESS;
    }
-
    return ROK;
 }
 
@@ -8758,6 +11531,49 @@ uint8_t buildSliceList(SliceSupportList_t *sliceSupportList)
    return ROK;
 }
 
+/****************************************************************
+ * @brief Function to process Srb Setup Mod List 
+ *
+ * @details
+ *
+ *    Function : procSrbSetupModList
+ *    
+ *    Functionality:
+ *         - Function to process SRB Setup Mod List
+ *
+ * @params[in]
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t procSrbSetupModList(CuUeCb *ueCb, SRBs_SetupMod_List_t *srbSetupList)
+{
+   uint8_t arrIdx = 0, srbIdx;
+   struct SRBs_SetupMod_ItemIEs *srbItemIe = NULLP;
+
+   if(srbSetupList != NULLP)
+   {
+      for(arrIdx = 0; arrIdx < srbSetupList->list.count; arrIdx++)
+      {     
+         srbItemIe = ((struct SRBs_SetupMod_ItemIEs *)srbSetupList->list.array[arrIdx]);
+         if(srbItemIe->value.present == SRBs_SetupMod_ItemIEs__value_PR_SRBs_SetupMod_Item)
+         {
+            for(srbIdx = 0; srbIdx < ueCb->numSrb; srbIdx++)
+            {
+               if(ueCb->srbList[srbIdx].srbId == srbItemIe->value.choice.SRBs_SetupMod_Item.sRBID)
+               {
+                  ueCb->srbList[srbIdx].lcId = srbItemIe->value.choice.SRBs_SetupMod_Item.lCID;
+                  break;
+               }
+            }
+         }
+        
+      }
+   }
+   return ROK;
+}
+
+
 /****************************************************************
  * @brief Function to process Drb Setup Mod List 
  *
@@ -8773,9 +11589,9 @@ uint8_t buildSliceList(SliceSupportList_t *sliceSupportList)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t procDrbSetupModList(DRBs_SetupMod_List_t *drbSetupList)
+uint8_t procDrbSetupModList(uint32_t duId, CuUeCb *ueCb, DRBs_SetupMod_List_t *drbSetupList)
 {
-   uint8_t arrIdx = 0;
+   uint8_t arrIdx = 0, drbIdx;
    uint32_t teId = 0;
    struct DRBs_SetupMod_ItemIEs *drbItemIe = NULLP;
 
@@ -8786,17 +11602,30 @@ uint8_t procDrbSetupModList(DRBs_SetupMod_List_t *drbSetupList)
          drbItemIe = ((struct DRBs_SetupMod_ItemIEs *)drbSetupList->list.array[arrIdx]);
          if(drbItemIe->value.present == DRBs_SetupMod_ItemIEs__value_PR_DRBs_SetupMod_Item)
          {
+            for(drbIdx = 0; drbIdx < ueCb->numDrb; drbIdx++)
+            {
+               if(ueCb->drbList[drbIdx].drbId == drbItemIe->value.choice.DRBs_SetupMod_Item.dRBID)
+               {
+                  if(drbItemIe->value.choice.DRBs_SetupMod_Item.lCID)
+                     ueCb->drbList[drbIdx].lcId = *(drbItemIe->value.choice.DRBs_SetupMod_Item.lCID);
+                  break;
+               }
+            }
+
+            if(ueCb->state != UE_HANDOVER_IN_PROGRESS)
+            {
             /* extracting teId */
             teId  = extractTeId(&drbItemIe->value.choice.DRBs_SetupMod_Item.dLUPTNLInformation_ToBeSetup_List);
             if(teId > 0)
             {
-              if(addDrbTunnels(teId)== ROK)
+              if(addDrbTunnels(duId, teId)== ROK)
               {
                 DU_LOG("\nDEBUG  --> EGTP: Tunnel Added for TeId %d", teId);
               }
             }
             else
                return RFAILED;
+            }
          }
       }
    }
@@ -8879,37 +11708,90 @@ uint8_t procServedCellPlmnList(ServedPLMNs_List_t *srvPlmn)
  * ****************************************************************/
 uint8_t procUeContextModificationResponse(uint32_t duId, F1AP_PDU_t *f1apMsg)
 {
-   uint8_t idx, duUeF1apId;
-   DuDb *duDb;
-   CuUeCb *ueCb;
-       UEContextModificationResponse_t *ueCtxtModRsp = NULLP;
+   uint8_t idx=0, duIdx=0;
+   uint8_t duUeF1apId = 0, cuUeF1apId = 0;
+   DuDb *duDb = NULLP;
+   CuUeCb *ueCb = NULLP;
+   UEContextModificationResponse_t *ueCtxtModRsp = NULLP;
 
-   duDb = getDuDb(duId);
+   SEARCH_DU_DB(duIdx, duId, duDb);
    ueCtxtModRsp = &f1apMsg->choice.successfulOutcome->value.choice.UEContextModificationResponse;
    
    for(idx=0; idx < ueCtxtModRsp->protocolIEs.list.count; idx++)
    {
       switch(ueCtxtModRsp->protocolIEs.list.array[idx]->id)
       {
+          case ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID:
+             {
+                cuUeF1apId = ueCtxtModRsp->protocolIEs.list.array[idx]->value.choice.GNB_CU_UE_F1AP_ID;
+                break;
+             }
           case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
              {
                 duUeF1apId = ueCtxtModRsp->protocolIEs.list.array[idx]->value.choice.GNB_DU_UE_F1AP_ID;
                 ueCb = &duDb->ueCb[duUeF1apId-1];
-                if(ueCb->state == HANDOVER_IN_PROGRESS)
-                {
-                   /* TODO : Next procedure i.e. UE context setup request to
-                    * target DU should be triggerred here */
-                   return ROK;
-                }
                 break;
              }
           case ProtocolIE_ID_id_DRBs_SetupMod_List:
              {
                 /* Adding Tunnels for successful DRB */
-                procDrbSetupModList(&ueCtxtModRsp->protocolIEs.list.array[idx]->value.choice.DRBs_SetupMod_List);
+                procDrbSetupModList(duId, ueCb, &ueCtxtModRsp->protocolIEs.list.array[idx]->value.choice.DRBs_SetupMod_List);
                 break; 
 
-             }
+             }
+          case ProtocolIE_ID_id_SRBs_SetupMod_List:
+             {
+                procSrbSetupModList(ueCb, &ueCtxtModRsp->protocolIEs.list.array[idx]->value.choice.SRBs_SetupMod_List);
+                break;
+             }
+         case ProtocolIE_ID_id_DUtoCURRCInformation:
+             {
+                DU_LOG("\nINFO  -->  Received Du to Cu RRC Information ");
+                if((extractDuToCuRrcCont(ueCb, ueCtxtModRsp->protocolIEs.list.array[idx]->value.choice.\
+                   DUtoCURRCInformation.cellGroupConfig)) != ROK)
+                {
+                   DU_LOG("\nERROR  -->  F1AP : Failed to extract Du to Cu RRC Information");
+                   return RFAILED;
+                }
+                break;
+             }
+
+      }
+   }
+
+   /* If UE is in handover and UE context is not yet created at target DU, then send
+    * UE context setup request to target DU */
+   if(ueCb->state == UE_HANDOVER_IN_PROGRESS)
+   {
+      uint8_t ueIdx = 0;
+      DuDb *tgtDuDb = NULLP;
+      CuUeCb *ueCbInTgtDu = NULLP;
+
+      SEARCH_DU_DB(duIdx, ueCb->hoInfo.targetDuId, tgtDuDb);
+      if(tgtDuDb)
+      {
+         /* Since DU UE F1AP ID assigned by target DU to this UE in handover is
+          * not known here, using CU UE F1AP ID to search for UE Cb in target DU
+          * DB */
+         for(ueIdx = 0; ueIdx < MAX_NUM_UE; ueIdx++)
+         {
+            if(tgtDuDb->ueCb[ueIdx].gnbCuUeF1apId == cuUeF1apId)
+            {
+               ueCbInTgtDu = &tgtDuDb->ueCb[ueIdx];
+               break;
+            }
+         }
+
+         /* If UE context is not found in Target DU DU, send UE context setup
+          * request */
+         if(ueCbInTgtDu == NULLP)
+         {
+            if((BuildAndSendUeContextSetupReq(ueCb->hoInfo.targetDuId, ueCb)) != ROK)
+            {
+               DU_LOG("\nERROR  ->  F1AP : Failed at BuildAndSendUeContextSetupReq");
+               return RFAILED;
+            }
+         }
       }
    }
    
@@ -8935,7 +11817,8 @@ uint8_t procUeContextModificationResponse(uint32_t duId, F1AP_PDU_t *f1apMsg)
 void procF1SetupReq(uint32_t *destDuId, F1AP_PDU_t *f1apMsg)
 {
    uint8_t ieIdx = 0, plmnidx=0, duIdx = 0, ret=ROK, cellIdx = 0;
-   uint32_t duId, cellId;
+   uint32_t duId = 0;
+   uint64_t nrCellId = 0;
    DuDb     *duDb = NULLP;
    CuCellCb *cellCb = NULLP;
    BIT_STRING_t nrcellIdentity;
@@ -8951,17 +11834,15 @@ void procF1SetupReq(uint32_t *destDuId, F1AP_PDU_t *f1apMsg)
          case ProtocolIE_ID_id_gNB_DU_ID:
            {
               duId = f1SetupReq->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_ID.buf[0];
-              duDb = getDuDb(duId);
+              SEARCH_DU_DB(duIdx, duId, duDb); 
               if(duDb == NULLP)
               {
                  duDb = &cuCb.duInfo[cuCb.numDu];
-                 memset(duDb, 0, sizeof(DuDb));
-                 duDb->duId = duId;
                  cuCb.numDu++;
-                 *destDuId = duId;
               }
-              else
-                 return;
+              memset(duDb, 0, sizeof(DuDb));
+              duDb->duId = duId;
+              *destDuId = duId;
               break;
            }
          case ProtocolIE_ID_id_gNB_DU_Name:
@@ -8985,14 +11866,15 @@ void procF1SetupReq(uint32_t *destDuId, F1AP_PDU_t *f1apMsg)
                               srvCellItem =  &duServedCell->list.array[plmnidx]->value.choice.GNB_DU_Served_Cells_Item;
                               ret = procServedCellPlmnList(&srvCellItem->served_Cell_Information.servedPLMNs);
                               memcpy(&nrcellIdentity, &srvCellItem->served_Cell_Information.nRCGI.nRCellIdentity, sizeof(BIT_STRING_t));
-
-                              cellId = nrcellIdentity.buf[4] >> nrcellIdentity.bits_unused;
-                              cellCb = getCellCb(duDb, cellId);
+                              
+                              bitStringToInt(&nrcellIdentity, &nrCellId);
+                              SEARCH_CELL_DB(cellIdx, duDb, nrCellId, cellCb);
                               if(cellCb == NULLP)
                               {
                                  cellCb = &duDb->cellCb[duDb->numCells];
                                  memset(cellCb, 0, sizeof(CuCellCb));
-                                 cellCb->nrCellId = cellId;
+                                 cellCb->nrCellId = nrCellId;
+                                 cellCb->cellStatus = CELL_ACTIVE;
                                  duDb->numCells++;
                               }
                            }
@@ -9013,6 +11895,437 @@ void procF1SetupReq(uint32_t *destDuId, F1AP_PDU_t *f1apMsg)
    }
 }
 
+/****************************************************************
+*
+* @brief processing of UE Context Release Complete
+*
+* @details
+*
+*    Function : procUeContextReleaseComplete
+*
+*    Functionality:
+*         - processing of UE Context Release Complete
+*
+* @params[in] F1AP_PDU_t *f1apMsg
+* @return ROK     - success
+*         RFAILED - failure
+*
+* ****************************************************************/
+void procUeContextReleaseComplete(uint32_t duId, F1AP_PDU_t *f1apMsg)
+{
+   uint8_t duIdx = 0, ieIdx = 0, ueIdx = 0, drbIdx = 0;
+   uint8_t gnbDuUeF1apId = 0, gnbCuUeF1apId = 0;
+   DuDb *duDb = NULLP;
+   CuUeCb *ueCb = NULLP;
+   UEContextReleaseComplete_t *ueReleaseComplete = NULLP;
+
+   SEARCH_DU_DB(duIdx, duId, duDb);
+   if(!duDb)
+   {
+      DU_LOG("\nERROR  -->  F1AP : No entry found for DU ID [%d]", duId);
+      return;
+   }
+
+   ueReleaseComplete = &f1apMsg->choice.successfulOutcome->value.choice.UEContextReleaseComplete;
+   for(ieIdx=0; ieIdx < ueReleaseComplete->protocolIEs.list.count; ieIdx++)
+   {
+      switch(ueReleaseComplete->protocolIEs.list.array[ieIdx]->id)
+      {
+         case ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID:
+            {
+               gnbCuUeF1apId = ueReleaseComplete->protocolIEs.list.array[ieIdx]->value.choice.GNB_CU_UE_F1AP_ID;
+               break;
+            }
+         case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
+            {
+               gnbDuUeF1apId = ueReleaseComplete->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_UE_F1AP_ID;
+               ueCb = &duDb->ueCb[gnbDuUeF1apId-1];
+               for(ueIdx = 0; ueIdx <MAX_NUM_UE; ueIdx++)
+               {
+                  if(ueCb->cellCb && ueCb->cellCb->ueCb[ueIdx])
+                  {
+                     if((ueCb->cellCb->ueCb[ueIdx]->gnbCuUeF1apId == gnbCuUeF1apId) &&
+                           (ueCb->cellCb->ueCb[ueIdx]->gnbDuUeF1apId == gnbDuUeF1apId))
+                     {
+                        for(drbIdx = 0; drbIdx < ueCb->numDrb; drbIdx++)
+                        {
+                           deleteEgtpTunnel(duId, ueCb->drbList[drbIdx].dlUpTnlInfo.teId);
+                        }
+                        ueCb->cellCb->ueCb[ueIdx] = NULLP;
+                        ueCb->cellCb->numUe--;
+                        if((ueCb->cellCb->numUe == 0) && (ueCb->cellCb->cellStatus == CELL_DELETION_IN_PROGRESS))
+                        {
+                           memset(ueCb->cellCb, 0, sizeof(CuCellCb));
+                           duDb->numCells--;
+                        }
+                        break;
+                     }
+                  }
+               }
+               memset(ueCb, 0, sizeof(CuUeCb));
+               duDb->numUe--;
+               break;
+            }
+      }
+   }
+}
+
+/*******************************************************************
+ *
+ * @brief Builds the Paging cell list 
+ *
+ * @details
+ *
+ *    Function : BuildPagingCellList
+ *
+ *    Functionality: Build the paging cell list 
+ *
+ * @params[in] PagingCell_list_t  *pagingCelllist,  
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildPagingCellList(PagingCell_list_t *pagingCelllist, uint8_t numCells, CuCellCb *cellCb)
+{
+   uint8_t cellIdx =0;
+   PagingCell_ItemIEs_t *pagingCellItemIes; 
+   PagingCell_Item_t *pagingCellItem;
+
+   pagingCelllist->list.count = numCells;
+   pagingCelllist->list.size = pagingCelllist->list.count * (sizeof(PagingCell_ItemIEs_t*));
+   CU_ALLOC(pagingCelllist->list.array, pagingCelllist->list.size);
+   if(pagingCelllist->list.array == NULLP)
+   {
+      DU_LOG("\nERROR  -->  F1AP : BuildPagingCellList(): Memory allocation failed ");
+      return RFAILED;
+   }
+
+   for(cellIdx = 0; cellIdx < pagingCelllist->list.count; cellIdx++)
+   {
+      CU_ALLOC(pagingCelllist->list.array[cellIdx], sizeof(PagingCell_ItemIEs_t));
+      if(pagingCelllist->list.array[cellIdx] == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildPagingCellList(): Memory allocation failed ");
+         return RFAILED;
+      }
+   }
+   
+   for(cellIdx = 0; cellIdx < pagingCelllist->list.count; cellIdx++)
+   {
+      pagingCellItemIes = (PagingCell_ItemIEs_t *)pagingCelllist->list.array[cellIdx];
+      pagingCellItemIes->id =  ProtocolIE_ID_id_PagingCell_Item;
+      pagingCellItemIes->criticality = Criticality_ignore;
+      pagingCellItemIes->value.present = PagingCell_ItemIEs__value_PR_PagingCell_Item; 
+      pagingCellItem = &pagingCellItemIes->value.choice.PagingCell_Item;
+   
+      /* Fill NrCgi Information */
+      BuildNrcgi(&pagingCellItem->nRCGI, cellCb[cellIdx].nrCellId);
+   }
+   
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Deallocation of memory allocated in paging msg
+ *
+ * @details
+ *
+ *    Function :FreePagingMsg 
+ *
+ *    Functionality: Deallocation of memory allocated in paging msg
+ *
+ * @params[in] F1AP_PDU_t *f1apMsg
+ *
+ * @return void 
+ *
+ * ****************************************************************/
+void FreePagingMsg(F1AP_PDU_t *f1apMsg)
+{
+   uint8_t ieIdx, cellIdx;
+   Paging_t   *paging;
+   PagingCell_ItemIEs_t *pagingCellItemIes;
+   PagingCell_Item_t *pagingCellItem;
+   PagingCell_list_t  *pagingCelllist;
+
+   if(f1apMsg)
+   {
+      if(f1apMsg->choice.initiatingMessage)
+      {
+         paging = &f1apMsg->choice.initiatingMessage->value.choice.Paging;
+         if(paging->protocolIEs.list.array)
+         {
+            for(ieIdx=0 ; ieIdx<paging->protocolIEs.list.count; ieIdx++)
+            {
+               if(paging->protocolIEs.list.array[ieIdx])
+               {
+                  switch(paging->protocolIEs.list.array[ieIdx]->id)
+                  {
+                     case ProtocolIE_ID_id_UEIdentityIndexValue:
+                     {
+                        CU_FREE(paging->protocolIEs.list.array[ieIdx]->value.choice.UEIdentityIndexValue.choice.indexLength10.buf,\
+                        paging->protocolIEs.list.array[ieIdx]->value.choice.UEIdentityIndexValue.choice.indexLength10.size);
+                        break;
+                     }
+                     
+                     case ProtocolIE_ID_id_PagingIdentity:
+                     {
+                        if(paging->protocolIEs.list.array[ieIdx]->value.choice.PagingIdentity.present == PagingIdentity_PR_cNUEPagingIdentity)
+                        {
+                           if(paging->protocolIEs.list.array[ieIdx]->value.choice.PagingIdentity.choice.cNUEPagingIdentity)
+                           {  
+                              if(paging->protocolIEs.list.array[ieIdx]->value.choice.PagingIdentity.choice.cNUEPagingIdentity->present == CNUEPagingIdentity_PR_fiveG_S_TMSI)
+                              {
+                                 CU_FREE(paging->protocolIEs.list.array[ieIdx]->value.choice.PagingIdentity.choice.cNUEPagingIdentity->choice.fiveG_S_TMSI.buf,\
+                                 paging->protocolIEs.list.array[ieIdx]->value.choice.PagingIdentity.choice.cNUEPagingIdentity->choice.fiveG_S_TMSI.size);
+                              }
+                                CU_FREE(paging->protocolIEs.list.array[ieIdx]->value.choice.PagingIdentity.choice.cNUEPagingIdentity,\
+                                sizeof(struct CNUEPagingIdentity));
+                           }
+                        }
+                        break;
+                     }
+                     
+                     case ProtocolIE_ID_id_PagingCell_List:
+                     {
+                        pagingCelllist = &paging->protocolIEs.list.array[ieIdx]->value.choice.PagingCell_list;
+                        if(pagingCelllist->list.array)
+                        {
+                           for(cellIdx = 0; cellIdx < pagingCelllist->list.count; cellIdx++)
+                           {
+                              if(pagingCelllist->list.array[cellIdx])
+                              {
+                                  pagingCellItemIes = (PagingCell_ItemIEs_t *)pagingCelllist->list.array[cellIdx];
+                                  if(pagingCellItemIes->id == ProtocolIE_ID_id_PagingCell_Item)
+                                  {
+                                     pagingCellItem = &pagingCellItemIes->value.choice.PagingCell_Item;
+                                     CU_FREE(pagingCellItem->nRCGI.pLMN_Identity.buf, pagingCellItem->nRCGI.pLMN_Identity.size);
+                                     CU_FREE(pagingCellItem->nRCGI.nRCellIdentity.buf, pagingCellItem->nRCGI.nRCellIdentity.size);
+                                  }
+                                  CU_FREE(pagingCelllist->list.array[cellIdx], sizeof(PagingCell_ItemIEs_t));
+                              }
+                           }
+                           CU_FREE(pagingCelllist->list.array, pagingCelllist->list.size);
+                        }
+                        break;
+                     }
+                  }
+                  CU_FREE(paging->protocolIEs.list.array[ieIdx], sizeof(Paging_t));
+               }
+            }
+            CU_FREE(paging->protocolIEs.list.array, paging->protocolIEs.list.size);
+         }
+         CU_FREE(f1apMsg->choice.initiatingMessage, sizeof(InitiatingMessage_t));
+      }
+      CU_FREE(f1apMsg, sizeof(F1AP_PDU_t));
+   }
+}
+/*******************************************************************
+ *
+ * @brief Builds and sends the paging message if UE is in idle mode
+ *
+ * @details
+ *
+ *    Function : BuildAndSendPagingMsg
+ *
+ *    Functionality: Builds and sends the paging message
+ *
+ * @params[in] uint32_t duId, uint8_t gsTmsi
+ *
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildAndSendPagingMsg(uint64_t gsTmsi, uint8_t duId)
+{
+   bool       memAllocFailed = false;
+   uint8_t    ieIdx = 0, elementCnt = 0, ret = RFAILED;
+   uint16_t   ueId = 0, duIdx = 0;
+
+   /*As per 38.473 Sec 9.3.1.39, UE Identity Index Value (10bits) > 2 Bytes + 6 Unused Bits
+    *5G-S-TMSI :48 Bits  >> 6 Bytes and 0 UnusedBits */
+   uint8_t    totalByteInUeId = 2, totalByteInTmsi = 6;
+   uint8_t    unusedBitsInUeId = 6, unusedBitsInTmsi = 0;
+
+   F1AP_PDU_t *f1apMsg = NULLP;
+   Paging_t   *paging = NULLP;
+   DuDb       *duDb;
+   asn_enc_rval_t         encRetVal;
+
+   DU_LOG("\nINFO  -->  F1AP : Building PAGING Message command\n");
+
+   SEARCH_DU_DB(duIdx, duId, duDb);
+   if(duDb == NULLP)
+   {
+      DU_LOG("\nERROR  -->  F1AP : BuildAndSendPagingMsg(): DuDb is empty");
+      return ret; 
+   }
+
+   while(true)
+   {
+      CU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t));
+      if(f1apMsg == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildAndSendPagingMsg(): Memory allocation for F1AP-PDU");
+         break;
+      }
+
+      f1apMsg->present =  F1AP_PDU_PR_initiatingMessage;
+
+      CU_ALLOC(f1apMsg->choice.initiatingMessage, sizeof(InitiatingMessage_t));
+      if(f1apMsg->choice.initiatingMessage == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildAndSendPagingMsg(): Memory allocation for F1AP-PDU failed ");
+         break;
+      }
+      f1apMsg->choice.initiatingMessage->procedureCode = ProcedureCode_id_Paging;
+      f1apMsg->choice.initiatingMessage->criticality = Criticality_reject;
+      f1apMsg->choice.initiatingMessage->value.present = InitiatingMessage__value_PR_Paging;
+
+      paging = &f1apMsg->choice.initiatingMessage->value.choice.Paging;
+
+      elementCnt = 5;
+      paging->protocolIEs.list.count = elementCnt;
+      paging->protocolIEs.list.size = elementCnt * sizeof(Paging_t*);
+
+      /* Initialize the Paging Message members */
+      CU_ALLOC(paging->protocolIEs.list.array, paging->protocolIEs.list.size);
+      if(paging->protocolIEs.list.array == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildAndSendPagingMsg():Memory allocation failed");
+         break;
+      }
+
+      for(ieIdx=0 ; ieIdx<elementCnt; ieIdx++)
+      {
+         CU_ALLOC(paging->protocolIEs.list.array[ieIdx], sizeof(Paging_t));
+         if(paging->protocolIEs.list.array[ieIdx] == NULLP)
+         {
+            DU_LOG("\nERROR  -->  F1AP : BuildAndSendPagingMsg(): Memory allocation failed ");
+            memAllocFailed = true;  
+            break;
+         }
+      }
+
+      if(memAllocFailed == true)
+      {
+         break;
+      }
+
+      /* UE Identity Index Value */
+      ieIdx=0;
+      paging->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_UEIdentityIndexValue;
+      paging->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
+      paging->protocolIEs.list.array[ieIdx]->value.present = PagingIEs__value_PR_UEIdentityIndexValue;
+      paging->protocolIEs.list.array[ieIdx]->value.choice.UEIdentityIndexValue.present = UEIdentityIndexValue_PR_indexLength10;
+      paging->protocolIEs.list.array[ieIdx]->value.choice.UEIdentityIndexValue.choice.indexLength10.size = totalByteInUeId*sizeof(uint8_t);
+      CU_ALLOC(paging->protocolIEs.list.array[ieIdx]->value.choice.UEIdentityIndexValue.choice.indexLength10.buf,\
+            paging->protocolIEs.list.array[ieIdx]->value.choice.UEIdentityIndexValue.choice.indexLength10.size);
+      if(paging->protocolIEs.list.array[ieIdx]->value.choice.UEIdentityIndexValue.choice.indexLength10.buf == NULLP)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildAndSendPagingMsg(): Memory allocation failed ");
+         break;
+      }
+
+      /*As per 3gpp Spec 38.304 Sec 7.1: UE_ID: 5G-S-TMSI mod 1024*/
+      ueId = gsTmsi % 1024;
+      fillBitString(&paging->protocolIEs.list.array[ieIdx]->value.choice.UEIdentityIndexValue.choice.indexLength10, unusedBitsInUeId, totalByteInUeId, ueId);
+
+      /* Paging Identity */
+      ieIdx++;
+      paging->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_PagingIdentity;
+      paging->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
+      paging->protocolIEs.list.array[ieIdx]->value.present = PagingIEs__value_PR_PagingIdentity;
+      paging->protocolIEs.list.array[ieIdx]->value.choice.PagingIdentity.present = \
+                                                                                   PagingIdentity_PR_cNUEPagingIdentity;
+      CU_ALLOC(paging->protocolIEs.list.array[ieIdx]->value.choice.PagingIdentity.choice.cNUEPagingIdentity, \
+            sizeof(struct CNUEPagingIdentity));
+      if(!paging->protocolIEs.list.array[ieIdx]->value.choice.PagingIdentity.choice.cNUEPagingIdentity)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildAndSendPagingMsg(): Memory allocation failed ");
+         break;
+      }
+
+      paging->protocolIEs.list.array[ieIdx]->value.choice.PagingIdentity.choice.cNUEPagingIdentity->present = \
+                                                                                                              CNUEPagingIdentity_PR_fiveG_S_TMSI;
+
+      paging->protocolIEs.list.array[ieIdx]->value.choice.PagingIdentity.choice.cNUEPagingIdentity->choice.fiveG_S_TMSI.size = totalByteInTmsi*sizeof(uint8_t);
+      CU_ALLOC(paging->protocolIEs.list.array[ieIdx]->value.choice.PagingIdentity.choice.cNUEPagingIdentity->choice.fiveG_S_TMSI.buf,\
+            paging->protocolIEs.list.array[ieIdx]->value.choice.PagingIdentity.choice.cNUEPagingIdentity->choice.fiveG_S_TMSI.size);
+      if(!paging->protocolIEs.list.array[ieIdx]->value.choice.PagingIdentity.choice.cNUEPagingIdentity->choice.fiveG_S_TMSI.buf)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildAndSendPagingMsg(): Memory allocation failed ");
+         break;
+      }
+
+      fillBitString(&paging->protocolIEs.list.array[ieIdx]->value.choice.PagingIdentity.choice.cNUEPagingIdentity->choice.fiveG_S_TMSI,\
+            unusedBitsInTmsi, totalByteInTmsi, gsTmsi);
+
+      /* Paging Drx */
+      ieIdx++;
+      paging->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_PagingDRX;
+      paging->protocolIEs.list.array[ieIdx]->criticality = Criticality_ignore;
+      paging->protocolIEs.list.array[ieIdx]->value.present = PagingIEs__value_PR_PagingDRX;
+      paging->protocolIEs.list.array[ieIdx]->value.choice.PagingDRX = PagingDRX_v32;
+
+      /* Paging Priority */
+      ieIdx++;
+      paging->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_PagingPriority;
+      paging->protocolIEs.list.array[ieIdx]->criticality = Criticality_ignore;
+      paging->protocolIEs.list.array[ieIdx]->value.present = PagingIEs__value_PR_PagingPriority;
+      paging->protocolIEs.list.array[ieIdx]->value.choice.PagingPriority = PagingPriority_priolevel2;
+
+      /* Paging Cell List */
+      ieIdx++;
+      paging->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_PagingCell_List;
+      paging->protocolIEs.list.array[ieIdx]->criticality = Criticality_ignore;
+      paging->protocolIEs.list.array[ieIdx]->value.present = PagingIEs__value_PR_PagingCell_list;
+      if(BuildPagingCellList(&paging->protocolIEs.list.array[ieIdx]->value.choice.PagingCell_list, duDb->numCells, duDb->cellCb) != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : BuildAndSendPagingMsg(): Failed to build Paging cell list "); 
+         break;
+      }
+
+      xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
+
+      /* Encode the UE Context Release Command 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 Release Command structure (at %s)\n",\
+               encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+         break;
+      }
+      else
+      {
+         DU_LOG("\nDEBUG  -->  F1AP : Created APER encoded buffer for Paging\n");
+         for(ieIdx=0; ieIdx< encBufSize; ieIdx++)
+         {
+            DU_LOG("%x",encBuf[ieIdx]);
+         }
+      }
+
+      if(SendF1APMsg(CU_APP_MEM_REG, CU_POOL, duId) != ROK)
+      {
+         DU_LOG("\nERROR  -->  F1AP : Sending Ue context Release Command failed");
+         break;
+      }
+
+      ret = ROK;
+      break;
+
+   }
+
+   FreePagingMsg(f1apMsg); 
+   return ret;
+}
+
 /*******************************************************************
  *
  * @brief Handles received F1AP message and sends back response  
@@ -9163,6 +12476,7 @@ void F1APMsgHdlr(uint32_t *duId, Buffer *mBuf)
                case SuccessfulOutcome__value_PR_UEContextReleaseComplete:
                   {
                       DU_LOG("\nINFO  -->  F1AP : UE Context release complete received");
+                      procUeContextReleaseComplete(*duId, f1apMsg);
                       break;
                   }
                default: