diff --git a/doc/RUNMODEM.md b/doc/RUNMODEM.md
index 10b8998b5432437eff73dcd1c77734f3f98c1f78..24e3579684ad3b306012875868383582d7158440 100644
--- a/doc/RUNMODEM.md
+++ b/doc/RUNMODEM.md
@@ -85,7 +85,7 @@ At the UE the --phy-test flag will
 
 ```bash sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf --phy-test```
 
-In phy-test mode it is possible to mimic the reception of UE Capabilities at gNB by passing through the command line parameter `--uecap_file` the location and file name of the input UE Capability file, e.g. `--uecap_file ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap.xml`
+In phy-test mode it is possible to mimic the reception of UE Capabilities at gNB by passing through the command line parameter `--uecap_file` the location and file name of the input UE Capability file, e.g. `--uecap_file ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap_ports1.xml`
 
 ### Launch UE in another window
 
@@ -120,7 +120,7 @@ gNB on machine 1:
 
 `sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf --do-ra`
 
-In do-ra mode it is possible to mimic the reception of UE Capabilities at gNB by passing through the command line parameter `--uecap_file` the location and file name of the input UE Capability file, e.g. `--uecap_file ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap.xml`
+In do-ra mode it is possible to mimic the reception of UE Capabilities at gNB by passing through the command line parameter `--uecap_file` the location and file name of the input UE Capability file, e.g. `--uecap_file ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap_ports1.xml`
 
 UE on machine 2:
 
@@ -179,7 +179,7 @@ With the RF simulator (on the same machine):
 
 where `-r` sets the transmission bandwidth configuration in terms of RBs, `-C` sets the downlink carrier frequency and `--ssb` sets the SSB start subcarrier.
 
-Additionally, at UE side `--uecap_file` option can be used to pass the UE Capabilities input file (path location + filename), e.g. `--uecap_file ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap.xml`
+Additionally, at UE side `--uecap_file` option can be used to pass the UE Capabilities input file (path location + filename), e.g. `--uecap_file ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap_ports1.xml`
 
 ### Run OAI with SDAP & Custom DRBs
 
diff --git a/executables/nr-softmodem.h b/executables/nr-softmodem.h
index e01a6cd5ed64d7ad0bac4b45e2420b04bc2f40bf..f3bc7f5b716ca1d22828562e1892633b1b69f7ec 100644
--- a/executables/nr-softmodem.h
+++ b/executables/nr-softmodem.h
@@ -29,7 +29,7 @@
     {"U" ,                    CONFIG_HLP_ULBM_PHYTEST,0,                u64ptr:&ulsch_slot_bitmap,          defintval:0,                   TYPE_UINT64, 0},        \
     {"usrp-tx-thread-config", CONFIG_HLP_USRP_THREAD, 0,                iptr:&usrp_tx_thread,               defstrval:0,                   TYPE_INT,    0},        \
     {"ldpc-offload-enable",   CONFIG_HLP_LDPC_OFFLOAD, 0,               iptr:&ldpc_offload_flag,            defstrval:0,                   TYPE_INT,    0},        \
-    {"uecap_file",            CONFIG_HLP_UECAP_FILE,  0,                strptr:&uecap_file,                 defstrval:"./uecap.xml",       TYPE_STRING, 0},        \
+    {"uecap_file",            CONFIG_HLP_UECAP_FILE,  0,                strptr:&uecap_file,                 defstrval:"./uecap_ports1.xml",TYPE_STRING, 0},        \
     {"s" ,                    CONFIG_HLP_SNR,         0,                dblptr:&snr_dB,                     defdblval:25,                  TYPE_DOUBLE, 0},        \
   }
 
diff --git a/executables/nr-uesoftmodem.h b/executables/nr-uesoftmodem.h
index f8ce6c1f27163b65c4f8548c95a7e544a486d4f2..d19b5b9ce1838173c778ab072ae63583072574e8 100644
--- a/executables/nr-uesoftmodem.h
+++ b/executables/nr-uesoftmodem.h
@@ -38,8 +38,8 @@
     {"max-ldpc-iterations",      CONFIG_HLP_MAX_LDPC_ITERATIONS, 0,       u8ptr:&nrUE_params.max_ldpc_iterations,    defuintval:5,       TYPE_UINT8, 0}, \
     {"nr-dlsch-demod-shift",     CONFIG_HLP_DLSHIFT,     0,               iptr:(int32_t *)&nr_dlsch_demod_shift,    defintval:0,     TYPE_INT,    0}, \
     {"V" ,                       CONFIG_HLP_VCD,         PARAMFLAG_BOOL,  iptr:&vcdflag,                      defintval:0,     TYPE_INT,    0}, \
-    {"uecap_file",               CONFIG_HLP_UECAP_FILE,  0,               strptr:&uecap_file,        defstrval:"./uecap.xml", TYPE_STRING, 0}, \
-    {"rrc_config_path",          CONFIG_HLP_RRC_CFG_PATH,0,               strptr:&rrc_config_path,   defstrval:"./",  TYPE_STRING, 0}, \
+    {"uecap_file",               CONFIG_HLP_UECAP_FILE,  0,               strptr:&uecap_file,                 defstrval:"./uecap_ports1.xml", TYPE_STRING, 0}, \
+    {"rrc_config_path",          CONFIG_HLP_RRC_CFG_PATH,0,               strptr:&rrc_config_path,            defstrval:"./",                 TYPE_STRING, 0}, \
     {"ue-idx-standalone",        NULL,                   0,               u16ptr:&ue_idx_standalone,          defuintval:0xFFFF,    TYPE_UINT16,   0} \
 }
 
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap_ports1.xml b/targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap_ports1.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ec0288fd26327001e51553320fd409b6bae1285c
--- /dev/null
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap_ports1.xml
@@ -0,0 +1,862 @@
+<UE-NR-Capability>
+    <accessStratumRelease><rel15/></accessStratumRelease>
+    <pdcp-Parameters>
+        <supportedROHC-Profiles>
+            <profile0x0000><false/></profile0x0000>
+            <profile0x0001><false/></profile0x0001>
+            <profile0x0002><false/></profile0x0002>
+            <profile0x0003><false/></profile0x0003>
+            <profile0x0004><false/></profile0x0004>
+            <profile0x0006><false/></profile0x0006>
+            <profile0x0101><false/></profile0x0101>
+            <profile0x0102><false/></profile0x0102>
+            <profile0x0103><false/></profile0x0103>
+            <profile0x0104><false/></profile0x0104>
+        </supportedROHC-Profiles>
+        <maxNumberROHC-ContextSessions><cs2/></maxNumberROHC-ContextSessions>
+        <shortSN><supported/></shortSN>
+    </pdcp-Parameters>
+    <rlc-Parameters>
+        <am-WithShortSN><supported/></am-WithShortSN>
+        <um-WithShortSN><supported/></um-WithShortSN>
+        <um-WithLongSN><supported/></um-WithLongSN>
+    </rlc-Parameters>
+    <mac-Parameters>
+        <mac-ParametersXDD-Diff>
+            <logicalChannelSR-DelayTimer><supported/></logicalChannelSR-DelayTimer>
+            <longDRX-Cycle><supported/></longDRX-Cycle>
+            <shortDRX-Cycle><supported/></shortDRX-Cycle>
+            <multipleSR-Configurations><supported/></multipleSR-Configurations>
+        </mac-ParametersXDD-Diff>
+    </mac-Parameters>
+    <phy-Parameters>
+        <phy-ParametersCommon>
+            <nzp-CSI-RS-IntefMgmt><supported/></nzp-CSI-RS-IntefMgmt>
+            <dynamicHARQ-ACK-Codebook><supported/></dynamicHARQ-ACK-Codebook>
+            <semiStaticHARQ-ACK-Codebook><supported/></semiStaticHARQ-ACK-Codebook>
+            <pdsch-MappingTypeA><supported/></pdsch-MappingTypeA>
+            <rateMatchingResrcSetSemi-Static><supported/></rateMatchingResrcSetSemi-Static>
+            <ext2>
+                <maxLayersMIMO-Indication><supported/></maxLayersMIMO-Indication>
+            </ext2>
+        </phy-ParametersCommon>
+        <phy-ParametersFRX-Diff>
+            <twoFL-DMRS>
+                11
+            </twoFL-DMRS>
+            <supportedDMRS-TypeDL><type1/></supportedDMRS-TypeDL>
+            <supportedDMRS-TypeUL><type1And2/></supportedDMRS-TypeUL>
+            <onePortsPTRS>
+                01
+            </onePortsPTRS>
+            <pucch-F2-WithFH><supported/></pucch-F2-WithFH>
+            <pucch-F3-WithFH><supported/></pucch-F3-WithFH>
+            <absoluteTPC-Command><supported/></absoluteTPC-Command>
+            <pusch-HalfPi-BPSK><supported/></pusch-HalfPi-BPSK>
+            <pucch-F3-4-HalfPi-BPSK><supported/></pucch-F3-4-HalfPi-BPSK>
+            <ext1>
+                <csi-RS-IM-ReceptionForFeedback>
+                    <maxConfigNumberNZP-CSI-RS-PerCC>8</maxConfigNumberNZP-CSI-RS-PerCC>
+                    <maxConfigNumberPortsAcrossNZP-CSI-RS-PerCC>64</maxConfigNumberPortsAcrossNZP-CSI-RS-PerCC>
+                    <maxConfigNumberCSI-IM-PerCC><n8/></maxConfigNumberCSI-IM-PerCC>
+                    <maxNumberSimultaneousNZP-CSI-RS-PerCC>4</maxNumberSimultaneousNZP-CSI-RS-PerCC>
+                    <totalNumberPortsSimultaneousNZP-CSI-RS-PerCC>32</totalNumberPortsSimultaneousNZP-CSI-RS-PerCC>
+                </csi-RS-IM-ReceptionForFeedback>
+                <csi-ReportFramework>
+                    <maxNumberPeriodicCSI-PerBWP-ForCSI-Report>2</maxNumberPeriodicCSI-PerBWP-ForCSI-Report>
+                    <maxNumberAperiodicCSI-PerBWP-ForCSI-Report>2</maxNumberAperiodicCSI-PerBWP-ForCSI-Report>
+                    <maxNumberSemiPersistentCSI-PerBWP-ForCSI-Report>0</maxNumberSemiPersistentCSI-PerBWP-ForCSI-Report>
+                    <maxNumberPeriodicCSI-PerBWP-ForBeamReport>2</maxNumberPeriodicCSI-PerBWP-ForBeamReport>
+                    <maxNumberAperiodicCSI-PerBWP-ForBeamReport>2</maxNumberAperiodicCSI-PerBWP-ForBeamReport>
+                    <maxNumberAperiodicCSI-triggeringStatePerCC><n63/></maxNumberAperiodicCSI-triggeringStatePerCC>
+                    <maxNumberSemiPersistentCSI-PerBWP-ForBeamReport>0</maxNumberSemiPersistentCSI-PerBWP-ForBeamReport>
+                    <simultaneousCSI-ReportsPerCC>4</simultaneousCSI-ReportsPerCC>
+                </csi-ReportFramework>
+                <mux-SR-HARQ-ACK-CSI-PUCCH-OncePerSlot>
+                    <sameSymbol><supported/></sameSymbol>
+                </mux-SR-HARQ-ACK-CSI-PUCCH-OncePerSlot>
+                <oneFL-DMRS-TwoAdditionalDMRS-UL><supported/></oneFL-DMRS-TwoAdditionalDMRS-UL>
+                <twoFL-DMRS-TwoAdditionalDMRS-UL><supported/></twoFL-DMRS-TwoAdditionalDMRS-UL>
+            </ext1>
+        </phy-ParametersFRX-Diff>
+        <phy-ParametersFR1>
+            <pdsch-256QAM-FR1><supported/></pdsch-256QAM-FR1>
+            <pdsch-RE-MappingFR1-PerSymbol><n10/></pdsch-RE-MappingFR1-PerSymbol>
+            <ext1>
+                <pdsch-RE-MappingFR1-PerSlot><n32/></pdsch-RE-MappingFR1-PerSlot>
+            </ext1>
+        </phy-ParametersFR1>
+    </phy-Parameters>
+    <rf-Parameters>
+        <supportedBandListNR>
+            <BandNR>
+                <bandNR>78</bandNR>
+                <mimo-ParametersPerBand>
+                    <tci-StatePDSCH>
+                        <maxNumberConfiguredTCIstatesPerCC><n16/></maxNumberConfiguredTCIstatesPerCC>
+                        <maxNumberActiveTCI-PerBWP><n1/></maxNumberActiveTCI-PerBWP>
+                    </tci-StatePDSCH>
+                    <pusch-TransCoherence><nonCoherent/></pusch-TransCoherence>
+                    <periodicBeamReport><supported/></periodicBeamReport>
+                    <aperiodicBeamReport><supported/></aperiodicBeamReport>
+                    <maxNumberNonGroupBeamReporting><n4/></maxNumberNonGroupBeamReporting>
+                    <maxNumberSSB-BFD>2</maxNumberSSB-BFD>
+                    <maxNumberCSI-RS-SSB-CBD>8</maxNumberCSI-RS-SSB-CBD>
+                    <beamReportTiming>
+                        <scs-15kHz><sym8/></scs-15kHz>
+                        <scs-30kHz><sym14/></scs-30kHz>
+                    </beamReportTiming>
+                    <ext1>
+                        <beamManagementSSB-CSI-RS>
+                            <maxNumberSSB-CSI-RS-ResourceOneTx><n8/></maxNumberSSB-CSI-RS-ResourceOneTx>
+                            <maxNumberCSI-RS-Resource><n32/></maxNumberCSI-RS-Resource>
+                            <maxNumberCSI-RS-ResourceTwoTx><n8/></maxNumberCSI-RS-ResourceTwoTx>
+                            <supportedCSI-RS-Density><oneAndThree/></supportedCSI-RS-Density>
+                            <maxNumberAperiodicCSI-RS-Resource><n32/></maxNumberAperiodicCSI-RS-Resource>
+                        </beamManagementSSB-CSI-RS>
+                        <codebookParameters>
+                            <type1>
+                                <singlePanel>
+                                    <supportedCSI-RS-ResourceList>
+                                        <SupportedCSI-RS-Resource>
+                                            <maxNumberTxPortsPerResource><p8/></maxNumberTxPortsPerResource>
+                                            <maxNumberResourcesPerBand>8</maxNumberResourcesPerBand>
+                                            <totalNumberTxPortsPerBand>64</totalNumberTxPortsPerBand>
+                                        </SupportedCSI-RS-Resource>
+                                        <SupportedCSI-RS-Resource>
+                                            <maxNumberTxPortsPerResource><p4/></maxNumberTxPortsPerResource>
+                                            <maxNumberResourcesPerBand>8</maxNumberResourcesPerBand>
+                                            <totalNumberTxPortsPerBand>32</totalNumberTxPortsPerBand>
+                                        </SupportedCSI-RS-Resource>
+                                        <SupportedCSI-RS-Resource>
+                                            <maxNumberTxPortsPerResource><p16/></maxNumberTxPortsPerResource>
+                                            <maxNumberResourcesPerBand>4</maxNumberResourcesPerBand>
+                                            <totalNumberTxPortsPerBand>64</totalNumberTxPortsPerBand>
+                                        </SupportedCSI-RS-Resource>
+                                        <SupportedCSI-RS-Resource>
+                                            <maxNumberTxPortsPerResource><p32/></maxNumberTxPortsPerResource>
+                                            <maxNumberResourcesPerBand>2</maxNumberResourcesPerBand>
+                                            <totalNumberTxPortsPerBand>64</totalNumberTxPortsPerBand>
+                                        </SupportedCSI-RS-Resource>
+                                    </supportedCSI-RS-ResourceList>
+                                    <modes><mode1/></modes>
+                                    <maxNumberCSI-RS-PerResourceSet>4</maxNumberCSI-RS-PerResourceSet>
+                                </singlePanel>
+                            </type1>
+                        </codebookParameters>
+                        <csi-RS-IM-ReceptionForFeedback>
+                            <maxConfigNumberNZP-CSI-RS-PerCC>8</maxConfigNumberNZP-CSI-RS-PerCC>
+                            <maxConfigNumberPortsAcrossNZP-CSI-RS-PerCC>64</maxConfigNumberPortsAcrossNZP-CSI-RS-PerCC>
+                            <maxConfigNumberCSI-IM-PerCC><n8/></maxConfigNumberCSI-IM-PerCC>
+                            <maxNumberSimultaneousNZP-CSI-RS-PerCC>4</maxNumberSimultaneousNZP-CSI-RS-PerCC>
+                            <totalNumberPortsSimultaneousNZP-CSI-RS-PerCC>32</totalNumberPortsSimultaneousNZP-CSI-RS-PerCC>
+                        </csi-RS-IM-ReceptionForFeedback>
+                        <csi-ReportFramework>
+                            <maxNumberPeriodicCSI-PerBWP-ForCSI-Report>2</maxNumberPeriodicCSI-PerBWP-ForCSI-Report>
+                            <maxNumberAperiodicCSI-PerBWP-ForCSI-Report>2</maxNumberAperiodicCSI-PerBWP-ForCSI-Report>
+                            <maxNumberSemiPersistentCSI-PerBWP-ForCSI-Report>0</maxNumberSemiPersistentCSI-PerBWP-ForCSI-Report>
+                            <maxNumberPeriodicCSI-PerBWP-ForBeamReport>2</maxNumberPeriodicCSI-PerBWP-ForBeamReport>
+                            <maxNumberAperiodicCSI-PerBWP-ForBeamReport>2</maxNumberAperiodicCSI-PerBWP-ForBeamReport>
+                            <maxNumberAperiodicCSI-triggeringStatePerCC><n63/></maxNumberAperiodicCSI-triggeringStatePerCC>
+                            <maxNumberSemiPersistentCSI-PerBWP-ForBeamReport>0</maxNumberSemiPersistentCSI-PerBWP-ForBeamReport>
+                            <simultaneousCSI-ReportsPerCC>4</simultaneousCSI-ReportsPerCC>
+                        </csi-ReportFramework>
+                        <csi-RS-ForTracking>
+                            <maxBurstLength>2</maxBurstLength>
+                            <maxSimultaneousResourceSetsPerCC>1</maxSimultaneousResourceSetsPerCC>
+                            <maxConfiguredResourceSetsPerCC>8</maxConfiguredResourceSetsPerCC>
+                            <maxConfiguredResourceSetsAllCC>16</maxConfiguredResourceSetsAllCC>
+                        </csi-RS-ForTracking>
+                    </ext1>
+                </mimo-ParametersPerBand>
+                <multipleTCI><supported/></multipleTCI>
+                <pusch-256QAM><supported/></pusch-256QAM>
+                <ue-PowerClass><pc2/></ue-PowerClass>
+                <channelBWs-DL>
+                    <fr1>
+                        <scs-15kHz>
+                            0000000000
+                        </scs-15kHz>
+                        <scs-30kHz>
+                            0001011111
+                        </scs-30kHz>
+                        <scs-60kHz>
+                            0000000000
+                        </scs-60kHz>
+                    </fr1>
+                </channelBWs-DL>
+                <channelBWs-UL>
+                    <fr1>
+                        <scs-15kHz>
+                            0000000000
+                        </scs-15kHz>
+                        <scs-30kHz>
+                            0001011111
+                        </scs-30kHz>
+                        <scs-60kHz>
+                            0000000000
+                        </scs-60kHz>
+                    </fr1>
+                </channelBWs-UL>
+                <ext1>
+                    <maxUplinkDutyCycle-PC2-FR1><n100/></maxUplinkDutyCycle-PC2-FR1>
+                </ext1>
+                <ext4>
+                    <channelBWs-DL-v1590>
+                        <fr1>
+                            <scs-30kHz>
+                                1000000000000000
+                            </scs-30kHz>
+                        </fr1>
+                    </channelBWs-DL-v1590>
+                    <channelBWs-UL-v1590>
+                        <fr1>
+                            <scs-30kHz>
+                                1000000000000000
+                            </scs-30kHz>
+                        </fr1>
+                    </channelBWs-UL-v1590>
+                </ext4>
+            </BandNR>
+        </supportedBandListNR>
+        <supportedBandCombinationList>
+            <BandCombination>
+                <bandList>
+                        <nr>
+                            <bandNR>78</bandNR>
+                            <ca-BandwidthClassDL-NR><a/></ca-BandwidthClassDL-NR>
+                            <ca-BandwidthClassUL-NR><a/></ca-BandwidthClassUL-NR>
+                        </nr>
+                </bandList>
+                <featureSetCombination>0</featureSetCombination>
+                <powerClass-v1530><pc2/></powerClass-v1530>
+            </BandCombination>
+        </supportedBandCombinationList>
+        <appliedFreqBandListFilter>
+                <bandInformationNR>
+                    <bandNR>78</bandNR>
+                </bandInformationNR>
+        </appliedFreqBandListFilter>
+        <ext1>
+            <supportedBandCombinationList-v1540>
+                <BandCombination-v1540>
+                    <bandList-v1540>
+                        <BandParameters-v1540>
+                            <srs-TxSwitch>
+                                <supportedSRS-TxPortSwitch><t2r4/></supportedSRS-TxPortSwitch>
+                            </srs-TxSwitch>
+                        </BandParameters-v1540>
+                    </bandList-v1540>
+                    <ca-ParametersNR-v1540>
+                        <csi-RS-IM-ReceptionForFeedbackPerBandComb>
+                            <maxNumberSimultaneousNZP-CSI-RS-ActBWP-AllCC>8</maxNumberSimultaneousNZP-CSI-RS-ActBWP-AllCC>
+                            <totalNumberPortsSimultaneousNZP-CSI-RS-ActBWP-AllCC>64</totalNumberPortsSimultaneousNZP-CSI-RS-ActBWP-AllCC>
+                        </csi-RS-IM-ReceptionForFeedbackPerBandComb>
+                        <simultaneousCSI-ReportsAllCC>8</simultaneousCSI-ReportsAllCC>
+                    </ca-ParametersNR-v1540>
+                </BandCombination-v1540>
+            </supportedBandCombinationList-v1540>
+        </ext1>
+    </rf-Parameters>
+    <measAndMobParameters>
+        <measAndMobParametersCommon>
+            <ssb-RLM><supported/></ssb-RLM>
+            <ext1>
+                <eventB-MeasAndReport><supported/></eventB-MeasAndReport>
+                <handoverFDD-TDD><supported/></handoverFDD-TDD>
+            </ext1>
+            <ext2>
+                <periodicEUTRA-MeasAndReport><supported/></periodicEUTRA-MeasAndReport>
+            </ext2>
+        </measAndMobParametersCommon>
+        <measAndMobParametersXDD-Diff>
+            <intraAndInterF-MeasAndReport><supported/></intraAndInterF-MeasAndReport>
+            <eventA-MeasAndReport><supported/></eventA-MeasAndReport>
+            <ext1>
+                <handoverInterF><supported/></handoverInterF>
+                <handoverLTE-EPC><supported/></handoverLTE-EPC>
+            </ext1>
+        </measAndMobParametersXDD-Diff>
+        <measAndMobParametersFRX-Diff>
+            <ss-SINR-Meas><supported/></ss-SINR-Meas>
+            <ext1>
+                <handoverInterF><supported/></handoverInterF>
+                <handoverLTE-EPC><supported/></handoverLTE-EPC>
+            </ext1>
+            <ext3>
+                <simultaneousRxDataSSB-DiffNumerology><supported/></simultaneousRxDataSSB-DiffNumerology>
+            </ext3>
+        </measAndMobParametersFRX-Diff>
+    </measAndMobParameters>
+    <featureSets>
+        <featureSetsDownlink>
+            <FeatureSetDownlink>
+                <featureSetListPerDownlinkCC>
+                    <FeatureSetDownlinkPerCC-Id>1</FeatureSetDownlinkPerCC-Id>
+                </featureSetListPerDownlinkCC>
+                <ue-SpecificUL-DL-Assignment><supported/></ue-SpecificUL-DL-Assignment>
+            </FeatureSetDownlink>
+            <FeatureSetDownlink>
+                <featureSetListPerDownlinkCC>
+                    <FeatureSetDownlinkPerCC-Id>2</FeatureSetDownlinkPerCC-Id>
+                </featureSetListPerDownlinkCC>
+                <ue-SpecificUL-DL-Assignment><supported/></ue-SpecificUL-DL-Assignment>
+            </FeatureSetDownlink>
+            <FeatureSetDownlink>
+                <featureSetListPerDownlinkCC>
+                    <FeatureSetDownlinkPerCC-Id>3</FeatureSetDownlinkPerCC-Id>
+                </featureSetListPerDownlinkCC>
+                <ue-SpecificUL-DL-Assignment><supported/></ue-SpecificUL-DL-Assignment>
+            </FeatureSetDownlink>
+            <FeatureSetDownlink>
+                <featureSetListPerDownlinkCC>
+                    <FeatureSetDownlinkPerCC-Id>4</FeatureSetDownlinkPerCC-Id>
+                </featureSetListPerDownlinkCC>
+                <ue-SpecificUL-DL-Assignment><supported/></ue-SpecificUL-DL-Assignment>
+            </FeatureSetDownlink>
+            <FeatureSetDownlink>
+                <featureSetListPerDownlinkCC>
+                    <FeatureSetDownlinkPerCC-Id>5</FeatureSetDownlinkPerCC-Id>
+                </featureSetListPerDownlinkCC>
+                <ue-SpecificUL-DL-Assignment><supported/></ue-SpecificUL-DL-Assignment>
+            </FeatureSetDownlink>
+            <FeatureSetDownlink>
+                <featureSetListPerDownlinkCC>
+                    <FeatureSetDownlinkPerCC-Id>6</FeatureSetDownlinkPerCC-Id>
+                </featureSetListPerDownlinkCC>
+                <ue-SpecificUL-DL-Assignment><supported/></ue-SpecificUL-DL-Assignment>
+            </FeatureSetDownlink>
+            <FeatureSetDownlink>
+                <featureSetListPerDownlinkCC>
+                    <FeatureSetDownlinkPerCC-Id>7</FeatureSetDownlinkPerCC-Id>
+                </featureSetListPerDownlinkCC>
+                <ue-SpecificUL-DL-Assignment><supported/></ue-SpecificUL-DL-Assignment>
+            </FeatureSetDownlink>
+            <FeatureSetDownlink>
+                <featureSetListPerDownlinkCC>
+                    <FeatureSetDownlinkPerCC-Id>8</FeatureSetDownlinkPerCC-Id>
+                </featureSetListPerDownlinkCC>
+                <ue-SpecificUL-DL-Assignment><supported/></ue-SpecificUL-DL-Assignment>
+            </FeatureSetDownlink>
+            <FeatureSetDownlink>
+                <featureSetListPerDownlinkCC>
+                    <FeatureSetDownlinkPerCC-Id>9</FeatureSetDownlinkPerCC-Id>
+                </featureSetListPerDownlinkCC>
+                <ue-SpecificUL-DL-Assignment><supported/></ue-SpecificUL-DL-Assignment>
+            </FeatureSetDownlink>
+            <FeatureSetDownlink>
+                <featureSetListPerDownlinkCC>
+                    <FeatureSetDownlinkPerCC-Id>10</FeatureSetDownlinkPerCC-Id>
+                </featureSetListPerDownlinkCC>
+                <ue-SpecificUL-DL-Assignment><supported/></ue-SpecificUL-DL-Assignment>
+            </FeatureSetDownlink>
+            <FeatureSetDownlink>
+                <featureSetListPerDownlinkCC>
+                    <FeatureSetDownlinkPerCC-Id>11</FeatureSetDownlinkPerCC-Id>
+                </featureSetListPerDownlinkCC>
+                <ue-SpecificUL-DL-Assignment><supported/></ue-SpecificUL-DL-Assignment>
+            </FeatureSetDownlink>
+            <FeatureSetDownlink>
+                <featureSetListPerDownlinkCC>
+                    <FeatureSetDownlinkPerCC-Id>12</FeatureSetDownlinkPerCC-Id>
+                </featureSetListPerDownlinkCC>
+                <ue-SpecificUL-DL-Assignment><supported/></ue-SpecificUL-DL-Assignment>
+            </FeatureSetDownlink>
+        </featureSetsDownlink>
+        <featureSetsDownlinkPerCC>
+            <FeatureSetDownlinkPerCC>
+                <supportedSubcarrierSpacingDL><kHz30/></supportedSubcarrierSpacingDL>
+                <supportedBandwidthDL>
+                    <fr1><mhz100/></fr1>
+                </supportedBandwidthDL>
+                <maxNumberMIMO-LayersPDSCH><fourLayers/></maxNumberMIMO-LayersPDSCH>
+                <supportedModulationOrderDL><qam256/></supportedModulationOrderDL>
+            </FeatureSetDownlinkPerCC>
+            <FeatureSetDownlinkPerCC>
+                <supportedSubcarrierSpacingDL><kHz30/></supportedSubcarrierSpacingDL>
+                <supportedBandwidthDL>
+                    <fr1><mhz100/></fr1>
+                </supportedBandwidthDL>
+                <channelBW-90mhz><supported/></channelBW-90mhz>
+                <maxNumberMIMO-LayersPDSCH><fourLayers/></maxNumberMIMO-LayersPDSCH>
+                <supportedModulationOrderDL><qam256/></supportedModulationOrderDL>
+            </FeatureSetDownlinkPerCC>
+            <FeatureSetDownlinkPerCC>
+                <supportedSubcarrierSpacingDL><kHz15/></supportedSubcarrierSpacingDL>
+                <supportedBandwidthDL>
+                    <fr1><mhz20/></fr1>
+                </supportedBandwidthDL>
+                <maxNumberMIMO-LayersPDSCH><twoLayers/></maxNumberMIMO-LayersPDSCH>
+                <supportedModulationOrderDL><qam256/></supportedModulationOrderDL>
+            </FeatureSetDownlinkPerCC>
+            <FeatureSetDownlinkPerCC>
+                <supportedSubcarrierSpacingDL><kHz15/></supportedSubcarrierSpacingDL>
+                <supportedBandwidthDL>
+                    <fr1><mhz40/></fr1>
+                </supportedBandwidthDL>
+                <maxNumberMIMO-LayersPDSCH><fourLayers/></maxNumberMIMO-LayersPDSCH>
+                <supportedModulationOrderDL><qam256/></supportedModulationOrderDL>
+            </FeatureSetDownlinkPerCC>
+            <FeatureSetDownlinkPerCC>
+                <supportedSubcarrierSpacingDL><kHz30/></supportedSubcarrierSpacingDL>
+                <supportedBandwidthDL>
+                    <fr1><mhz40/></fr1>
+                </supportedBandwidthDL>
+                <maxNumberMIMO-LayersPDSCH><fourLayers/></maxNumberMIMO-LayersPDSCH>
+                <supportedModulationOrderDL><qam256/></supportedModulationOrderDL>
+            </FeatureSetDownlinkPerCC>
+            <FeatureSetDownlinkPerCC>
+                <supportedSubcarrierSpacingDL><kHz30/></supportedSubcarrierSpacingDL>
+                <supportedBandwidthDL>
+                    <fr1><mhz80/></fr1>
+                </supportedBandwidthDL>
+                <maxNumberMIMO-LayersPDSCH><fourLayers/></maxNumberMIMO-LayersPDSCH>
+                <supportedModulationOrderDL><qam256/></supportedModulationOrderDL>
+            </FeatureSetDownlinkPerCC>
+            <FeatureSetDownlinkPerCC>
+                <supportedSubcarrierSpacingDL><kHz30/></supportedSubcarrierSpacingDL>
+                <supportedBandwidthDL>
+                    <fr1><mhz20/></fr1>
+                </supportedBandwidthDL>
+                <maxNumberMIMO-LayersPDSCH><fourLayers/></maxNumberMIMO-LayersPDSCH>
+                <supportedModulationOrderDL><qam256/></supportedModulationOrderDL>
+            </FeatureSetDownlinkPerCC>
+            <FeatureSetDownlinkPerCC>
+                <supportedSubcarrierSpacingDL><kHz15/></supportedSubcarrierSpacingDL>
+                <supportedBandwidthDL>
+                    <fr1><mhz30/></fr1>
+                </supportedBandwidthDL>
+                <maxNumberMIMO-LayersPDSCH><twoLayers/></maxNumberMIMO-LayersPDSCH>
+                <supportedModulationOrderDL><qam256/></supportedModulationOrderDL>
+            </FeatureSetDownlinkPerCC>
+            <FeatureSetDownlinkPerCC>
+                <supportedSubcarrierSpacingDL><kHz15/></supportedSubcarrierSpacingDL>
+                <supportedBandwidthDL>
+                    <fr1><mhz20/></fr1>
+                </supportedBandwidthDL>
+                <maxNumberMIMO-LayersPDSCH><fourLayers/></maxNumberMIMO-LayersPDSCH>
+                <supportedModulationOrderDL><qam256/></supportedModulationOrderDL>
+            </FeatureSetDownlinkPerCC>
+            <FeatureSetDownlinkPerCC>
+                <supportedSubcarrierSpacingDL><kHz15/></supportedSubcarrierSpacingDL>
+                <supportedBandwidthDL>
+                    <fr1><mhz15/></fr1>
+                </supportedBandwidthDL>
+                <maxNumberMIMO-LayersPDSCH><twoLayers/></maxNumberMIMO-LayersPDSCH>
+                <supportedModulationOrderDL><qam256/></supportedModulationOrderDL>
+            </FeatureSetDownlinkPerCC>
+            <FeatureSetDownlinkPerCC>
+                <supportedSubcarrierSpacingDL><kHz15/></supportedSubcarrierSpacingDL>
+                <supportedBandwidthDL>
+                    <fr1><mhz30/></fr1>
+                </supportedBandwidthDL>
+                <maxNumberMIMO-LayersPDSCH><fourLayers/></maxNumberMIMO-LayersPDSCH>
+                <supportedModulationOrderDL><qam256/></supportedModulationOrderDL>
+            </FeatureSetDownlinkPerCC>
+            <FeatureSetDownlinkPerCC>
+                <supportedSubcarrierSpacingDL><kHz30/></supportedSubcarrierSpacingDL>
+                <supportedBandwidthDL>
+                    <fr1><mhz60/></fr1>
+                </supportedBandwidthDL>
+                <maxNumberMIMO-LayersPDSCH><fourLayers/></maxNumberMIMO-LayersPDSCH>
+                <supportedModulationOrderDL><qam256/></supportedModulationOrderDL>
+            </FeatureSetDownlinkPerCC>
+        </featureSetsDownlinkPerCC>
+        <featureSetsUplink>
+            <FeatureSetUplink>
+                <featureSetListPerUplinkCC>
+                    <FeatureSetUplinkPerCC-Id>1</FeatureSetUplinkPerCC-Id>
+                </featureSetListPerUplinkCC>
+                <supportedSRS-Resources>
+                    <maxNumberAperiodicSRS-PerBWP><n16/></maxNumberAperiodicSRS-PerBWP>
+                    <maxNumberAperiodicSRS-PerBWP-PerSlot>6</maxNumberAperiodicSRS-PerBWP-PerSlot>
+                    <maxNumberPeriodicSRS-PerBWP><n16/></maxNumberPeriodicSRS-PerBWP>
+                    <maxNumberPeriodicSRS-PerBWP-PerSlot>6</maxNumberPeriodicSRS-PerBWP-PerSlot>
+                    <maxNumberSemiPersistentSRS-PerBWP><n2/></maxNumberSemiPersistentSRS-PerBWP>
+                    <maxNumberSemiPersistentSRS-PerBWP-PerSlot>2</maxNumberSemiPersistentSRS-PerBWP-PerSlot>
+                    <maxNumberSRS-Ports-PerResource><n1/></maxNumberSRS-Ports-PerResource>
+                </supportedSRS-Resources>
+            </FeatureSetUplink>
+            <FeatureSetUplink>
+                <featureSetListPerUplinkCC>
+                    <FeatureSetUplinkPerCC-Id>2</FeatureSetUplinkPerCC-Id>
+                </featureSetListPerUplinkCC>
+                <supportedSRS-Resources>
+                    <maxNumberAperiodicSRS-PerBWP><n16/></maxNumberAperiodicSRS-PerBWP>
+                    <maxNumberAperiodicSRS-PerBWP-PerSlot>6</maxNumberAperiodicSRS-PerBWP-PerSlot>
+                    <maxNumberPeriodicSRS-PerBWP><n16/></maxNumberPeriodicSRS-PerBWP>
+                    <maxNumberPeriodicSRS-PerBWP-PerSlot>6</maxNumberPeriodicSRS-PerBWP-PerSlot>
+                    <maxNumberSemiPersistentSRS-PerBWP><n2/></maxNumberSemiPersistentSRS-PerBWP>
+                    <maxNumberSemiPersistentSRS-PerBWP-PerSlot>2</maxNumberSemiPersistentSRS-PerBWP-PerSlot>
+                    <maxNumberSRS-Ports-PerResource><n1/></maxNumberSRS-Ports-PerResource>
+                </supportedSRS-Resources>
+            </FeatureSetUplink>
+            <FeatureSetUplink>
+                <featureSetListPerUplinkCC>
+                    <FeatureSetUplinkPerCC-Id>3</FeatureSetUplinkPerCC-Id>
+                </featureSetListPerUplinkCC>
+                <supportedSRS-Resources>
+                    <maxNumberAperiodicSRS-PerBWP><n16/></maxNumberAperiodicSRS-PerBWP>
+                    <maxNumberAperiodicSRS-PerBWP-PerSlot>6</maxNumberAperiodicSRS-PerBWP-PerSlot>
+                    <maxNumberPeriodicSRS-PerBWP><n16/></maxNumberPeriodicSRS-PerBWP>
+                    <maxNumberPeriodicSRS-PerBWP-PerSlot>6</maxNumberPeriodicSRS-PerBWP-PerSlot>
+                    <maxNumberSemiPersistentSRS-PerBWP><n2/></maxNumberSemiPersistentSRS-PerBWP>
+                    <maxNumberSemiPersistentSRS-PerBWP-PerSlot>2</maxNumberSemiPersistentSRS-PerBWP-PerSlot>
+                    <maxNumberSRS-Ports-PerResource><n1/></maxNumberSRS-Ports-PerResource>
+                </supportedSRS-Resources>
+            </FeatureSetUplink>
+            <FeatureSetUplink>
+                <featureSetListPerUplinkCC>
+                    <FeatureSetUplinkPerCC-Id>4</FeatureSetUplinkPerCC-Id>
+                </featureSetListPerUplinkCC>
+                <supportedSRS-Resources>
+                    <maxNumberAperiodicSRS-PerBWP><n16/></maxNumberAperiodicSRS-PerBWP>
+                    <maxNumberAperiodicSRS-PerBWP-PerSlot>6</maxNumberAperiodicSRS-PerBWP-PerSlot>
+                    <maxNumberPeriodicSRS-PerBWP><n16/></maxNumberPeriodicSRS-PerBWP>
+                    <maxNumberPeriodicSRS-PerBWP-PerSlot>6</maxNumberPeriodicSRS-PerBWP-PerSlot>
+                    <maxNumberSemiPersistentSRS-PerBWP><n2/></maxNumberSemiPersistentSRS-PerBWP>
+                    <maxNumberSemiPersistentSRS-PerBWP-PerSlot>2</maxNumberSemiPersistentSRS-PerBWP-PerSlot>
+                    <maxNumberSRS-Ports-PerResource><n1/></maxNumberSRS-Ports-PerResource>
+                </supportedSRS-Resources>
+            </FeatureSetUplink>
+            <FeatureSetUplink>
+                <featureSetListPerUplinkCC>
+                    <FeatureSetUplinkPerCC-Id>5</FeatureSetUplinkPerCC-Id>
+                </featureSetListPerUplinkCC>
+                <supportedSRS-Resources>
+                    <maxNumberAperiodicSRS-PerBWP><n16/></maxNumberAperiodicSRS-PerBWP>
+                    <maxNumberAperiodicSRS-PerBWP-PerSlot>6</maxNumberAperiodicSRS-PerBWP-PerSlot>
+                    <maxNumberPeriodicSRS-PerBWP><n16/></maxNumberPeriodicSRS-PerBWP>
+                    <maxNumberPeriodicSRS-PerBWP-PerSlot>6</maxNumberPeriodicSRS-PerBWP-PerSlot>
+                    <maxNumberSemiPersistentSRS-PerBWP><n2/></maxNumberSemiPersistentSRS-PerBWP>
+                    <maxNumberSemiPersistentSRS-PerBWP-PerSlot>2</maxNumberSemiPersistentSRS-PerBWP-PerSlot>
+                    <maxNumberSRS-Ports-PerResource><n1/></maxNumberSRS-Ports-PerResource>
+                </supportedSRS-Resources>
+            </FeatureSetUplink>
+            <FeatureSetUplink>
+                <featureSetListPerUplinkCC>
+                    <FeatureSetUplinkPerCC-Id>6</FeatureSetUplinkPerCC-Id>
+                </featureSetListPerUplinkCC>
+                <supportedSRS-Resources>
+                    <maxNumberAperiodicSRS-PerBWP><n16/></maxNumberAperiodicSRS-PerBWP>
+                    <maxNumberAperiodicSRS-PerBWP-PerSlot>6</maxNumberAperiodicSRS-PerBWP-PerSlot>
+                    <maxNumberPeriodicSRS-PerBWP><n16/></maxNumberPeriodicSRS-PerBWP>
+                    <maxNumberPeriodicSRS-PerBWP-PerSlot>6</maxNumberPeriodicSRS-PerBWP-PerSlot>
+                    <maxNumberSemiPersistentSRS-PerBWP><n2/></maxNumberSemiPersistentSRS-PerBWP>
+                    <maxNumberSemiPersistentSRS-PerBWP-PerSlot>2</maxNumberSemiPersistentSRS-PerBWP-PerSlot>
+                    <maxNumberSRS-Ports-PerResource><n1/></maxNumberSRS-Ports-PerResource>
+                </supportedSRS-Resources>
+            </FeatureSetUplink>
+            <FeatureSetUplink>
+                <featureSetListPerUplinkCC>
+                    <FeatureSetUplinkPerCC-Id>7</FeatureSetUplinkPerCC-Id>
+                </featureSetListPerUplinkCC>
+                <supportedSRS-Resources>
+                    <maxNumberAperiodicSRS-PerBWP><n16/></maxNumberAperiodicSRS-PerBWP>
+                    <maxNumberAperiodicSRS-PerBWP-PerSlot>6</maxNumberAperiodicSRS-PerBWP-PerSlot>
+                    <maxNumberPeriodicSRS-PerBWP><n16/></maxNumberPeriodicSRS-PerBWP>
+                    <maxNumberPeriodicSRS-PerBWP-PerSlot>6</maxNumberPeriodicSRS-PerBWP-PerSlot>
+                    <maxNumberSemiPersistentSRS-PerBWP><n2/></maxNumberSemiPersistentSRS-PerBWP>
+                    <maxNumberSemiPersistentSRS-PerBWP-PerSlot>2</maxNumberSemiPersistentSRS-PerBWP-PerSlot>
+                    <maxNumberSRS-Ports-PerResource><n1/></maxNumberSRS-Ports-PerResource>
+                </supportedSRS-Resources>
+            </FeatureSetUplink>
+            <FeatureSetUplink>
+                <featureSetListPerUplinkCC>
+                    <FeatureSetUplinkPerCC-Id>8</FeatureSetUplinkPerCC-Id>
+                </featureSetListPerUplinkCC>
+                <supportedSRS-Resources>
+                    <maxNumberAperiodicSRS-PerBWP><n16/></maxNumberAperiodicSRS-PerBWP>
+                    <maxNumberAperiodicSRS-PerBWP-PerSlot>6</maxNumberAperiodicSRS-PerBWP-PerSlot>
+                    <maxNumberPeriodicSRS-PerBWP><n16/></maxNumberPeriodicSRS-PerBWP>
+                    <maxNumberPeriodicSRS-PerBWP-PerSlot>6</maxNumberPeriodicSRS-PerBWP-PerSlot>
+                    <maxNumberSemiPersistentSRS-PerBWP><n2/></maxNumberSemiPersistentSRS-PerBWP>
+                    <maxNumberSemiPersistentSRS-PerBWP-PerSlot>2</maxNumberSemiPersistentSRS-PerBWP-PerSlot>
+                    <maxNumberSRS-Ports-PerResource><n1/></maxNumberSRS-Ports-PerResource>
+                </supportedSRS-Resources>
+            </FeatureSetUplink>
+            <FeatureSetUplink>
+                <featureSetListPerUplinkCC>
+                    <FeatureSetUplinkPerCC-Id>9</FeatureSetUplinkPerCC-Id>
+                </featureSetListPerUplinkCC>
+                <supportedSRS-Resources>
+                    <maxNumberAperiodicSRS-PerBWP><n16/></maxNumberAperiodicSRS-PerBWP>
+                    <maxNumberAperiodicSRS-PerBWP-PerSlot>6</maxNumberAperiodicSRS-PerBWP-PerSlot>
+                    <maxNumberPeriodicSRS-PerBWP><n16/></maxNumberPeriodicSRS-PerBWP>
+                    <maxNumberPeriodicSRS-PerBWP-PerSlot>6</maxNumberPeriodicSRS-PerBWP-PerSlot>
+                    <maxNumberSemiPersistentSRS-PerBWP><n2/></maxNumberSemiPersistentSRS-PerBWP>
+                    <maxNumberSemiPersistentSRS-PerBWP-PerSlot>2</maxNumberSemiPersistentSRS-PerBWP-PerSlot>
+                    <maxNumberSRS-Ports-PerResource><n1/></maxNumberSRS-Ports-PerResource>
+                </supportedSRS-Resources>
+            </FeatureSetUplink>
+            <FeatureSetUplink>
+                <featureSetListPerUplinkCC>
+                    <FeatureSetUplinkPerCC-Id>10</FeatureSetUplinkPerCC-Id>
+                </featureSetListPerUplinkCC>
+                <supportedSRS-Resources>
+                    <maxNumberAperiodicSRS-PerBWP><n16/></maxNumberAperiodicSRS-PerBWP>
+                    <maxNumberAperiodicSRS-PerBWP-PerSlot>6</maxNumberAperiodicSRS-PerBWP-PerSlot>
+                    <maxNumberPeriodicSRS-PerBWP><n16/></maxNumberPeriodicSRS-PerBWP>
+                    <maxNumberPeriodicSRS-PerBWP-PerSlot>6</maxNumberPeriodicSRS-PerBWP-PerSlot>
+                    <maxNumberSemiPersistentSRS-PerBWP><n2/></maxNumberSemiPersistentSRS-PerBWP>
+                    <maxNumberSemiPersistentSRS-PerBWP-PerSlot>2</maxNumberSemiPersistentSRS-PerBWP-PerSlot>
+                    <maxNumberSRS-Ports-PerResource><n1/></maxNumberSRS-Ports-PerResource>
+                </supportedSRS-Resources>
+            </FeatureSetUplink>
+            <FeatureSetUplink>
+                <featureSetListPerUplinkCC>
+                    <FeatureSetUplinkPerCC-Id>11</FeatureSetUplinkPerCC-Id>
+                </featureSetListPerUplinkCC>
+                <supportedSRS-Resources>
+                    <maxNumberAperiodicSRS-PerBWP><n16/></maxNumberAperiodicSRS-PerBWP>
+                    <maxNumberAperiodicSRS-PerBWP-PerSlot>6</maxNumberAperiodicSRS-PerBWP-PerSlot>
+                    <maxNumberPeriodicSRS-PerBWP><n16/></maxNumberPeriodicSRS-PerBWP>
+                    <maxNumberPeriodicSRS-PerBWP-PerSlot>6</maxNumberPeriodicSRS-PerBWP-PerSlot>
+                    <maxNumberSemiPersistentSRS-PerBWP><n2/></maxNumberSemiPersistentSRS-PerBWP>
+                    <maxNumberSemiPersistentSRS-PerBWP-PerSlot>2</maxNumberSemiPersistentSRS-PerBWP-PerSlot>
+                    <maxNumberSRS-Ports-PerResource><n1/></maxNumberSRS-Ports-PerResource>
+                </supportedSRS-Resources>
+            </FeatureSetUplink>
+            <FeatureSetUplink>
+                <featureSetListPerUplinkCC>
+                    <FeatureSetUplinkPerCC-Id>12</FeatureSetUplinkPerCC-Id>
+                </featureSetListPerUplinkCC>
+                <supportedSRS-Resources>
+                    <maxNumberAperiodicSRS-PerBWP><n16/></maxNumberAperiodicSRS-PerBWP>
+                    <maxNumberAperiodicSRS-PerBWP-PerSlot>6</maxNumberAperiodicSRS-PerBWP-PerSlot>
+                    <maxNumberPeriodicSRS-PerBWP><n16/></maxNumberPeriodicSRS-PerBWP>
+                    <maxNumberPeriodicSRS-PerBWP-PerSlot>6</maxNumberPeriodicSRS-PerBWP-PerSlot>
+                    <maxNumberSemiPersistentSRS-PerBWP><n2/></maxNumberSemiPersistentSRS-PerBWP>
+                    <maxNumberSemiPersistentSRS-PerBWP-PerSlot>2</maxNumberSemiPersistentSRS-PerBWP-PerSlot>
+                    <maxNumberSRS-Ports-PerResource><n1/></maxNumberSRS-Ports-PerResource>
+                </supportedSRS-Resources>
+            </FeatureSetUplink>
+            <FeatureSetUplink>
+                <featureSetListPerUplinkCC>
+                    <FeatureSetUplinkPerCC-Id>11</FeatureSetUplinkPerCC-Id>
+                </featureSetListPerUplinkCC>
+                <supportedSRS-Resources>
+                    <maxNumberAperiodicSRS-PerBWP><n1/></maxNumberAperiodicSRS-PerBWP>
+                    <maxNumberAperiodicSRS-PerBWP-PerSlot>6</maxNumberAperiodicSRS-PerBWP-PerSlot>
+                    <maxNumberPeriodicSRS-PerBWP><n16/></maxNumberPeriodicSRS-PerBWP>
+                    <maxNumberPeriodicSRS-PerBWP-PerSlot>6</maxNumberPeriodicSRS-PerBWP-PerSlot>
+                    <maxNumberSemiPersistentSRS-PerBWP><n2/></maxNumberSemiPersistentSRS-PerBWP>
+                    <maxNumberSemiPersistentSRS-PerBWP-PerSlot>2</maxNumberSemiPersistentSRS-PerBWP-PerSlot>
+                    <maxNumberSRS-Ports-PerResource><n1/></maxNumberSRS-Ports-PerResource>
+                </supportedSRS-Resources>
+            </FeatureSetUplink>
+        </featureSetsUplink>
+        <featureSetsUplinkPerCC>
+            <FeatureSetUplinkPerCC>
+                <supportedSubcarrierSpacingUL><kHz30/></supportedSubcarrierSpacingUL>
+                <supportedBandwidthUL>
+                    <fr1><mhz100/></fr1>
+                </supportedBandwidthUL>
+                <mimo-CB-PUSCH>
+                    <maxNumberMIMO-LayersCB-PUSCH><oneLayer/></maxNumberMIMO-LayersCB-PUSCH>
+                    <maxNumberSRS-ResourcePerSet>1</maxNumberSRS-ResourcePerSet>
+                </mimo-CB-PUSCH>
+                <supportedModulationOrderUL><qam256/></supportedModulationOrderUL>
+            </FeatureSetUplinkPerCC>
+            <FeatureSetUplinkPerCC>
+                <supportedSubcarrierSpacingUL><kHz30/></supportedSubcarrierSpacingUL>
+                <supportedBandwidthUL>
+                    <fr1><mhz100/></fr1>
+                </supportedBandwidthUL>
+                <channelBW-90mhz><supported/></channelBW-90mhz>
+                <mimo-CB-PUSCH>
+                    <maxNumberMIMO-LayersCB-PUSCH><oneLayer/></maxNumberMIMO-LayersCB-PUSCH>
+                    <maxNumberSRS-ResourcePerSet>1</maxNumberSRS-ResourcePerSet>
+                </mimo-CB-PUSCH>
+                <supportedModulationOrderUL><qam256/></supportedModulationOrderUL>
+            </FeatureSetUplinkPerCC>
+            <FeatureSetUplinkPerCC>
+                <supportedSubcarrierSpacingUL><kHz15/></supportedSubcarrierSpacingUL>
+                <supportedBandwidthUL>
+                    <fr1><mhz20/></fr1>
+                </supportedBandwidthUL>
+                <mimo-CB-PUSCH>
+                    <maxNumberMIMO-LayersCB-PUSCH><oneLayer/></maxNumberMIMO-LayersCB-PUSCH>
+                    <maxNumberSRS-ResourcePerSet>1</maxNumberSRS-ResourcePerSet>
+                </mimo-CB-PUSCH>
+                <supportedModulationOrderUL><qam256/></supportedModulationOrderUL>
+            </FeatureSetUplinkPerCC>
+            <FeatureSetUplinkPerCC>
+                <supportedSubcarrierSpacingUL><kHz15/></supportedSubcarrierSpacingUL>
+                <supportedBandwidthUL>
+                    <fr1><mhz40/></fr1>
+                </supportedBandwidthUL>
+                <mimo-CB-PUSCH>
+                    <maxNumberMIMO-LayersCB-PUSCH><oneLayer/></maxNumberMIMO-LayersCB-PUSCH>
+                    <maxNumberSRS-ResourcePerSet>1</maxNumberSRS-ResourcePerSet>
+                </mimo-CB-PUSCH>
+                <supportedModulationOrderUL><qam256/></supportedModulationOrderUL>
+            </FeatureSetUplinkPerCC>
+            <FeatureSetUplinkPerCC>
+                <supportedSubcarrierSpacingUL><kHz30/></supportedSubcarrierSpacingUL>
+                <supportedBandwidthUL>
+                    <fr1><mhz40/></fr1>
+                </supportedBandwidthUL>
+                <mimo-CB-PUSCH>
+                    <maxNumberMIMO-LayersCB-PUSCH><oneLayer/></maxNumberMIMO-LayersCB-PUSCH>
+                    <maxNumberSRS-ResourcePerSet>1</maxNumberSRS-ResourcePerSet>
+                </mimo-CB-PUSCH>
+                <supportedModulationOrderUL><qam256/></supportedModulationOrderUL>
+            </FeatureSetUplinkPerCC>
+            <FeatureSetUplinkPerCC>
+                <supportedSubcarrierSpacingUL><kHz30/></supportedSubcarrierSpacingUL>
+                <supportedBandwidthUL>
+                    <fr1><mhz80/></fr1>
+                </supportedBandwidthUL>
+                <mimo-CB-PUSCH>
+                    <maxNumberMIMO-LayersCB-PUSCH><oneLayer/></maxNumberMIMO-LayersCB-PUSCH>
+                    <maxNumberSRS-ResourcePerSet>1</maxNumberSRS-ResourcePerSet>
+                </mimo-CB-PUSCH>
+                <supportedModulationOrderUL><qam256/></supportedModulationOrderUL>
+            </FeatureSetUplinkPerCC>
+            <FeatureSetUplinkPerCC>
+                <supportedSubcarrierSpacingUL><kHz30/></supportedSubcarrierSpacingUL>
+                <supportedBandwidthUL>
+                    <fr1><mhz20/></fr1>
+                </supportedBandwidthUL>
+                <mimo-CB-PUSCH>
+                    <maxNumberMIMO-LayersCB-PUSCH><oneLayer/></maxNumberMIMO-LayersCB-PUSCH>
+                    <maxNumberSRS-ResourcePerSet>1</maxNumberSRS-ResourcePerSet>
+                </mimo-CB-PUSCH>
+                <supportedModulationOrderUL><qam256/></supportedModulationOrderUL>
+            </FeatureSetUplinkPerCC>
+            <FeatureSetUplinkPerCC>
+                <supportedSubcarrierSpacingUL><kHz15/></supportedSubcarrierSpacingUL>
+                <supportedBandwidthUL>
+                    <fr1><mhz30/></fr1>
+                </supportedBandwidthUL>
+                <mimo-CB-PUSCH>
+                    <maxNumberMIMO-LayersCB-PUSCH><oneLayer/></maxNumberMIMO-LayersCB-PUSCH>
+                    <maxNumberSRS-ResourcePerSet>1</maxNumberSRS-ResourcePerSet>
+                </mimo-CB-PUSCH>
+                <supportedModulationOrderUL><qam256/></supportedModulationOrderUL>
+            </FeatureSetUplinkPerCC>
+            <FeatureSetUplinkPerCC>
+                <supportedSubcarrierSpacingUL><kHz15/></supportedSubcarrierSpacingUL>
+                <supportedBandwidthUL>
+                    <fr1><mhz15/></fr1>
+                </supportedBandwidthUL>
+                <mimo-CB-PUSCH>
+                    <maxNumberMIMO-LayersCB-PUSCH><oneLayer/></maxNumberMIMO-LayersCB-PUSCH>
+                    <maxNumberSRS-ResourcePerSet>1</maxNumberSRS-ResourcePerSet>
+                </mimo-CB-PUSCH>
+                <supportedModulationOrderUL><qam256/></supportedModulationOrderUL>
+            </FeatureSetUplinkPerCC>
+            <FeatureSetUplinkPerCC>
+                <supportedSubcarrierSpacingUL><kHz30/></supportedSubcarrierSpacingUL>
+                <supportedBandwidthUL>
+                    <fr1><mhz100/></fr1>
+                </supportedBandwidthUL>
+                <mimo-CB-PUSCH>
+                    <maxNumberMIMO-LayersCB-PUSCH><oneLayer/></maxNumberMIMO-LayersCB-PUSCH>
+                    <maxNumberSRS-ResourcePerSet>1</maxNumberSRS-ResourcePerSet>
+                </mimo-CB-PUSCH>
+                <supportedModulationOrderUL><qam256/></supportedModulationOrderUL>
+            </FeatureSetUplinkPerCC>
+            <FeatureSetUplinkPerCC>
+                <supportedSubcarrierSpacingUL><kHz30/></supportedSubcarrierSpacingUL>
+                <supportedBandwidthUL>
+                    <fr1><mhz100/></fr1>
+                </supportedBandwidthUL>
+                <channelBW-90mhz><supported/></channelBW-90mhz>
+                <mimo-CB-PUSCH>
+                    <maxNumberMIMO-LayersCB-PUSCH><oneLayer/></maxNumberMIMO-LayersCB-PUSCH>
+                    <maxNumberSRS-ResourcePerSet>1</maxNumberSRS-ResourcePerSet>
+                </mimo-CB-PUSCH>
+                <supportedModulationOrderUL><qam256/></supportedModulationOrderUL>
+            </FeatureSetUplinkPerCC>
+            <FeatureSetUplinkPerCC>
+                <supportedSubcarrierSpacingUL><kHz30/></supportedSubcarrierSpacingUL>
+                <supportedBandwidthUL>
+                    <fr1><mhz60/></fr1>
+                </supportedBandwidthUL>
+                <mimo-CB-PUSCH>
+                    <maxNumberMIMO-LayersCB-PUSCH><oneLayer/></maxNumberMIMO-LayersCB-PUSCH>
+                    <maxNumberSRS-ResourcePerSet>1</maxNumberSRS-ResourcePerSet>
+                </mimo-CB-PUSCH>
+                <supportedModulationOrderUL><qam256/></supportedModulationOrderUL>
+            </FeatureSetUplinkPerCC>
+        </featureSetsUplinkPerCC>
+        <ext1>
+            <featureSetsDownlink-v1540>
+                <FeatureSetDownlink-v1540>
+                    <oneFL-DMRS-TwoAdditionalDMRS-DL><supported/></oneFL-DMRS-TwoAdditionalDMRS-DL>
+                    <twoFL-DMRS-TwoAdditionalDMRS-DL><supported/></twoFL-DMRS-TwoAdditionalDMRS-DL>
+                </FeatureSetDownlink-v1540>
+                <FeatureSetDownlink-v1540>
+                    <oneFL-DMRS-TwoAdditionalDMRS-DL><supported/></oneFL-DMRS-TwoAdditionalDMRS-DL>
+                    <twoFL-DMRS-TwoAdditionalDMRS-DL><supported/></twoFL-DMRS-TwoAdditionalDMRS-DL>
+                </FeatureSetDownlink-v1540>
+                <FeatureSetDownlink-v1540>
+                    <oneFL-DMRS-TwoAdditionalDMRS-DL><supported/></oneFL-DMRS-TwoAdditionalDMRS-DL>
+                    <twoFL-DMRS-TwoAdditionalDMRS-DL><supported/></twoFL-DMRS-TwoAdditionalDMRS-DL>
+                </FeatureSetDownlink-v1540>
+                <FeatureSetDownlink-v1540>
+                    <oneFL-DMRS-TwoAdditionalDMRS-DL><supported/></oneFL-DMRS-TwoAdditionalDMRS-DL>
+                    <twoFL-DMRS-TwoAdditionalDMRS-DL><supported/></twoFL-DMRS-TwoAdditionalDMRS-DL>
+                </FeatureSetDownlink-v1540>
+                <FeatureSetDownlink-v1540>
+                    <oneFL-DMRS-TwoAdditionalDMRS-DL><supported/></oneFL-DMRS-TwoAdditionalDMRS-DL>
+                    <twoFL-DMRS-TwoAdditionalDMRS-DL><supported/></twoFL-DMRS-TwoAdditionalDMRS-DL>
+                </FeatureSetDownlink-v1540>
+                <FeatureSetDownlink-v1540>
+                    <oneFL-DMRS-TwoAdditionalDMRS-DL><supported/></oneFL-DMRS-TwoAdditionalDMRS-DL>
+                    <twoFL-DMRS-TwoAdditionalDMRS-DL><supported/></twoFL-DMRS-TwoAdditionalDMRS-DL>
+                </FeatureSetDownlink-v1540>
+                <FeatureSetDownlink-v1540>
+                    <oneFL-DMRS-TwoAdditionalDMRS-DL><supported/></oneFL-DMRS-TwoAdditionalDMRS-DL>
+                    <twoFL-DMRS-TwoAdditionalDMRS-DL><supported/></twoFL-DMRS-TwoAdditionalDMRS-DL>
+                </FeatureSetDownlink-v1540>
+                <FeatureSetDownlink-v1540>
+                    <oneFL-DMRS-TwoAdditionalDMRS-DL><supported/></oneFL-DMRS-TwoAdditionalDMRS-DL>
+                    <twoFL-DMRS-TwoAdditionalDMRS-DL><supported/></twoFL-DMRS-TwoAdditionalDMRS-DL>
+                </FeatureSetDownlink-v1540>
+                <FeatureSetDownlink-v1540>
+                    <oneFL-DMRS-TwoAdditionalDMRS-DL><supported/></oneFL-DMRS-TwoAdditionalDMRS-DL>
+                    <twoFL-DMRS-TwoAdditionalDMRS-DL><supported/></twoFL-DMRS-TwoAdditionalDMRS-DL>
+                </FeatureSetDownlink-v1540>
+                <FeatureSetDownlink-v1540>
+                    <oneFL-DMRS-TwoAdditionalDMRS-DL><supported/></oneFL-DMRS-TwoAdditionalDMRS-DL>
+                    <twoFL-DMRS-TwoAdditionalDMRS-DL><supported/></twoFL-DMRS-TwoAdditionalDMRS-DL>
+                </FeatureSetDownlink-v1540>
+                <FeatureSetDownlink-v1540>
+                    <oneFL-DMRS-TwoAdditionalDMRS-DL><supported/></oneFL-DMRS-TwoAdditionalDMRS-DL>
+                    <twoFL-DMRS-TwoAdditionalDMRS-DL><supported/></twoFL-DMRS-TwoAdditionalDMRS-DL>
+                </FeatureSetDownlink-v1540>
+                <FeatureSetDownlink-v1540>
+                    <oneFL-DMRS-TwoAdditionalDMRS-DL><supported/></oneFL-DMRS-TwoAdditionalDMRS-DL>
+                    <twoFL-DMRS-TwoAdditionalDMRS-DL><supported/></twoFL-DMRS-TwoAdditionalDMRS-DL>
+                </FeatureSetDownlink-v1540>
+            </featureSetsDownlink-v1540>
+        </ext1>
+    </featureSets>
+    <featureSetCombinations>
+        <FeatureSetCombination>
+            <FeatureSetsPerBand>
+                    <nr>
+                        <downlinkSetNR>2</downlinkSetNR>
+                        <uplinkSetNR>2</uplinkSetNR>
+                    </nr>
+            </FeatureSetsPerBand>
+        </FeatureSetCombination>
+    </featureSetCombinations>
+    <nonCriticalExtension>
+        <interRAT-Parameters>
+            <eutra>
+                <supportedBandListEUTRA>
+                    <FreqBandIndicatorEUTRA>7</FreqBandIndicatorEUTRA>
+                    <FreqBandIndicatorEUTRA>38</FreqBandIndicatorEUTRA>
+                </supportedBandListEUTRA>
+                <eutra-ParametersCommon>
+                    <mfbi-EUTRA><supported/></mfbi-EUTRA>
+                </eutra-ParametersCommon>
+            </eutra>
+        </interRAT-Parameters>
+        <inactiveState><supported/></inactiveState>
+    </nonCriticalExtension>
+</UE-NR-Capability>
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap.xml b/targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap_ports2.xml
similarity index 100%
rename from targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap.xml
rename to targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap_ports2.xml