Update to V9.1.0 (2009-12)

svn path=/trunk/; revision=31333

7 files changed, 2105 insertions, 388 deletions

diff --git a/asn1/nbap/NBAP-CommonDataTypes.asn b/asn1/nbap/NBAP-CommonDataTypes.asn
index 1bae0d1044..8ed82de5c7 100644
--- a/asn1/nbap/NBAP-CommonDataTypes.asn
+++ b/asn1/nbap/NBAP-CommonDataTypes.asn
@@ -1,4 +1,4 @@
--- Taken from 3GPP TS 25.433 V8.3.0 (2008-12)
+-- Taken from 3GPP TS 25.433 V9.1.0 (2009-12)
 -- http://www.3gpp.org/ftp/Specs/archive/25_series/25.433/
 
 -- $Id$
@@ -63,4 +63,3 @@ TransactionID 		::= CHOICE {
 TriggeringMessage	::= ENUMERATED { initiating-message, successful-outcome, unsuccessfull-outcome, outcome }
 
 END
-
diff --git a/asn1/nbap/NBAP-Constants.asn b/asn1/nbap/NBAP-Constants.asn
index 46eb874210..9024b51213 100644
--- a/asn1/nbap/NBAP-Constants.asn
+++ b/asn1/nbap/NBAP-Constants.asn
@@ -1,6 +1,6 @@
 -- NBAP-Constants.asn
 --
--- Taken from 3GPP TS 25.433 V8.3.0 (2008-12)
+-- Taken from 3GPP TS 25.433 V9.1.0 (2009-12)
 -- http://www.3gpp.org/ftp/Specs/archive/25_series/25.433/
 ---
 -- 9.3.6	Constant Definitions
@@ -87,6 +87,8 @@ id-unSynchronisedRadioLinkReconfiguration 				ProcedureCode ::= 34
 id-radioLinkActivation									ProcedureCode ::= 51
 id-radioLinkParameterUpdate								ProcedureCode ::= 52
 id-uEStatusUpdate										ProcedureCode ::= 54
+id-secondaryULFrequencyReporting						ProcedureCode ::= 55
+id-secondaryULFrequencyUpdate							ProcedureCode ::= 56
 
 -- **************************************************************
 --
@@ -237,6 +239,21 @@ maxnrofERUCCHsLCR				INTEGER ::= 32
 maxNrOfHSDSCH-1					INTEGER ::= 32
 maxNrOfHSDSCH					INTEGER ::= 33
 maxGANSS-1						INTEGER ::= 7
+maxNoOfTBSs-Mapping-HS-DSCH-SPS		INTEGER ::= 4
+maxNoOfTBSs-Mapping-HS-DSCH-SPS-1	INTEGER ::= 3
+maxNoOfHS-DSCH-TBSsLCR				INTEGER ::= 64
+maxNoOfRepetition-Period-LCR		INTEGER ::= 4
+maxNoOfRepetitionPeriod-SPS-LCR-1	INTEGER ::= 3
+maxNoOf-HS-SICH-SPS					INTEGER ::= 4
+maxNoOf-HS-SICH-SPS-1				INTEGER ::= 3
+maxNoOfNon-HS-SCCH-Assosiated-HS-SICH	INTEGER ::= 4
+maxMBMSServiceSelect			INTEGER ::= 256 
+maxNrOfCellPortionsPerCellLCR		INTEGER ::= 256
+maxNrOfCellPortionsPerCellLCR-1		INTEGER ::= 255
+maxNrOfEDCH-1						INTEGER ::= 32
+maxNoOfCommonH-RNTI				INTEGER ::= 256
+maxNrOfCommonMACFlowsLCRExt			INTEGER ::= 248 
+-- maxNrOfCommonMACFlowsLCR-maxNrOfCommonMACFlows
 
 
 -- **************************************************************
@@ -727,7 +744,7 @@ id-Minimum-DL-Power-TimeslotLCR-InformationItem						ProtocolIE-ID ::= 582
 id-HS-DSCHProvidedBitRateValueInformation							ProtocolIE-ID ::= 583
 id-HS-DSCHRequiredPowerValueInformation								ProtocolIE-ID ::= 585
 id-HS-DSCHRequiredPowerValue										ProtocolIE-ID ::= 586
-id-TransmittedCarrierPowerOfAllCodesNotUsedForHSTransmission			ProtocolIE-ID ::= 587
+id-TransmittedCarrierPowerOfAllCodesNotUsedForHSTransmission		ProtocolIE-ID ::= 587
 id-HS-SICH-Reception-Quality 										ProtocolIE-ID ::= 588
 id-HS-SICH-Reception-Quality-Measurement-Value 						ProtocolIE-ID ::= 589
 id-HSSICH-Info-DM-Rprt 												ProtocolIE-ID ::= 590
@@ -760,7 +777,7 @@ id-TnlQos															ProtocolIE-ID ::= 616
 id-Received-total-wide-band-power-For-CellPortion-Value				ProtocolIE-ID ::= 617
 id-Transmitted-Carrier-Power-For-CellPortion						ProtocolIE-ID ::= 618
 id-Transmitted-Carrier-Power-For-CellPortion-Value 					ProtocolIE-ID ::= 619
-id-TransmittedCarrierPowerOfAllCodesNotUsedForHS-PDSCH-HS-SCCH-E-AGCH-E-RGCHOrE-HICHTransmissionCellPortion		ProtocolIE-ID ::= 620
+id-TransmittedCarrierPowerOfAllCodesNotUsedForHS-PDSCH-HS-SCCH-E-AGCH-E-RGCHOrE-HICHTransmissionCellPortion	ProtocolIE-ID ::= 620
 id-TransmittedCarrierPowerOfAllCodesNotUsedForHS-PDSCH-HS-SCCH-E-AGCH-E-RGCHOrE-HICHTransmissionCellPortionValue	ProtocolIE-ID ::= 621
 id-UpPTSInterferenceValue											ProtocolIE-ID ::= 622
 id-PrimaryCCPCH-RSCP-Delta											ProtocolIE-ID ::= 623
@@ -1084,7 +1101,7 @@ id-HSDSCH-TBSizeTableIndicator										ProtocolIE-ID ::= 966
 id-E-DCH-DL-Control-Channel-Change-Information						ProtocolIE-ID ::= 967
 id-E-DCH-DL-Control-Channel-Grant-Information						ProtocolIE-ID ::= 968
 id-DGANSS-Corrections-Req											ProtocolIE-ID ::= 969
-id-UE-without-HS-SCCH-constraint-indicator							ProtocolIE-ID ::= 970
+id-UE-with-enhanced-HS-SCCH-support-indicator							ProtocolIE-ID ::= 970
 id-AdditionalTimeSlotListLCR										ProtocolIE-ID ::= 971
 id-AdditionalMeasurementValueList									ProtocolIE-ID ::= 972
 id-E-AGCH-Table-Choice					 							ProtocolIE-ID ::= 978
@@ -1152,6 +1169,85 @@ id-Additional-HS-Cell-Information-RL-Reconf-Req						ProtocolIE-ID ::= 1042
 id-Additional-HS-Cell-Information-RL-Param-Upd						ProtocolIE-ID ::= 1043
 id-Multi-Cell-Capability-Info										ProtocolIE-ID ::= 1044
 id-IMB-Parameters													ProtocolIE-ID ::= 1045
+id-MACes-Maximum-Bitrate-LCR										ProtocolIE-ID ::= 1046
+id-Semi-PersistentScheduling-CapabilityLCR							ProtocolIE-ID ::= 1047
+id-E-DCH-Semi-PersistentScheduling-Information-LCR					ProtocolIE-ID ::= 1048
+id-HS-DSCH-Semi-PersistentScheduling-Information-LCR				ProtocolIE-ID ::= 1049
+id-Add-To-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst	ProtocolIE-ID ::= 1050
+id-Modify-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst	ProtocolIE-ID ::= 1051
+id-Delete-From-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst	ProtocolIE-ID ::= 1052
+id-ContinuousPacketConnectivity-DRX-CapabilityLCR					ProtocolIE-ID ::= 1053
+id-ContinuousPacketConnectivity-DRX-InformationLCR					ProtocolIE-ID ::= 1054
+id-ContinuousPacketConnectivity-DRX-Information-ResponseLCR			ProtocolIE-ID ::= 1055
+id-CPC-InformationLCR												ProtocolIE-ID ::= 1056
+id-HS-DSCH-Semi-PersistentScheduling-Information-ResponseLCR		ProtocolIE-ID ::= 1057
+id-E-DCH-Semi-PersistentScheduling-Information-ResponseLCR			ProtocolIE-ID ::= 1058
+id-E-AGCH-UE-Inactivity-Monitor-Threshold							ProtocolIE-ID ::= 1059
+id-IdleIntervalInformation											ProtocolIE-ID ::= 1063
+id-GANSS-alm-keplerianNAVAlmanac									ProtocolIE-ID ::= 1064
+id-GANSS-alm-keplerianReducedAlmanac								ProtocolIE-ID ::= 1065
+id-GANSS-alm-keplerianMidiAlmanac									ProtocolIE-ID ::= 1066
+id-GANSS-alm-keplerianGLONASS										ProtocolIE-ID ::= 1067
+id-GANSS-alm-ecefSBASAlmanac										ProtocolIE-ID ::= 1068
+id-HSSICH-ReferenceSignal-InformationLCR							ProtocolIE-ID ::= 1070
+id-MIMO-ReferenceSignal-InformationListLCR							ProtocolIE-ID ::= 1071
+id-MIMO-SFMode-For-HSPDSCHDualStream								ProtocolIE-ID ::= 1072
+id-MIMO-SFMode-Supported-For-HSPDSCHDualStream						ProtocolIE-ID ::= 1073
+id-UE-Selected-MBMS-Service-Information								ProtocolIE-ID ::= 1074
+id-MultiCarrier-HSDSCH-Physical-Layer-Category 						ProtocolIE-ID ::= 1077
+id-Common-E-DCH-HSDPCCH-Capability									ProtocolIE-ID ::= 1078
+id-DL-RLC-PDU-Size-Format											ProtocolIE-ID ::= 1079
+id-HSSICH-ReferenceSignal-InformationModifyLCR						ProtocolIE-ID ::= 1080
+id-schedulingPriorityIndicator										ProtocolIE-ID ::= 1081
+id-TimeSlotMeasurementValueListLCR									ProtocolIE-ID ::= 1082
+id-UE-SupportIndicatorExtension										ProtocolIE-ID ::= 1085
+id-Single-Stream-MIMO-ActivationIndicator							ProtocolIE-ID ::= 1088
+id-Single-Stream-MIMO-Capability									ProtocolIE-ID ::= 1089
+id-Single-Stream-MIMO-Mode-Indicator								ProtocolIE-ID ::= 1090
+id-Dual-Band-Capability-Info										ProtocolIE-ID ::= 1091
+id-UE-AggregateMaximumBitRate										ProtocolIE-ID ::= 1092
+id-SRB-Indicator													ProtocolIE-ID ::= 1093
+id-CellSpecificHARQMemoryPartitioning								ProtocolIE-ID ::= 1099
+id-HARQ-MemoryPartitioning											ProtocolIE-ID ::= 1100
+id-MIMO-Power-Offset-For-S-CPICH-Capability							ProtocolIE-ID ::= 1101
+id-MIMO-PilotConfigurationExtension									ProtocolIE-ID ::= 1102
+id-TxDiversityOnDLControlChannelsByMIMOUECapability					ProtocolIE-ID ::= 1103 
+id-ULTimeslotISCPValue-For-CellPortion								ProtocolIE-ID ::= 1104
+id-UpPTSInterferenceValue-For-CellPortion							ProtocolIE-ID ::= 1105
+id-Best-Cell-Portions-ValueLCR										ProtocolIE-ID ::= 1106
+id-Transmitted-Carrier-Power-For-CellPortion-ValueLCR				ProtocolIE-ID ::= 1107
+id-Received-total-wide-band-power-For-CellPortion-ValueLCR			ProtocolIE-ID ::= 1108
+id-UL-TimeslotISCP-For-CellPortion-Value							ProtocolIE-ID ::= 1109
+id-HS-DSCHRequiredPowerValueInformation-For-CellPortionLCR			ProtocolIE-ID ::= 1110
+id-HS-DSCHProvidedBitRateValueInformation-For-CellPortionLCR		ProtocolIE-ID ::= 1111
+id-E-DCHProvidedBitRateValueInformation-For-CellPortion				ProtocolIE-ID ::= 1112
+id-UpPTSInterference-For-CellPortion-Value							ProtocolIE-ID ::= 1113
+id-NumberOfReportedCellPortionsLCR									ProtocolIE-ID ::= 1114
+id-CellPortion-CapabilityLCR										ProtocolIE-ID ::= 1115
+id-TransmittedCarrierPowerOfAllCodesNotUsedForHS-PDSCH-HS-SCCH-E-AGCHOrE-HICHTransmissionCellPortionValue	ProtocolIE-ID ::= 1116
+id-TransmittedCarrierPowerOfAllCodesNotUsedForHS-PDSCH-HS-SCCH-E-AGCHOrE-HICHTransmissionCellPortion	ProtocolIE-ID ::= 1117id-ActivationInformation											ProtocolIE-ID ::= 1119
+id-Additional-EDCH-Cell-Information-RL-Setup-Req					ProtocolIE-ID ::= 1120
+id-Additional-EDCH-Cell-Information-Response						ProtocolIE-ID ::= 1121
+id-Additional-EDCH-Cell-Information-RL-Add-Req						ProtocolIE-ID ::= 1122
+id-Additional-EDCH-Cell-Change-Information-Response					ProtocolIE-ID ::= 1123
+id-Additional-EDCH-Cell-Information-RL-Reconf-Prep					ProtocolIE-ID ::= 1124
+id-Additional-EDCH-Cell-Information-RL-Reconf-Req					ProtocolIE-ID ::= 1125
+id-Additional-EDCH-Cell-Information-Bearer-Rearrangement			ProtocolIE-ID ::= 1126
+id-Additional-EDCH-Cell-Information-RL-Param-Upd					ProtocolIE-ID ::= 1127
+id-Additional-EDCH-Preconfiguration-Information						ProtocolIE-ID ::= 1128
+id-EDCH-Indicator													ProtocolIE-ID ::= 1129
+id-HS-DSCH-SPS-Reservation-Indicator								ProtocolIE-ID ::= 1131
+id-E-DCH-SPS-Reservation-Indicator									ProtocolIE-ID ::= 1132
+id-MultipleFreq-HARQ-MemoryPartitioning-InformationList				ProtocolIE-ID ::= 1133 
+id-Ul-common-E-DCH-MACflow-Specific-InfoResponseListLCR-Ext			ProtocolIE-ID ::= 1134
+id-RepetitionPeriodIndex											ProtocolIE-ID ::= 1135
+id-MidambleShiftLCR													ProtocolIE-ID ::= 1136
+id-MaxHSDSCH-HSSCCH-Power-per-CELLPORTION							ProtocolIE-ID ::= 1137
+id-DormantModeIndicator												ProtocolIE-ID ::= 1138
+id-DiversityMode													ProtocolIE-ID ::= 1139
+id-TransmitDiversityIndicator										ProtocolIE-ID ::= 1140
+id-NonCellSpecificTxDiversity										ProtocolIE-ID ::= 1141
+id-Cell-Capability-Container										ProtocolIE-ID ::= 1142
 
 END
 
diff --git a/asn1/nbap/NBAP-Containers.asn b/asn1/nbap/NBAP-Containers.asn
index 8b4502d321..f73a44aaf9 100644
--- a/asn1/nbap/NBAP-Containers.asn
+++ b/asn1/nbap/NBAP-Containers.asn
@@ -1,6 +1,6 @@
 -- NBAP-Containers.asn
 --
--- Taken from 3GPP TS 25.433 V8.3.0 (2008-12)
+-- Taken from 3GPP TS 25.433 V9.1.0 (2009-12)
 -- http://www.3gpp.org/ftp/Specs/archive/25_series/25.433/
 --
 -- 9.3.7	Container Definitions
@@ -205,4 +205,3 @@ PrivateIE-Field {NBAP-PRIVATE-IES : IEsSetParam} ::= SEQUENCE {
 }
 
 END
-
diff --git a/asn1/nbap/NBAP-IEs.asn b/asn1/nbap/NBAP-IEs.asn
index edc1471fc6..b18a0e7289 100644
--- a/asn1/nbap/NBAP-IEs.asn
+++ b/asn1/nbap/NBAP-IEs.asn
@@ -1,6 +1,6 @@
 -- NBAP-IEs.asn
 --
--- Taken from 3GPP TS 25.433 V8.3.0 (2008-12)
+-- Taken from 3GPP TS 25.433 V9.1.0 (2009-12)
 -- http://www.3gpp.org/ftp/Specs/archive/25_series/25.433/
 --
 -- 9.3.4	Information Elements Definitions
@@ -120,6 +120,22 @@ IMPORTS
 	maxNrOfHSDSCH-1,
 	maxNrOfHSDSCH,
 	maxGANSS-1,
+	maxNoOfTBSs-Mapping-HS-DSCH-SPS,
+	maxNoOfTBSs-Mapping-HS-DSCH-SPS-1,
+	maxNoOfHS-DSCH-TBSsLCR,
+	maxNoOfRepetition-Period-LCR,
+	maxNoOfRepetitionPeriod-SPS-LCR-1,
+	maxNoOf-HS-SICH-SPS,
+	maxNoOf-HS-SICH-SPS-1,
+	maxNoOfNon-HS-SCCH-Assosiated-HS-SICH,
+	maxMBMSServiceSelect, 
+	maxNrOfCellPortionsPerCellLCR,
+	maxNrOfCellPortionsPerCellLCR-1, 
+	maxNrOfEDCH-1,
+ 	maxNoOfCommonH-RNTI, 
+	maxNrOfCommonMACFlowsLCRExt,
+	maxNrOfEDCH-1,
+
 
 	id-BroadcastCommonTransportBearerIndication,
 	id-MessageStructure,
@@ -229,7 +245,7 @@ IMPORTS
 	id-E-DCH-DL-Control-Channel-Change-Information,
 	id-E-DCH-DL-Control-Channel-Grant-Information,
 	id-DGANSS-Corrections-Req,
-	id-UE-without-HS-SCCH-constraint-indicator,
+	id-UE-with-enhanced-HS-SCCH-support-indicator,
 	id-TransportBearerRequestIndicator,
 	id-EnhancedHSServingCC-Abort,
 	id-GANSS-Time-ID,
@@ -246,12 +262,53 @@ IMPORTS
 	id-GANSS-Additional-Navigation-Models,
 	id-GANSS-Additional-UTC-Models,
 	id-GANSS-Auxiliary-Information,
+	id-GANSS-alm-keplerianNAVAlmanac,
+	id-GANSS-alm-keplerianReducedAlmanac,
+	id-GANSS-alm-keplerianMidiAlmanac,
+	id-GANSS-alm-keplerianGLONASS,
+	id-GANSS-alm-ecefSBASAlmanac,
 	id-EDCH-RACH-Report-Value,
 	id-EDCH-RACH-Report-IncrDecrThres,
-	id-EDCH-RACH-Report-ThresholdInformation
-
-
-
+	id-EDCH-RACH-Report-ThresholdInformation,
+	id-MACes-Maximum-Bitrate-LCR,
+	id-E-AGCH-UE-Inactivity-Monitor-Threshold,
+	id-MultiCarrier-HSDSCH-Physical-Layer-Category,
+	id-MIMO-ReferenceSignal-InformationListLCR,
+	id-MIMO-SFMode-For-HSPDSCHDualStream,
+	id-MIMO-SFMode-Supported-For-HSPDSCHDualStream,
+	id-DL-RLC-PDU-Size-Format,
+	id-schedulingPriorityIndicator,
+	id-UE-SupportIndicatorExtension,
+	id-SRB-Indicator,
+	id-Single-Stream-MIMO-ActivationIndicator,
+	id-Single-Stream-MIMO-Mode-Indicator,
+	id-CellSpecificHARQMemoryPartitioning,
+	id-HARQ-MemoryPartitioning,
+	id-TransmittedCarrierPowerOfAllCodesNotUsedForHS-PDSCH-HS-SCCH-E-AGCHOrE-HICHTransmissionCellPortion,
+	id-ULTimeslotISCPValue-For-CellPortion,
+	id-UpPTSInterferenceValue-For-CellPortion,
+	id-Best-Cell-Portions-ValueLCR,
+	id-Transmitted-Carrier-Power-For-CellPortion-ValueLCR,
+	id-Received-total-wide-band-power-For-CellPortion-ValueLCR,
+	id-TransmittedCarrierPowerOfAllCodesNotUsedForHS-PDSCH-HS-SCCH-E-AGCHOrE-HICHTransmissionCellPortionValue,
+	id-UL-TimeslotISCP-For-CellPortion-Value,
+	id-HS-DSCHRequiredPowerValueInformation-For-CellPortionLCR,
+	id-HS-DSCHProvidedBitRateValueInformation-For-CellPortionLCR,
+	id-E-DCHProvidedBitRateValueInformation-For-CellPortion,
+	id-UpPTSInterference-For-CellPortion-Value,
+	id-HS-DSCH-SPS-Reservation-Indicator,
+	id-E-DCH-SPS-Reservation-Indicator,
+	id-MultipleFreq-HARQ-MemoryPartitioning-InformationList,
+	id-DiversityMode,
+	id-TransmitDiversityIndicator,
+	id-NonCellSpecificTxDiversity,
+	maxNrOfCommonMACFlowsLCRExt,
+	id-RepetitionPeriodIndex,
+	id-MidambleShiftLCR,
+	id-MaxHSDSCH-HSSCCH-Power-per-CELLPORTION,
+	id-Additional-EDCH-Preconfiguration-Information,
+	id-EDCH-Indicator,
+	id-Ul-common-E-DCH-MACflow-Specific-InfoResponseListLCR-Ext
 
 
 FROM NBAP-Constants
@@ -282,6 +339,292 @@ Ack-Power-Offset ::= INTEGER (0..8,...)
 Acknowledged-PRACH-preambles-Value ::= INTEGER(0..240,...)
 -- According to mapping in [22].
 
+ActivationInformation ::= SEQUENCE (SIZE (1..maxNrOfEDCH-1)) OF ActivationInformationItem
+
+ActivationInformationItem ::= SEQUENCE {
+	uU-ActivationState	Uu-ActivationState,
+	iE-Extensions									ProtocolExtensionContainer { { ActivationInformationItem-ExtIEs} }				OPTIONAL,
+	...
+}
+
+ActivationInformationItem-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+Additional-EDCH-Setup-Info	::=SEQUENCE{
+	multicell-EDCH-Transport-Bearer-Mode									Multicell-EDCH-Transport-Bearer-Mode,
+	additional-EDCH-Cell-Information-Setup									Additional-EDCH-Cell-Information-Setup,
+	iE-Extensions					ProtocolExtensionContainer { { Additional-EDCH-Setup-Info-ExtIEs} } OPTIONAL,
+	...
+}
+
+Additional-EDCH-Setup-Info-ExtIEs	NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+Multicell-EDCH-Transport-Bearer-Mode ::= ENUMERATED {
+	separate-Iub-Transport-Bearer-Mode,
+	uL-Flow-Multiplexing-Mode
+}
+
+
+Additional-EDCH-Cell-Information-Setup	::= SEQUENCE (SIZE (1..maxNrOfEDCH-1)) OF Additional-EDCH-FDD-Setup-Cell-Information
+
+Additional-EDCH-FDD-Setup-Cell-Information	::=SEQUENCE{
+	additional-EDCH-UL-DPCH-Information-Setup								Additional-EDCH-UL-DPCH-Information-Setup,
+	additional-EDCH-RL-Specific-Information-To-Setup						Additional-EDCH-RL-Specific-Information-To-Setup-List,
+	dL-PowerBalancing-Information			DL-PowerBalancing-Information		OPTIONAL,
+	minimumReducedE-DPDCH-GainFactor			MinimumReducedE-DPDCH-GainFactor		OPTIONAL,
+	additional-EDCH-FDD-Information								Additional-EDCH-FDD-Information,
+	secondary-UL-Frequency-Activation-State			Secondary-UL-Frequency-Activation-State		OPTIONAL,
+	additional-EDCH-F-DPCH-Information-Setup								Additional-EDCH-F-DPCH-Information,
+	iE-Extensions					ProtocolExtensionContainer { { Additional-EDCH-FDD-Setup-Cell-Information-ExtIEs} } OPTIONAL,
+	...
+}
+
+Additional-EDCH-FDD-Setup-Cell-Information-ExtIEs	NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+Additional-EDCH-UL-DPCH-Information-Setup	::=SEQUENCE{
+	ul-ScramblingCode						UL-ScramblingCode,
+	ul-SIR-Target							UL-SIR,
+	iE-Extensions					ProtocolExtensionContainer { { Additional-EDCH-UL-DPCH-Information-Setup-ExtIEs} } OPTIONAL,
+	...
+}
+
+Additional-EDCH-UL-DPCH-Information-Setup-ExtIEs	NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+Additional-EDCH-F-DPCH-Information	::=SEQUENCE{
+	fdd-TPC-DownlinkStepSize			FDD-TPC-DownlinkStepSize,
+	limitedPowerIncrease				LimitedPowerIncrease,
+	innerLoopDLPCStatus					InnerLoopDLPCStatus,
+	iE-Extensions					ProtocolExtensionContainer { { Additional-EDCH-F-DPCH-Information-ExtIEs} } OPTIONAL,
+	...
+}
+
+Additional-EDCH-F-DPCH-Information-ExtIEs	NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+Additional-EDCH-RL-Specific-Information-To-Setup-List	::= SEQUENCE (SIZE (1..maxNrOfEDCHRLs)) OF Additional-EDCH-RL-Specific-Information-To-Setup-ItemIEs
+
+
+Additional-EDCH-RL-Specific-Information-To-Setup-ItemIEs	::=SEQUENCE{
+	eDCH-Additional-RL-ID				RL-ID,
+	c-ID								C-ID,
+	firstRLS-indicator					FirstRLS-Indicator,
+	propagationDelay					PropagationDelay				OPTIONAL,
+	extendedPropagationDelay			ExtendedPropagationDelay				OPTIONAL,
+	dl-CodeInformation					FDD-DL-CodeInformation,
+	initialDL-transmissionPower			DL-Power,
+	maximumDL-power						DL-Power,
+	minimumDL-power						DL-Power,
+	primary-CPICH-Usage-for-Channel-Estimation					Primary-CPICH-Usage-for-Channel-Estimation				OPTIONAL,
+	secondary-CPICH-Information			CommonPhysicalChannelID						OPTIONAL,
+	e-AGCH-PowerOffset					E-AGCH-PowerOffset							OPTIONAL, 
+	e-RGCH-PowerOffset					E-RGCH-PowerOffset							OPTIONAL, 
+	e-HICH-PowerOffset					E-HICH-PowerOffset							OPTIONAL,
+	f-DPCH-SlotFormat					F-DPCH-SlotFormat 							OPTIONAL,
+	e-RNTI								E-RNTI 										OPTIONAL,
+	iE-Extensions						ProtocolExtensionContainer { { Additional-EDCH-RL-Specific-Information-To-Setup-ItemIEs-ExtIEs} } OPTIONAL,
+	...
+}
+
+Additional-EDCH-RL-Specific-Information-To-Setup-ItemIEs-ExtIEs	NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+Additional-EDCH-Cell-Information-To-Add-List	::= SEQUENCE (SIZE (1..maxNrOfEDCH-1)) OF Additional-EDCH-RL-Specific-Information-To-Add-ItemIEs
+
+Additional-EDCH-RL-Specific-Information-To-Add-ItemIEs	::= SEQUENCE (SIZE (1..maxNrOfEDCH-1)) OF EDCH-Additional-RL-Specific-Information-To-Add-List
+
+EDCH-Additional-RL-Specific-Information-To-Add-List	::=SEQUENCE{
+	eDCH-Additional-RL-ID				RL-ID,
+	c-ID								C-ID,
+	dl-CodeInformation					FDD-DL-CodeInformation,
+	initialDL-transmissionPower			DL-Power				OPTIONAL,
+	maximumDL-power						DL-Power				OPTIONAL,
+	minimumDL-power						DL-Power				OPTIONAL,
+	dLReferencePower					DL-Power				OPTIONAL, 
+	e-AGCH-PowerOffset					E-AGCH-PowerOffset							OPTIONAL, 
+	e-RGCH-PowerOffset					E-RGCH-PowerOffset							OPTIONAL, 
+	e-HICH-PowerOffset					E-HICH-PowerOffset							OPTIONAL,
+	f-DPCH-SlotFormat					F-DPCH-SlotFormat 							OPTIONAL,
+	iE-Extensions						ProtocolExtensionContainer { { EDCH-Additional-RL-Specific-Information-To-Add-List-ExtIEs} } OPTIONAL,
+	...
+}
+
+EDCH-Additional-RL-Specific-Information-To-Add-List-ExtIEs	NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+Additional-EDCH-RL-Specific-Information-To-Modify-List	::= SEQUENCE (SIZE (1..maxNrOfEDCHRLs)) OF Additional-EDCH-RL-Specific-Information-To-Modify-ItemIEs
+
+Additional-EDCH-RL-Specific-Information-To-Modify-ItemIEs	::=SEQUENCE{
+	eDCH-Additional-RL-ID				RL-ID,
+	dl-CodeInformation					FDD-DL-CodeInformation 			OPTIONAL,
+	maximumDL-power						DL-Power				OPTIONAL,
+	minimumDL-power						DL-Power				OPTIONAL,
+	dLReferencePower					DL-Power				OPTIONAL, 
+	primary-CPICH-Usage-for-Channel-Estimation					Primary-CPICH-Usage-for-Channel-Estimation				OPTIONAL,
+	secondary-CPICH-Information-Change		Secondary-CPICH-Information-Change					OPTIONAL,
+	e-AGCH-PowerOffset					E-AGCH-PowerOffset							OPTIONAL, 
+	e-RGCH-PowerOffset					E-RGCH-PowerOffset							OPTIONAL, 
+	e-HICH-PowerOffset					E-HICH-PowerOffset							OPTIONAL,
+	f-DPCH-SlotFormat					F-DPCH-SlotFormat 							OPTIONAL,
+	additional-e-DCH-DL-Control-Channel-Grant		NULL	 							OPTIONAL,
+	iE-Extensions						ProtocolExtensionContainer { { Additional-EDCH-RL-Specific-Information-To-Modify-ItemIEs-ExtIEs} } OPTIONAL,
+	...
+}
+
+Additional-EDCH-RL-Specific-Information-To-Modify-ItemIEs-ExtIEs	NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+Additional-EDCH-FDD-Information	::=SEQUENCE{
+	additional-EDCH-MAC-d-Flows-Specific-Information	Additional-EDCH-MAC-d-Flows-Specific-Info-List								OPTIONAL,
+	hARQ-Process-Allocation-Scheduled-2ms-EDCH		HARQ-Process-Allocation-2ms-EDCH											OPTIONAL,
+	e-DCH-Maximum-Bitrate							E-DCH-Maximum-Bitrate														OPTIONAL,
+	e-DCH-Processing-Overload-Level					E-DCH-Processing-Overload-Level												OPTIONAL,
+	iE-Extensions						ProtocolExtensionContainer { { Additional-EDCH-FDD-Information-ExtIEs} } OPTIONAL,
+	...
+}
+
+Additional-EDCH-FDD-Information-ExtIEs	NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+Additional-EDCH-MAC-d-Flows-Specific-Info-List ::= SEQUENCE (SIZE (1..maxNrOfEDCHMACdFlows)) OF Additional-EDCH-MAC-d-Flows-Specific-Info
+
+Additional-EDCH-MAC-d-Flows-Specific-Info ::= SEQUENCE {
+	e-DCH-MACdFlow-ID								E-DCH-MACdFlow-ID,
+	bindingID										BindingID																	OPTIONAL,
+	transportLayerAddress							TransportLayerAddress														OPTIONAL,
+	iE-Extensions									ProtocolExtensionContainer { { Additional-EDCH-MAC-d-Flows-Specific-Info-ExtIEs} }				OPTIONAL,
+	...
+}
+
+Additional-EDCH-MAC-d-Flows-Specific-Info-ExtIEs	NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+Additional-EDCH-Cell-Information-Response-List	::= SEQUENCE (SIZE (1..maxNrOfEDCH-1)) OF Additional-EDCH-FDD-Information-Response-ItemIEs
+
+Additional-EDCH-FDD-Information-Response-ItemIEs	::=SEQUENCE{
+	eDCH-Additional-RL-Specific-Information-Response						EDCH-Additional-RL-Specific-Information-Response-List	OPTIONAL,
+	additional-EDCH-MAC-d-Flow-Specific-Information-Response				Additional-EDCH-MAC-d-Flow-Specific-Information-Response-List		OPTIONAL,
+	hARQ-Process-Allocation-Scheduled-2ms-EDCH								HARQ-Process-Allocation-2ms-EDCH					OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { { Additional-EDCH-FDD-Information-Response-ItemIEs-ExtIEs} } OPTIONAL,
+	...
+}
+
+Additional-EDCH-FDD-Information-Response-ItemIEs-ExtIEs	NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+EDCH-Additional-RL-Specific-Information-Response-List	::= SEQUENCE (SIZE (1..maxNrOfEDCHRLs)) OF EDCH-Additional-RL-Specific-Information-Response-ItemIEs
+
+EDCH-Additional-RL-Specific-Information-Response-ItemIEs	::=SEQUENCE{
+	eDCH-Additional-RL-ID							RL-ID,
+	received-total-wide-band-power					Received-total-wide-band-power-Value	OPTIONAL,
+	dL-PowerBalancing-ActivationIndicator			DL-PowerBalancing-ActivationIndicator	OPTIONAL,
+	dL-PowerBalancing-UpdatedIndicator				DL-PowerBalancing-UpdatedIndicator		OPTIONAL, 
+	rL-Set-ID										RL-Set-ID								OPTIONAL, 
+	e-DCH-RL-Set-ID									RL-Set-ID								OPTIONAL,
+	e-DCH-FDD-DL-Control-Channel-Information		E-DCH-FDD-DL-Control-Channel-Information		OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { { EDCH-Additional-RL-Specific-Information-Response-ItemIEs-ExtIEs} } OPTIONAL,
+	...
+}
+
+EDCH-Additional-RL-Specific-Information-Response-ItemIEs-ExtIEs	NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+Additional-EDCH-MAC-d-Flow-Specific-Information-Response-List::= SEQUENCE (SIZE (1..maxNrOfEDCHMACdFlows)) OF Additional-EDCH-MAC-d-Flows-Specific-Info-Response
+
+Additional-EDCH-MAC-d-Flows-Specific-Info-Response ::= SEQUENCE {
+	e-DCH-MACdFlow-ID								E-DCH-MACdFlow-ID,
+	bindingID										BindingID																	OPTIONAL,
+	transportLayerAddress							TransportLayerAddress														OPTIONAL,
+	iE-Extensions									ProtocolExtensionContainer { { Additional-EDCH-MAC-d-Flows-Specific-Info-Response-ExtIEs} }				OPTIONAL,
+	...
+}
+
+Additional-EDCH-MAC-d-Flows-Specific-Info-Response-ExtIEs	NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+Additional-EDCH-Cell-Information-ConfigurationChange-List	::= SEQUENCE (SIZE (1..maxNrOfEDCH-1)) OF Additional-EDCH-ConfigurationChange-Info-ItemIEs
+
+Additional-EDCH-ConfigurationChange-Info-ItemIEs	::=SEQUENCE{
+	additional-EDCH-UL-DPCH-Information-Modify							Additional-EDCH-UL-DPCH-Information-Modify		OPTIONAL,
+	additional-EDCH-RL-Specific-Information-To-Add						EDCH-Additional-RL-Specific-Information-To-Add-List 	OPTIONAL,
+	additional-EDCH-RL-Specific-Information-To-Modify					Additional-EDCH-RL-Specific-Information-To-Modify-List 	OPTIONAL,
+	minimumReducedE-DPDCH-GainFactor									MinimumReducedE-DPDCH-GainFactor		OPTIONAL,
+	additional-EDCH-FDD-Information-To-Modify							Additional-EDCH-FDD-Information		OPTIONAL,
+	additional-EDCH-F-DPCH-Information-Modify							Additional-EDCH-F-DPCH-Information		OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { { Additional-EDCH-ConfigurationChange-Info-ItemIEs-ExtIEs} } OPTIONAL,
+	...
+}
+
+Additional-EDCH-ConfigurationChange-Info-ItemIEs-ExtIEs	NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+Additional-EDCH-UL-DPCH-Information-Modify		::=SEQUENCE{
+	ul-ScramblingCode						UL-ScramblingCode 	OPTIONAL,
+	ul-SIR-Target							UL-SIR 				OPTIONAL,
+	iE-Extensions							ProtocolExtensionContainer { { Additional-EDCH-UL-DPCH-Information-Modify-ExtIEs} } OPTIONAL,
+	...
+}
+
+Additional-EDCH-UL-DPCH-Information-Modify-ExtIEs	NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+Additional-EDCH-Cell-Information-Removal-List	::= SEQUENCE (SIZE (1..maxNrOfEDCH-1)) OF Additional-EDCH-Cell-Information-Removal-Info-ItemIEs
+
+Additional-EDCH-Cell-Information-Removal-Info-ItemIEs	::=SEQUENCE{
+	rL-on-Secondary-UL-Frequency							RL-on-Secondary-UL-Frequency,
+	iE-Extensions					ProtocolExtensionContainer { { Additional-EDCH-Cell-Information-Removal-Info-ItemIEs-ExtIEs} } OPTIONAL,
+	...
+}
+
+Additional-EDCH-Cell-Information-Removal-Info-ItemIEs-ExtIEs	NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+RL-on-Secondary-UL-Frequency ::= ENUMERATED {
+	remove,
+	...
+}
+
+Additional-EDCH-FDD-Update-Information	::=SEQUENCE{
+	hARQ-Process-Allocation-Scheduled-2ms-EDCH						HARQ-Process-Allocation-2ms-EDCH								OPTIONAL,
+	additional-EDCH-DL-Control-Channel-Change-Information			Additional-EDCH-DL-Control-Channel-Change-Information-List					OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { { Additional-EDCH-FDD-Update-Information-ExtIEs} } OPTIONAL,
+	...
+}
+
+Additional-EDCH-FDD-Update-Information-ExtIEs	NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
+Additional-EDCH-DL-Control-Channel-Change-Information-List	::= SEQUENCE (SIZE (1..maxNrOfEDCHRLs)) OF Additional-EDCH-DL-Control-Channel-Change-Info-ItemIEs
+
+Additional-EDCH-DL-Control-Channel-Change-Info-ItemIEs	::=SEQUENCE{
+	eDCH-Additional-RL-ID				RL-ID,
+	iE-Extensions						ProtocolExtensionContainer { { Additional-EDCH-DL-Control-Channel-Change-Info-ItemIEs-ExtIEs} } OPTIONAL,
+	...
+}
+
+Additional-EDCH-DL-Control-Channel-Change-Info-ItemIEs-ExtIEs	NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
 AdditionalMeasurementValueList::= SEQUENCE (SIZE (1..maxFrequencyinCell-1)) OF AdditionalMeasurementValue
 
@@ -440,6 +783,19 @@ Best-Cell-Portions-Item-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+Best-Cell-Portions-ValueLCR::= SEQUENCE (SIZE (1..maxNrOfCellPortionsPerCellLCR)) OF Best-Cell-Portions-ItemLCR
+
+Best-Cell-Portions-ItemLCR ::= SEQUENCE {
+	cellPortionLCRID				CellPortionLCRID,
+	rSCPValue						RSCP-Value,
+	iE-Extensions				ProtocolExtensionContainer { { Best-Cell-Portions-ItemLCR-ExtIEs} }	OPTIONAL,
+	...
+}
+
+Best-Cell-Portions-ItemLCR-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 BindingID ::= OCTET STRING (SIZE (1..4, ...))
 -- If the Binding ID includes a UDP port, the UDP port is included in octet 1 and 2.The first octet of
 -- the UDP port field is included in the first octet of the Binding ID.
@@ -568,7 +924,18 @@ CauseRadioNetwork ::= ENUMERATED {
 	continuous-packet-connectivity-UE-DTX-Cycle-not-available,
 	mIMO-not-available,
 	e-DCH-MACdPDU-SizeFormat-not-available,
-	multi-Cell-operation-not-supported
+	multi-Cell-operation-not-available,
+	semi-Persistent-scheduling-not-supported,
+	continuous-Packet-Connectivity-DRX-not-supported,
+	continuous-Packet-Connectivity-DRX-not-available,
+	sixtyfourQAM-DL-and-MIMO-Combined-not-available,
+	s-cpich-power-offset-not-available,
+	tx-diversity-for-mimo-on-DL-control-channels-not-available,
+	single-Stream-MIMO-not-available,
+	multi-Cell-operation-with-MIMO-not-available,
+	multi-Cell-operation-with-Single-Stream-MIMO-not-available,
+	cellSpecificTxDiversityHandlingForMultiCellOperationNotAvailable,	multi-Cell-EDCH-operation-not-available
+
 
 }
 
@@ -581,6 +948,15 @@ CauseTransport ::= ENUMERATED {
 
 CCTrCH-ID ::= INTEGER (0..15)
 
+Cell-Capability-Container ::= BIT STRING (SIZE (128))
+-- First bit: Cell Specific Tx Diversity Handling For Multi Cell Operation Capability
+-- Second bit: Multi Cell and MIMO Capability
+-- Third bit: Multi Cell and Single Stream MIMO Capability
+-- Fourth bit: Multi Cell E-DCH Capability
+-- Fifth bit: Separate Iub Transport Bearer Capability
+-- Sixth bit: E-DCH UL Flow Multiplexing Capability
+-- Note that undefined bits are considered as a spare bit and spare bits shall be set to 0 by the transmitter and shall be ignored by the receiver.
+
 Cell-ERNTI-Status-Information		::= SEQUENCE (SIZE (1..maxCellinNodeB)) OF Cell-ERNTI-Status-Information-Item
 
 Cell-ERNTI-Status-Information-Item  ::= SEQUENCE {
@@ -596,6 +972,15 @@ CellParameterID ::= INTEGER (0..127,...)
 
 CellPortionID	::= INTEGER (0..maxNrOfCellPortionsPerCell-1,...)
 
+CellPortionLCRID	::= INTEGER (0..maxNrOfCellPortionsPerCellLCR-1,...)
+
+CellPortion-CapabilityLCR ::= ENUMERATED {
+	cell-portion-capable,
+	cell-portion-non-capable
+}
+
+CellSpecificHARQMemoryPartitioning ::= BOOLEAN
+
 CellSyncBurstCode ::= INTEGER(0..7, ...)
 
 CellSyncBurstCodeShift ::= INTEGER(0..7)
@@ -652,14 +1037,21 @@ Common-EDCH-Capability ::= ENUMERATED {
 	common-EDCH-non-capable
 }
 
-Common-EDCH-System-InformationFDD  ::= SEQUENCE {
+Common-E-DCH-HSDPCCH-Capability ::= ENUMERATED {
+	hSDPCCH-non-capable,
+	aCK-NACK-capable,
+	aCK-NACK-CQI-capable
+}
+
+Common-EDCH-System-InformationFDD ::= SEQUENCE {
 	common-E-DCH-UL-DPCH-Information				Common-E-DCH-UL-DPCH-InfoItem								OPTIONAL,
 	common-E-DCH-EDPCH-Information					Common-E-DCH-EDPCH-InfoItem									OPTIONAL,
 	common-E-DCH-Information						Common-E-DCH-InfoItem										OPTIONAL,
-	common-E-DCH-HSDSCH-Information					Common-E-DCH-HSDSCH-InfoItem								OPTIONAL,
+	common-E-DCH-HSDPCCH-Information				Common-E-DCH-HSDPCCH-InfoItem							OPTIONAL,
 	common-E-DCH-Preamble-Control-Information		Common-E-DCH-Preamble-Control-InfoItem						OPTIONAL,
 	common-E-DCH-FDPCH-Information					Common-E-DCH-FDPCH-InfoItem									OPTIONAL,
-	common-E-DCH-Resource-Combination-Information	Common-E-DCH-Resource-Combination-InfoList					OPTIONAL, 
+	common-E-DCH-E-AGCH-ChannelisationCodeNumber	FDD-DL-ChannelisationCodeNumber								OPTIONAL,
+	common-E-DCH-Resource-Combination-Information	Common-E-DCH-Resource-Combination-InfoList					OPTIONAL,
 	ul-common-E-DCH-MACflow-Specific-Information	Ul-common-E-DCH-MACflow-Specific-InfoList					OPTIONAL,
 	iE-Extensions									ProtocolExtensionContainer { { Common-EDCH-System-InformationFDD-ExtIEs } }		OPTIONAL,
 	...
@@ -671,9 +1063,9 @@ Common-EDCH-System-InformationFDD-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 
 
 Common-E-DCH-UL-DPCH-InfoItem ::= SEQUENCE {
-	uL-DPCCH-SlotFormat					UL-DPCCH-SlotFormat,
-	uL-SIR								UL-SIR,
-	dPC-Mode							DPC-Mode,
+
+	uL-SIR-Target						UL-SIR,
+	dPC-Mode							DPC-Mode					OPTIONAL,
 	iE-Extensions						ProtocolExtensionContainer { { Common-E-DCH-UL-DPCH-InfoItem-ExtIEs} }					OPTIONAL,
 	...
 }
@@ -704,7 +1096,7 @@ Common-E-DCH-InfoItem	 ::= SEQUENCE {
 	e-DCH-PowerOffset-for-SchedulingInfo		E-DCH-PowerOffset-for-SchedulingInfo			OPTIONAL,
 	max-EDCH-Resource-Allocation-for-CCCH		Max-EDCH-Resource-Allocation-for-CCCH,
 	max-Period-for-Collistion-Resolution		Max-Period-for-Collistion-Resolution, 
-	max-TB-Size									Max-TB-Size										OPTIONAL,
+	max-TB-Sizes									Max-TB-Sizes										OPTIONAL,
 	common-E-DCH-ImplicitRelease-Indicator		BOOLEAN,
 	iE-Extensions								ProtocolExtensionContainer { { Common-E-DCH-InfoItem-ExtIEs} }					OPTIONAL,
 	...
@@ -714,27 +1106,42 @@ Common-E-DCH-InfoItem-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-Common-E-DCH-HSDSCH-InfoItem	 ::= SEQUENCE {
+Common-E-DCH-HSDPCCH-InfoItem	 ::= SEQUENCE {
+	ackNackRepetitionFactor						AckNack-RepetitionFactor,
+
+	ackPowerOffset								Ack-Power-Offset,
+	nackPowerOffset								Nack-Power-Offset,
+ 
+	common-E-DCH-CQI-Info						Common-E-DCH-CQI-Info						OPTIONAL,
+	iE-Extensions								ProtocolExtensionContainer { { Common-E-DCH-HSDPCCH-InfoItem-ExtIEs} }					OPTIONAL,
+	...
+}
+
+Common-E-DCH-HSDPCCH-InfoItem-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
+Common-E-DCH-CQI-Info	 ::= SEQUENCE {
 	cqiFeedback-CycleK							CQI-Feedback-Cycle,
 	cqiRepetitionFactor							CQI-RepetitionFactor						OPTIONAL,
 	-- This IE shall be present if the CQI Feedback Cycle k is greater than 0
-	ackNackRepetitionFactor						AckNack-RepetitionFactor,
 	cqiPowerOffset								CQI-Power-Offset,
-	ackPowerOffset								Ack-Power-Offset,
-	nackPowerOffset								Nack-Power-Offset,
 	measurement-Power-Offset					Measurement-Power-Offset,
-	iE-Extensions								ProtocolExtensionContainer { { Common-E-DCH-HSDSCH-InfoItem-ExtIEs} }					OPTIONAL,
+	iE-Extensions								ProtocolExtensionContainer { { Common-E-DCH-CQI-Info-ExtIEs} }					OPTIONAL,
 	...
 }
 
-Common-E-DCH-HSDSCH-InfoItem-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+Common-E-DCH-CQI-Info-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
 Common-E-DCH-Preamble-Control-InfoItem	 ::= SEQUENCE {
+	commonPhysicalChannelID						CommonPhysicalChannelID,
 	common-E-DCH-PreambleSignatures				PreambleSignatures,
-	scramblingCodeNumber						ScramblingCodeNumber,
-	e-AI-Indicator							E-AI-Indicator						OPTIONAL,
+	scramblingCodeNumber						ScramblingCodeNumber, 
+	preambleThreshold							PreambleThreshold,
+	e-AI-Indicator								E-AI-Indicator						OPTIONAL,
 	common-E-DCH-AICH-Information				Common-E-DCH-AICH-Information						OPTIONAL,
 	iE-Extensions								ProtocolExtensionContainer { { Common-E-DCH-Preamble-Control-InfoItem-ExtIEs} }					OPTIONAL,
 	...
@@ -834,6 +1241,7 @@ Common-E-DCH-LogicalChannel-InfoList-Item	::= SEQUENCE {
 }
 
 Common-E-DCH-LogicalChannel-InfoList-Item-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+{ ID id-schedulingPriorityIndicator	CRITICALITY ignore		EXTENSION	SchedulingPriorityIndicator	PRESENCE optional},
 	...
 }
 
@@ -957,7 +1365,11 @@ CommonMeasurementType ::= ENUMERATED  {
 	received-Scheduled-EDCH-Power-Share,
 	received-Scheduled-EDCH-Power-Share-for-cellPortion,
 	uTRAN-GANSS-timing-of-cell-frames-for-UE-Positioning,
-	eDCH-RACH-report
+	eDCH-RACH-report,
+	transmittedCarrierPowerOfAllCodesNotUsedForHS-PDSCH-HS-SCCH-E-AGCHOrE-HICHTransmission-for-cellPortion,
+	ul-timeslot-iscp-for-cellPortion,
+	upPTS-Interference-for-cellPortion,
+	e-DCH-Provided-Bit-Rate-for-cellPortion
 
 }
 
@@ -992,8 +1404,16 @@ Extension-CommonMeasurementValueIE NBAP-PROTOCOL-IES ::= {
 	{ ID id-Received-Scheduled-EDCH-Power-Share-Value	CRITICALITY ignore	TYPE Received-Scheduled-EDCH-Power-Share-Value	PRESENCE mandatory }|
 	{ ID id-Received-Scheduled-EDCH-Power-Share-For-CellPortion-Value 	CRITICALITY ignore	TYPE Received-Scheduled-EDCH-Power-Share-For-CellPortion-Value	PRESENCE mandatory }|
 	{ ID id-TUTRANGANSSMeasurementValueInformation 		CRITICALITY ignore	TYPE TUTRANGANSSMeasurementValueInformation	PRESENCE mandatory }|
-	{ ID id-EDCH-RACH-Report-Value						CRITICALITY ignore	TYPE EDCH-RACH-Report-Value			PRESENCE mandatory }
+	{ ID id-EDCH-RACH-Report-Value						CRITICALITY ignore	TYPE EDCH-RACH-Report-Value			PRESENCE mandatory }|
 		-- FDD only
+	{ ID id-Transmitted-Carrier-Power-For-CellPortion-ValueLCR	CRITICALITY ignore	TYPE Transmitted-Carrier-Power-For-CellPortion-ValueLCR	PRESENCE mandatory }|
+	{ ID id-Received-total-wide-band-power-For-CellPortion-ValueLCR	CRITICALITY ignore	TYPE Received-total-wide-band-power-For-CellPortion-ValueLCR	PRESENCE mandatory }|
+	{ ID id-TransmittedCarrierPowerOfAllCodesNotUsedForHS-PDSCH-HS-SCCH-E-AGCHOrE-HICHTransmissionCellPortionValue	CRITICALITY ignore	TYPE TransmittedCarrierPowerOfAllCodesNotUsedForHS-PDSCH-HS-SCCH-E-AGCHOrE-HICHTransmissionCellPortionValue		PRESENCE mandatory }|
+	{ ID id-UL-TimeslotISCP-For-CellPortion-Value									CRITICALITY ignore	TYPE UL-TimeslotISCP-For-CellPortion-Value									PRESENCE mandatory }|
+	{ ID id-HS-DSCHRequiredPowerValueInformation-For-CellPortionLCR	CRITICALITY ignore	TYPE HS-DSCHRequiredPowerValueInformation-For-CellPortionLCR	PRESENCE mandatory }|
+	{ ID id-HS-DSCHProvidedBitRateValueInformation-For-CellPortionLCR	CRITICALITY ignore	TYPE HS-DSCHProvidedBitRateValueInformation-For-CellPortionLCR	PRESENCE mandatory }|
+	{ ID id-E-DCHProvidedBitRateValueInformation-For-CellPortion					CRITICALITY ignore	TYPE E-DCHProvidedBitRateValueInformation-For-CellPortion										PRESENCE mandatory }|
+	{ ID id-UpPTSInterference-For-CellPortion-Value									CRITICALITY ignore	TYPE UpPTSInterference-For-CellPortion-Value									PRESENCE mandatory }
 }
 
 CommonMeasurementValueInformation ::= CHOICE {
@@ -1216,8 +1636,8 @@ Common-EDCH-System-InformationLCR ::= SEQUENCE {
 	ul-common-E-DCH-MACflow-Specific-InformationLCR			Ul-common-E-DCH-MACflow-Specific-InfoListLCR					OPTIONAL,
 	common-E-PUCH-InformationLCR							Common-E-PUCH-InformationLCR							OPTIONAL,
 	e-TFCS-Information-TDD									E-TFCS-Information-TDD									OPTIONAL,
-	maximum-Number-of-Retransmissions-For-E-DCH				Maximum-Number-of-Retransmissions-For-E-DCH					OPTIONAL,
-	eDCH-MACdFlow-Retransmission-Timer						E-DCH-MACdFlow-Retransmission-Timer						OPTIONAL,
+	maximum-Number-of-Retransmissions-For-SchedulingInfo		Maximum-Number-of-Retransmissions-For-E-DCH					OPTIONAL,
+	eDCH-Retransmission-Timer-SchedulingInfo				E-DCH-MACdFlow-Retransmission-Timer						OPTIONAL,
 	iE-Extensions											ProtocolExtensionContainer { { Common-EDCH-System-InformationLCR-ExtIEs } }		OPTIONAL,
 	...
 }
@@ -1304,16 +1724,20 @@ Common-EDCH-System-Information-ResponseLCR ::= SEQUENCE {
 }
 
 Common-EDCH-System-Information-ResponseLCR-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	{ ID id-Ul-common-E-DCH-MACflow-Specific-InfoResponseListLCR-Ext 	CRITICALITY ignore	 EXTENSION Ul-common-E-DCH-MACflow-Specific-InfoResponseListLCR-Ext 	PRESENCE optional},
 	...
 }
 
 Ul-common-E-DCH-MACflow-Specific-InfoResponseListLCR ::= SEQUENCE (SIZE (1..maxNrOfCommonMACFlows)) OF Ul-common-E-DCH-MACflow-Specific-InfoResponseList-ItemLCR
 
+Ul-common-E-DCH-MACflow-Specific-InfoResponseListLCR-Ext ::= SEQUENCE (SIZE (1..maxNrOfCommonMACFlowsLCRExt)) OF Ul-common-E-DCH-MACflow-Specific-InfoResponseList-ItemLCR
+
 Ul-common-E-DCH-MACflow-Specific-InfoResponseList-ItemLCR ::= SEQUENCE {
 	ul-Common-MACFlowID-LCR								Common-MACFlow-ID-LCR,
 	bindingID											BindingID										OPTIONAL,
 	transportLayerAddress								TransportLayerAddress							OPTIONAL, 
 	uARFCN												UARFCN											OPTIONAL,
+	-- the IE is not used.
 	iE-Extensions										ProtocolExtensionContainer { { Ul-common-E-DCH-MACflow-Specific-InfoResponseList-ItemLCR-ExtIEs} }					OPTIONAL,
 	...
 }
@@ -1327,6 +1751,7 @@ Common-E-AGCH-ListLCR ::= SEQUENCE (SIZE (1.. maxNrOfEAGCHsLCR)) OF Common-E-AGC
 Common-E-AGCH-ItemLCR ::= SEQUENCE {
 	e-AGCH-ID									E-AGCH-Id,
 	uARFCN										UARFCN											OPTIONAL,
+	-- the IE is not used.
 	iE-Extensions							ProtocolExtensionContainer { { Common-E-AGCH-ItemLCR-ExtIEs} }		OPTIONAL,
 	...
 }
@@ -1395,7 +1820,7 @@ CommonMACFlow-Specific-InfoItemLCR-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 
 
 
-Common-H-RNTI-InformationLCR ::= SEQUENCE (SIZE (1.. maxNrOfCommonMACFlowsLCR)) OF Common-H-RNTI-InfoItemLCR
+Common-H-RNTI-InformationLCR ::= SEQUENCE (SIZE (1.. maxNoOfCommonH-RNTI)) OF Common-H-RNTI-InfoItemLCR
 
 Common-H-RNTI-InfoItemLCR ::= SEQUENCE {
 	common-H-RNTI									HSDSCH-RNTI,
@@ -1434,6 +1859,153 @@ CommonMACFlow-Specific-InfoItem-ResponseLCR ::= SEQUENCE {
 CommonMACFlow-Specific-InfoItem-ResponseLCR-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 	...
 }
+CPC-InformationLCR ::= SEQUENCE {
+	continuousPacketConnectivity-DRX-InformationLCR				ContinuousPacketConnectivity-DRX-InformationLCR							OPTIONAL,
+	continuousPacketConnectivity-DRX-Information-to-Modify-LCR		ContinuousPacketConnectivity-DRX-Information-to-Modify-LCR			OPTIONAL,
+	hS-DSCH-Semi-PersistentScheduling-Information-LCR			HS-DSCH-Semi-PersistentScheduling-Information-LCR							OPTIONAL,
+	hS-DSCH-Semi-PersistentScheduling-Information-to-Modify-LCR	HS-DSCH-Semi-PersistentScheduling-Information-to-Modify-LCR				OPTIONAL,
+	hS-DSCH-SPS-Deactivate-Indicator-LCR						NULL		OPTIONAL,
+	e-DCH-Semi-PersistentScheduling-Information-LCR				E-DCH-Semi-PersistentScheduling-Information-LCR							OPTIONAL,
+	e-DCH-Semi-PersistentScheduling-Information-to-Modify-LCR	E-DCH-Semi-PersistentScheduling-Information-to-Modify-LCR				OPTIONAL,
+	e-DCH-SPS-Deactivate-Indicator-LCR							NULL		OPTIONAL,
+	iE-Extensions				ProtocolExtensionContainer { { CPC-InformationLCR-ExtIEs} }													OPTIONAL,
+	...
+}
+
+CPC-InformationLCR-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+ContinuousPacketConnectivity-DRX-CapabilityLCR ::= ENUMERATED {
+	continuous-Packet-Connectivity-DRX-Capable,
+	continuous-Packet-Connectivity-DRX-Non-Capable
+}
+
+
+ContinuousPacketConnectivity-DRX-InformationLCR ::= SEQUENCE {
+	enabling-Delay								Enabling-Delay,
+	hS-SCCH-DRX-Information-LCR					HS-SCCH-DRX-Information-LCR,
+	e-AGCH-DRX-Information-LCR					E-AGCH-DRX-Information-LCR 			OPTIONAL,
+	iE-Extensions								ProtocolExtensionContainer { { ContinuousPacketConnectivity-DRX-InformationLCR-ExtIEs } }			OPTIONAL,
+	...
+}
+
+ContinuousPacketConnectivity-DRX-InformationLCR-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+HS-SCCH-DRX-Information-LCR ::= SEQUENCE {
+	hS-SCCH-UE-DRX-Cycle-LCR									UE-DRX-Cycle-LCR,
+	hS-SCCH-Inactivity-Threshold-for-UE-DRX-Cycle-LCR			Inactivity-Threshold-for-UE-DRX-Cycle-LCR			OPTIONAL,
+	hS-SCCH-UE-DRX-Offset-LCR									UE-DRX-Offset-LCR,
+	iE-Extensions					ProtocolExtensionContainer { { HS-SCCH-DRX-Information-LCR-ExtIEs} } OPTIONAL,
+	...
+}
+
+HS-SCCH-DRX-Information-LCR-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+E-AGCH-DRX-Information-LCR ::= CHOICE {
+	sameAsHS-SCCH				NULL,
+	e-AGCH-DRX-Parameters		E-AGCH-DRX-Parameters,
+	...
+}
+
+E-AGCH-DRX-Parameters ::= SEQUENCE {
+	e-AGCH-UE-DRX-Cycle-LCR								UE-DRX-Cycle-LCR,
+	e-AGCH-UE-Inactivity-Monitor-Threshold				E-AGCH-UE-Inactivity-Monitor-Threshold			OPTIONAL,
+	e-AGCH-UE-DRX-Offset-LCR							UE-DRX-Offset-LCR,
+	iE-Extensions										ProtocolExtensionContainer { { E-AGCH-DRX-Parameters-ExtIEs} } OPTIONAL,
+	...
+}
+
+E-AGCH-DRX-Parameters-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+UE-DRX-Cycle-LCR ::= ENUMERATED {v1, v2, v4, v8, v16, v32, v64,...}
+	-- Unit subframe
+
+UE-DRX-Offset-LCR ::= INTEGER (0..63)
+	-- Unit subframe
+
+Inactivity-Threshold-for-UE-DRX-Cycle-LCR ::= ENUMERATED {v1, v2, v4, v8, v16, v32, v64,...}
+	-- Unit subframe
+
+E-AGCH-UE-Inactivity-Monitor-Threshold ::= ENUMERATED {v0, v1, v2, v4, v8, v16, v32, v64, v128, v256, v512, infinity,...}
+	-- Unit subframe
+ 
+ContinuousPacketConnectivity-DRX-Information-to-Modify-LCR ::= SEQUENCE {
+	enabling-Delay								Enabling-Delay							OPTIONAL,
+	dRX-Information-to-Modify-LCR				DRX-Information-to-Modify-LCR			OPTIONAL,
+	iE-Extensions								ProtocolExtensionContainer { { ContinuousPacketConnectivity-DRX-Information-to-Modify-LCR-ExtIEs } }				OPTIONAL,
+	...
+}
+
+ContinuousPacketConnectivity-DRX-Information-to-Modify-LCR-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+DRX-Information-to-Modify-LCR ::= CHOICE {
+	modify			DRX-Information-to-Modify-Items-LCR,
+	deactivate		NULL,
+	...
+}
+
+DRX-Information-to-Modify-Items-LCR ::= SEQUENCE {
+	hS-SCCH-DRX-Information-LCR					HS-SCCH-DRX-Information-LCR			OPTIONAL,
+	e-AGCH-DRX-Information-LCR					E-AGCH-DRX-Information-LCR			OPTIONAL,
+	iE-Extensions								ProtocolExtensionContainer { {DRX-Information-to-Modify-Items-LCR-ExtIEs} } OPTIONAL,
+	...
+}
+
+DRX-Information-to-Modify-Items-LCR-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+ContinuousPacketConnectivity-DRX-Information-ResponseLCR ::= SEQUENCE {
+	enabling-Delay							Enabling-Delay							OPTIONAL,
+	hS-SCCH-DRX-Information-ResponseLCR		HS-SCCH-DRX-Information-ResponseLCR		OPTIONAL,
+	e-AGCH-DRX-Information-ResponseLCR		E-AGCH-DRX-Information-ResponseLCR		OPTIONAL,
+	iE-Extensions							ProtocolExtensionContainer { { ContinuousPacketConnectivity-DRX-Information-ResponseLCR-ExtIEs } }			OPTIONAL,
+	...
+}
+
+ContinuousPacketConnectivity-DRX-Information-ResponseLCR-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+HS-SCCH-DRX-Information-ResponseLCR ::= SEQUENCE {
+	hS-SCCH-UE-DRX-Cycle-LCR									UE-DRX-Cycle-LCR		OPTIONAL,
+	hS-SCCH-Inactivity-Threshold-for-UE-DRX-Cycle-LCR			Inactivity-Threshold-for-UE-DRX-Cycle-LCR		OPTIONAL,
+	hS-SCCH-UE-DRX-Offset-LCR									UE-DRX-Offset-LCR		OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { { HS-SCCH-DRX-Information-ResponseLCR-ExtIEs} } OPTIONAL,
+	...
+}
+
+HS-SCCH-DRX-Information-ResponseLCR-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+E-AGCH-DRX-Information-ResponseLCR ::= CHOICE {
+	sameAsHS-SCCH						NULL,
+	e-AGCH-DRX-Parameters-Response		E-AGCH-DRX-Parameters-Response,
+	...
+}
+
+E-AGCH-DRX-Parameters-Response ::= SEQUENCE {
+	e-AGCH-UE-DRX-Cycle-LCR							UE-DRX-Cycle-LCR						OPTIONAL,
+	e-AGCH-UE-Inactivity-Monitor-Threshold			E-AGCH-UE-Inactivity-Monitor-Threshold	OPTIONAL,
+	e-AGCH-UE-DRX-Offset-LCR						UE-DRX-Offset-LCR						OPTIONAL,
+	iE-Extensions									ProtocolExtensionContainer { { E-AGCH-DRX-Parameters-Response-ExtIEs} } OPTIONAL,
+	...
+}
+
+E-AGCH-DRX-Parameters-Response-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 
 
 -- ==========================================
@@ -1635,7 +2207,8 @@ DedicatedMeasurementType ::= ENUMERATED {
 	hs-sich-quality,
 	best-Cell-Portions,
 	rx-timing-deviation-768,
-	rx-timing-deviation-384-extended
+	rx-timing-deviation-384-extended,
+	best-Cell-PortionsLCR
 
 }
 
@@ -1659,7 +2232,8 @@ Extension-DedicatedMeasurementValueIE NBAP-PROTOCOL-IES ::= {
 	{ ID id-Best-Cell-Portions-Value			CRITICALITY reject	TYPE Best-Cell-Portions-Value					PRESENCE mandatory }|
 	{ ID id-Rx-Timing-Deviation-Value-768		CRITICALITY reject	TYPE Rx-Timing-Deviation-Value-768			PRESENCE mandatory }|
 	{ ID id-Rx-Timing-Deviation-Value-384-ext	CRITICALITY reject	TYPE Rx-Timing-Deviation-Value-384-ext		PRESENCE mandatory }|
-	{ ID id-Extended-Round-Trip-Time-Value		CRITICALITY reject	TYPE Extended-Round-Trip-Time-Value			PRESENCE mandatory },
+	{ ID id-Extended-Round-Trip-Time-Value		CRITICALITY reject	TYPE Extended-Round-Trip-Time-Value			PRESENCE mandatory }|
+	{ ID id-Best-Cell-Portions-ValueLCR			CRITICALITY reject	TYPE Best-Cell-Portions-ValueLCR				PRESENCE mandatory },
 	...
 }
 
@@ -1994,6 +2568,20 @@ DL-HS-PDSCH-Timeslot-InformationItem-LCR-PSCH-ReconfRqst::= SEQUENCE {
 }
 
 DL-HS-PDSCH-Timeslot-InformationItem-LCR-PSCH-ReconfRqst-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	{ ID id-MaxHSDSCH-HSSCCH-Power-per-CELLPORTION						CRITICALITY ignore		EXTENSION MaxHSDSCH-HSSCCH-Power-per-CELLPORTION					PRESENCE optional},
+	...
+}
+
+MaxHSDSCH-HSSCCH-Power-per-CELLPORTION ::= SEQUENCE (SIZE (1..maxNrOfCellPortionsPerCellLCR)) OF MaxHSDSCH-HSSCCH-Power-per-CELLPORTION-Item
+
+MaxHSDSCH-HSSCCH-Power-per-CELLPORTION-Item::= SEQUENCE {
+	cellPortionLCRID							CellPortionLCRID,
+	maxHSDSCH-HSSCCH-Power						MaximumTransmissionPower,
+	iE-Extensions								ProtocolExtensionContainer { { MaxHSDSCH-HSSCCH-Power-per-CELLPORTION-Item-ExtIEs} }		OPTIONAL,
+	...
+}
+
+MaxHSDSCH-HSSCCH-Power-per-CELLPORTION-Item-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -2176,6 +2764,22 @@ DTX-Information-to-Modify-Items-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+Dual-Band-Capability ::= ENUMERATED {
+	dual-Band-Capable,
+	dual-Band-non-Capable
+}
+
+Dual-Band-Capability-Info::= SEQUENCE {
+	dual-Band-Capability										Dual-Band-Capability,
+	possible-Secondary-Serving-Cell-List						Possible-Secondary-Serving-Cell-List		OPTIONAL,
+	iE-Extensions				ProtocolExtensionContainer { { Dual-Band-Capability-Info-ExtIEs } }		OPTIONAL,
+	...
+}
+
+Dual-Band-Capability-Info-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 
 DwPCH-Power ::= INTEGER (-150..400,...)
 -- DwPCH-power = power * 10
@@ -2188,7 +2792,7 @@ DwPCH-Power ::= INTEGER (-150..400,...)
 --	E
 -- ==========================================
 
-E-AGCH-Table-Choice ::= ENUMERATED{table16B, table16B-12, ...}
+E-AGCH-Table-Choice ::= ENUMERATED{table16B, table16B-1, ...}
 
 E-AGCH-FDD-Code-Information ::= CHOICE {
 	replace					E-AGCH-FDD-Code-List,
@@ -2409,7 +3013,9 @@ E-DCH-LogicalChannelInformationItem ::= SEQUENCE {
 }
 
 E-DCH-LogicalChannelInformationItem-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
-	{ ID id-MaximumMACdPDU-SizeExtended 	CRITICALITY reject		EXTENSION	MAC-PDU-SizeExtended 	PRESENCE optional},
+	{ ID id-MaximumMACdPDU-SizeExtended 	CRITICALITY reject		EXTENSION	MAC-PDU-SizeExtended 	PRESENCE optional}|
+	{ ID id-MACes-Maximum-Bitrate-LCR		CRITICALITY ignore		EXTENSION	MACes-Maximum-Bitrate-LCR		PRESENCE optional}| --1.28Mcps TDD only
+	{ ID id-SRB-Indicator					CRITICALITY ignore		EXTENSION	SRB-Indicator				PRESENCE optional}, 
 	...
 }
 
@@ -2458,7 +3064,8 @@ E-DCH-LogicalChannelToModifyItem ::= SEQUENCE {
 }
 
 E-DCH-LogicalChannelToModifyItem-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
-	{ ID id-MaximumMACdPDU-SizeExtended 	CRITICALITY reject		EXTENSION	MAC-PDU-SizeExtended 	PRESENCE optional},
+	{ ID id-MaximumMACdPDU-SizeExtended 	CRITICALITY reject		EXTENSION	MAC-PDU-SizeExtended 	PRESENCE optional}|
+	{ ID id-MACes-Maximum-Bitrate-LCR		CRITICALITY ignore		EXTENSION	MACes-Maximum-Bitrate-LCR		PRESENCE optional}, --1.28Mcps TDD only
 	...
 }
 
@@ -2789,6 +3396,19 @@ E-DCHProvidedBitRate-Item-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+E-DCHProvidedBitRateValueInformation-For-CellPortion ::= SEQUENCE (SIZE (1..maxNrOfCellPortionsPerCellLCR)) OF E-DCHProvidedBitRateValueInformation-For-CellPortion-Item
+
+E-DCHProvidedBitRateValueInformation-For-CellPortion-Item ::= SEQUENCE{
+	cellPortionLCRID					CellPortionLCRID,
+	e-DCHProvidedBitRateValue		E-DCHProvidedBitRate,
+	iE-Extensions					ProtocolExtensionContainer { {E-DCHProvidedBitRateValueInformation-For-CellPortion-Item-ExtIEs} }	OPTIONAL,
+	...
+}
+
+E-DCHProvidedBitRateValueInformation-For-CellPortion-Item-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 E-AGCH-PowerOffset ::= INTEGER (0..255,...)
 -- PowerOffset = -32 + offset * 0.25
 -- Unit dB, Range -32dB .. +31.75dB, Step +0.25dB
@@ -3180,7 +3800,8 @@ E-DCH-LCRTDD-Information-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-Extended-E-DCH-LCRTDD-PhysicalLayerCategory						CRITICALITY reject		EXTENSION Extended-E-DCH-LCRTDD-PhysicalLayerCategory			PRESENCE optional }|
 	-- This IE shall be used if the E-DCH Physical Layer Category has a value larger than 5.
 	{ ID id-MaximumNumber-Of-Retransmission-for-Scheduling-Info-LCRTDD		CRITICALITY ignore		EXTENSION Maximum-Number-of-Retransmissions-For-E-DCH		PRESENCE optional }|
-	{ ID id-E-DCH-RetransmissionTimer-for-SchedulingInfo-LCRTDD				CRITICALITY ignore		EXTENSION E-DCH-MACdFlow-Retransmission-Timer			PRESENCE optional },
+	{ ID id-E-DCH-RetransmissionTimer-for-SchedulingInfo-LCRTDD				CRITICALITY ignore		EXTENSION E-DCH-MACdFlow-Retransmission-Timer			PRESENCE optional }|
+	{ ID id-E-AGCH-UE-Inactivity-Monitor-Threshold							CRITICALITY ignore		EXTENSION E-AGCH-UE-Inactivity-Monitor-Threshold			PRESENCE optional },
 	...
 }
 
@@ -3206,6 +3827,12 @@ E-DCH-LCR-Information-Reconfig-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 Enabling-Delay ::= ENUMERATED {v0, v1, v2, v4, v8, v16, v32, v64, v128}
 	-- Unit of radio frames
 
+DormantModeIndicator::= ENUMERATED {
+	enterDormantMode,
+	leaveDormantMode,
+...
+}
+
 Enhanced-FACH-Capability ::= ENUMERATED {
 	enhanced-FACH-capable,
 	enhanced-FACH-non-capable
@@ -3219,7 +3846,10 @@ Enhanced-PCH-Capability ::= ENUMERATED {
 }
 
 
-Enhanced-UE-DRX-Capability ::= NULL
+Enhanced-UE-DRX-Capability ::= ENUMERATED {
+	enhanced-UE-DRX-capable,
+	enhanced-UE-DRX-non-capable
+}
 
 Enhanced-UE-DRX-InformationFDD  ::= SEQUENCE {
 	t321										T321,
@@ -3253,6 +3883,55 @@ Extended-HS-SICH-ID					::= INTEGER (32..255)
 
 Extended-E-HICH-ID-TDD				::= INTEGER (32..255)
 
+E-DCH-Semi-PersistentScheduling-Information-LCR ::= SEQUENCE {
+	repetition-Period-List-LCR				Repetition-Period-List-LCR,
+	e-DCH-SPS-Indicator						E-DCH-SPS-Indicator,
+	sPS-E-DCH-releted-E-HICH-Information	E-HICH-LCR-Information,
+	iE-Extensions							ProtocolExtensionContainer { { E-DCH-Semi-PersistentScheduling-Information-LCR-ExtIEs } }			OPTIONAL,
+	...
+}
+
+E-DCH-Semi-PersistentScheduling-Information-LCR-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+{ ID id-E-DCH-SPS-Reservation-Indicator		CRITICALITY ignore		EXTENSION SPS-Reservation-Indicator	PRESENCE optional },
+	...
+}
+
+E-DCH-SPS-Indicator ::= BIT STRING (SIZE (16))
+
+E-DCH-Semi-PersistentScheduling-Information-to-Modify-LCR ::= SEQUENCE {
+	repetition-Period-List-LCR				Repetition-Period-List-LCR		OPTIONAL,
+	e-DCH-SPS-Indicator						E-DCH-SPS-Indicator				OPTIONAL,
+	sPS-E-DCH-releted-E-HICH-Information	E-HICH-LCR-Information			OPTIONAL,
+	iE-Extensions							ProtocolExtensionContainer { { E-DCH-Semi-PersistentScheduling-Information-to-Modify-LCR-ExtIEs } }			OPTIONAL,
+	...
+}
+
+E-DCH-Semi-PersistentScheduling-Information-to-Modify-LCR-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+{ ID id-E-DCH-SPS-Reservation-Indicator		CRITICALITY ignore		EXTENSION SPS-Reservation-Indicator	PRESENCE optional },
+	...
+}
+
+E-DCH-Semi-PersistentScheduling-Information-ResponseLCR ::= SEQUENCE {
+	timeslot-Resource-Related-Information		E-DCH-TimeslotResourceLCR,
+	powerResource								E-DCH-PowerResource,
+	repetition-Period-List-LCR					Repetition-Period-List-LCR, 
+	-- the IE shall be ignored
+	repetitionLength							RepetitionLength, 
+	-- the IE shall be ignored
+	subframeNumber								ENUMERATED {v0, v1},
+	tddE-PUCH-Offset							TddE-PUCH-Offset,
+	tdd-ChannelisationCode						TDD-ChannelisationCode,
+	n-E-UCCHLCR									N-E-UCCHLCR,
+	iE-Extensions								ProtocolExtensionContainer { { E-DCH-Semi-PersistentScheduling-Information-ResponseLCR-ExtIEs } }			OPTIONAL,
+	...
+}
+
+E-DCH-Semi-PersistentScheduling-Information-ResponseLCR-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	{ ID id-RepetitionPeriodIndex	CRITICALITY reject	EXTENSION RepetitionPeriodIndex		PRESENCE	optional },
+	-- mandaroty for 1.28Mcps TDD.
+	...
+}
+
 -- ==========================================
 --	F
 -- ==========================================
@@ -3343,25 +4022,9 @@ GANSS-AddClockModels ::= CHOICE {
 	...
 }
 
-GANSS-AddIonoModelReq ::= SEQUENCE {
-	dataID			BIT STRING (SIZE(2))											OPTIONAL,
-	iE-Extensions	ProtocolExtensionContainer { { GANSS-AddIonoModelReq-ExtIEs} } 	OPTIONAL,
-	...
-}
-
-GANSS-AddIonoModelReq-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
-	...
-}
-
-GANSS-AddNavigationModelsReq ::= SEQUENCE {
-	ganss-Add-Nav-Models-And-Time-Recovery		BOOLEAN																			OPTIONAL,
-	iE-Extensions								ProtocolExtensionContainer { { GANSS-AddNavigationModelsReq-ExtIEs} } 	OPTIONAL,
-	...
-}
+GANSS-AddIonoModelReq ::= BIT STRING (SIZE(2))
 
-GANSS-AddNavigationModelsReq-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
-	...
-}
+GANSS-AddNavigationModelsReq ::= BOOLEAN
 
 GANSS-AddOrbitModels ::= CHOICE {
 	navKeplerianSet	 				GANSS-NavModel-NAVKeplerianSet,
@@ -3371,15 +4034,7 @@ GANSS-AddOrbitModels ::= CHOICE {
 	...
 	}
 
-GANSS-AddUTCModelsReq ::= SEQUENCE {
-	ganss-Add-UTC-Models		BOOLEAN															OPTIONAL,
-	iE-Extensions				ProtocolExtensionContainer { { GANSS-AddUTCModelsReq-ExtIEs} } 	OPTIONAL,
-	...
-}
-
-GANSS-AddUTCModelsReq-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
-	...
-}
+GANSS-AddUTCModelsReq ::= BOOLEAN
 
 GANSS-Additional-Ionospheric-Model ::= SEQUENCE {
 	dataID								BIT STRING (SIZE(2)),
@@ -3427,13 +4082,18 @@ GANSS-Almanac-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 GANSS-AlmanacModel ::= CHOICE {
 	gANSS-keplerianParameters			GANSS-KeplerianParametersAlm,
 	...,
-	gANSS-alm-keplerianNAVAlmanac	 	GANSS-ALM-NAVKeplerianSet,
-	gANSS-alm-keplerianReducedAlmanac	GANSS-ALM-ReducedKeplerianSet,
-	gANSS-alm-keplerianMidiAlmanac		GANSS-ALM-MidiAlmanacSet,
-	gANSS-alm-keplerianGLONASS			GANSS-ALM-GlonassAlmanacSet,
-	gANSS-alm-ecefSBASAlmanac			GANSS-ALM-ECEFsbasAlmanacSet
+	extension-GANSS-AlmanacModel		Extension-GANSS-AlmanacModel
 }
 
+Extension-GANSS-AlmanacModel	::= ProtocolIE-Single-Container {{ Extension-GANSS-AlmanacModel-IE }}
+
+Extension-GANSS-AlmanacModel-IE NBAP-PROTOCOL-IES ::= {
+	{ ID id-GANSS-alm-keplerianNAVAlmanac			CRITICALITY		ignore		TYPE	GANSS-ALM-NAVKeplerianSet			PRESENCE	mandatory}|
+	{ ID id-GANSS-alm-keplerianReducedAlmanac		CRITICALITY		ignore		TYPE	GANSS-ALM-ReducedKeplerianSet		PRESENCE	mandatory}|
+	{ ID id-GANSS-alm-keplerianMidiAlmanac			CRITICALITY		ignore		TYPE	GANSS-ALM-MidiAlmanacSet				PRESENCE	mandatory}|
+	{ ID id-GANSS-alm-keplerianGLONASS				CRITICALITY		ignore		TYPE	GANSS-ALM-GlonassAlmanacSet			PRESENCE	mandatory}|
+	{ ID id-GANSS-alm-ecefSBASAlmanac				CRITICALITY		ignore		TYPE	GANSS-ALM-ECEFsbasAlmanacSet		PRESENCE	mandatory}
+}
 
 GANSS-ALM-ECEFsbasAlmanacSet ::= SEQUENCE {
 	sat-info-SBASecefList		GANSS-SAT-Info-Almanac-SBASecefList,
@@ -3521,15 +4181,7 @@ GANSS-AuxInfoGANSS-ID3-element-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-GANSS-AuxInfoReq ::= SEQUENCE {
-	ganss-Aux-Info			BOOLEAN														OPTIONAL,
-	iE-Extensions			ProtocolExtensionContainer { { GANSS-AuxInfoReq-ExtIEs} } 	OPTIONAL,
-	...
-}
-
-GANSS-AuxInfoReq-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
-	...
-}
+GANSS-AuxInfoReq ::= BOOLEAN
 
 GANSS-Clock-Model ::= SEQUENCE (SIZE (1..maxGANSSClockMod)) OF GANSS-SatelliteClockModelItem
 
@@ -3672,15 +4324,7 @@ GANSS-Earth-Orientation-Parameters-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-GANSS-EarthOrientParaReq ::= SEQUENCE {
-	eopReq			BOOLEAN																OPTIONAL,
-	iE-Extensions	ProtocolExtensionContainer { { GANSS-EarthOrientParaReq-ExtIEs} } 	OPTIONAL,
-	...
-}
-
-GANSS-EarthOrientParaReq-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
-	...
-}
+GANSS-EarthOrientParaReq ::= BOOLEAN
 
 GANSS-GenericDataInfoReqList ::= SEQUENCE (SIZE(1..maxNoGANSS)) OF GANSS-GenericDataInfoReqItem
 
@@ -3700,6 +4344,7 @@ GANSS-GenericDataInfoReqItem-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 	{ID id-GANSS-AddNavigationModelsReq	CRITICALITY	ignore	EXTENSION	GANSS-AddNavigationModelsReq						PRESENCE	optional} |
 	{ID id-GANSS-AddUTCModelsReq		CRITICALITY	ignore	EXTENSION	GANSS-AddUTCModelsReq								PRESENCE	optional} |
 	{ID id-GANSS-AuxInfoReq				CRITICALITY	ignore	EXTENSION	GANSS-AuxInfoReq									PRESENCE	optional} |
+-- The following IE shall be present if ‘GANSS-ID’ in ‘GANSS-GenericDataInfoReqItem’ is ‘0’ (SBAS)
 	{ID id-GANSS-SBAS-ID				CRITICALITY	ignore	EXTENSION	GANSS-SBAS-ID				PRESENCE	optional} ,
 	...
 }
@@ -3724,6 +4369,7 @@ GANSS-Generic-DataItem-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-GANSS-Additional-Navigation-Models		CRITICALITY ignore	EXTENSION GANSS-Additional-Navigation-Models	PRESENCE optional }|
 	{ ID id-GANSS-Additional-UTC-Models				CRITICALITY ignore	EXTENSION GANSS-Additional-UTC-Models				PRESENCE optional }|
 	{ ID id-GANSS-Auxiliary-Information				CRITICALITY ignore	EXTENSION GANSS-Auxiliary-Information				PRESENCE optional }|
+	-- The following element shall be present if ‘GANSS-ID’ in ‘GANSS-Generic-DataItem’ is ‘0’ (‘SBAS’)
 	{ ID id-GANSS-SBAS-ID							CRITICALITY ignore	EXTENSION GANSS-SBAS-ID			PRESENCE optional },
 	...
 }
@@ -3925,6 +4571,7 @@ GANSS-NavModel-NAVKeplerianSet-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 }
 
 GANSS-NavModel-SBASecef ::= SEQUENCE {
+	-- The following IE shall be present if ‘GANSS-SBASclockModel’ in ‘GANSS-AddClockModels’ is not included in ‘Ganss-Sat-Info-AddNavList’
 	sbasTo					BIT STRING (SIZE (13))												OPTIONAL,
 	sbasAccuracy			BIT STRING (SIZE (4)),
 	sbasXg					BIT STRING (SIZE (30)),
@@ -4544,6 +5191,19 @@ HS-DSCHProvidedBitRateValueInformation-For-CellPortion-Item-ExtIEs NBAP-PROTOCOL
 	...
 }
 
+HS-DSCHProvidedBitRateValueInformation-For-CellPortionLCR ::= SEQUENCE (SIZE (1..maxNrOfCellPortionsPerCellLCR)) OF HS-DSCHProvidedBitRateValueInformation-For-CellPortionLCR-Item
+
+HS-DSCHProvidedBitRateValueInformation-For-CellPortionLCR-Item ::= SEQUENCE{
+	cellPortionLCRID					CellPortionLCRID,
+	hS-DSCHProvidedBitRateValue		HS-DSCHProvidedBitRate,
+	iE-Extensions					ProtocolExtensionContainer { {HS-DSCHProvidedBitRateValueInformation-For-CellPortionLCR-Item-ExtIEs} }	OPTIONAL,
+	...
+}
+
+HS-DSCHProvidedBitRateValueInformation-For-CellPortionLCR-Item-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 HS-DSCHRequiredPower ::= SEQUENCE (SIZE (1..maxNrOfPriorityClasses)) OF HS-DSCHRequiredPower-Item
 
 HS-DSCHRequiredPower-Item ::= SEQUENCE {
@@ -4591,6 +5251,18 @@ HS-DSCHRequiredPowerValueInformation-For-CellPortion-Item-ExtIEs NBAP-PROTOCOL-E
 	...
 }
 
+HS-DSCHRequiredPowerValueInformation-For-CellPortionLCR ::= SEQUENCE (SIZE (1..maxNrOfCellPortionsPerCellLCR)) OF HS-DSCHRequiredPowerValueInformation-For-CellPortionLCR-Item
+
+HS-DSCHRequiredPowerValueInformation-For-CellPortionLCR-Item ::= SEQUENCE{
+	cellPortionLCRID				CellPortionLCRID,
+	hS-DSCHRequiredPowerValue	HS-DSCHRequiredPower,
+	iE-Extensions				ProtocolExtensionContainer { { HS-DSCHRequiredPowerValueInformation-For-CellPortionLCR-Item-ExtIEs} }		OPTIONAL,
+	...
+}
+
+HS-DSCHRequiredPowerValueInformation-For-CellPortionLCR-Item-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
 HSDPA-Associated-PICH-Information  ::= CHOICE {
 	hsdpa-PICH-Shared-with-PCH						HSDPA-PICH-Shared-with-PCH,
@@ -4672,8 +5344,10 @@ HSDSCH-FDD-Information-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-MIMO-ActivationIndicator				CRITICALITY reject		EXTENSION	MIMO-ActivationIndicator				PRESENCE optional}|
 	{ ID id-HSDSCH-MACdPDUSizeFormat 				CRITICALITY reject		EXTENSION	HSDSCH-MACdPDUSizeFormat				PRESENCE optional}|
 	{ ID id-SixtyfourQAM-UsageAllowedIndicator		CRITICALITY ignore		EXTENSION	SixtyfourQAM-UsageAllowedIndicator	PRESENCE optional}|
-	{ ID id-UE-without-HS-SCCH-constraint-indicator	CRITICALITY ignore		EXTENSION	NULL					PRESENCE optional}|
-	{ ID id-EnhancedHSServingCC-Abort				CRITICALITY reject		EXTENSION	EnhancedHSServingCC-Abort				PRESENCE optional},
+	{ ID id-UE-with-enhanced-HS-SCCH-support-indicator	CRITICALITY ignore		EXTENSION	NULL					PRESENCE optional}|
+	{ ID id-EnhancedHSServingCC-Abort				CRITICALITY reject		EXTENSION	EnhancedHSServingCC-Abort				PRESENCE optional}|
+	{ ID id-UE-SupportIndicatorExtension			CRITICALITY ignore		EXTENSION	UE-SupportIndicatorExtension			PRESENCE optional}|
+	{ ID id-Single-Stream-MIMO-ActivationIndicator	CRITICALITY reject		EXTENSION	Single-Stream-MIMO-ActivationIndicator		PRESENCE optional},
 	...
 }
 
@@ -4692,9 +5366,10 @@ HSDSCH-TDD-Information-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-HSSICH-TPC-StepSize		CRITICALITY	ignore			EXTENSION 	TDD-TPC-UplinkStepSize-LCR	PRESENCE 	optional}|
 	 -- Applicable to 1.28Mcps TDD only
 	{ ID id-HSDSCH-MACdPDUSizeFormat 	CRITICALITY reject		EXTENSION	HSDSCH-MACdPDUSizeFormat 	PRESENCE optional}|
-	{ ID id-tSN-Length				CRITICALITY reject			EXTENSION  TSN-Length				PRESENCE optional },
+	{ ID id-tSN-Length				CRITICALITY reject			EXTENSION  TSN-Length				PRESENCE optional }|
 	-- Applicable for 1.28Mcps TDD when using multiple frequencies
-	...
+		{ ID id-MIMO-ActivationIndicator				CRITICALITY reject		EXTENSION	MIMO-ActivationIndicator				PRESENCE optional},
+...
 }
 
 
@@ -4728,7 +5403,9 @@ HSDSCH-Information-to-Modify-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-MIMO-Mode-Indicator					CRITICALITY reject		EXTENSION 	MIMO-Mode-Indicator	PRESENCE optional }|
 	{ ID id-HSDSCH-MACdPDUSizeFormat			CRITICALITY reject		EXTENSION	HSDSCH-MACdPDUSizeFormat 	PRESENCE optional}|
 	{ ID id-SixtyfourQAM-UsageAllowedIndicator	CRITICALITY ignore		EXTENSION 	SixtyfourQAM-UsageAllowedIndicator		PRESENCE optional}|
-	{ ID id-EnhancedHSServingCC-Abort			CRITICALITY reject		EXTENSION	EnhancedHSServingCC-Abort			PRESENCE optional},
+	{ ID id-EnhancedHSServingCC-Abort			CRITICALITY reject		EXTENSION	EnhancedHSServingCC-Abort			PRESENCE optional}|
+	{ ID id-UE-SupportIndicatorExtension		CRITICALITY ignore		EXTENSION	UE-SupportIndicatorExtension		PRESENCE optional}|
+	{ ID id-Single-Stream-MIMO-Mode-Indicator	CRITICALITY reject		EXTENSION 	Single-Stream-MIMO-Mode-Indicator	PRESENCE optional },
 	...
 }
 
@@ -4780,7 +5457,10 @@ HSDSCH-Information-to-Modify-Unsynchronised-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 	 -- Applicable to 1.28Mcps TDD only
 	{ ID id-MIMO-Mode-Indicator					CRITICALITY reject		EXTENSION MIMO-Mode-Indicator	PRESENCE	optional }|
 	{ ID id-SixtyfourQAM-UsageAllowedIndicator	CRITICALITY ignore		EXTENSION 	SixtyfourQAM-UsageAllowedIndicator		PRESENCE optional}|
-	{ ID id-EnhancedHSServingCC-Abort			CRITICALITY reject		EXTENSION	EnhancedHSServingCC-Abort			PRESENCE optional},
+	{ ID id-EnhancedHSServingCC-Abort			CRITICALITY reject		EXTENSION	EnhancedHSServingCC-Abort			PRESENCE optional}|
+	{ ID id-UE-SupportIndicatorExtension		CRITICALITY ignore		EXTENSION	UE-SupportIndicatorExtension		PRESENCE optional}|
+	{ ID id-Single-Stream-MIMO-Mode-Indicator	CRITICALITY reject		EXTENSION 	Single-Stream-MIMO-Mode-Indicator	PRESENCE optional },
+	 -- Applicable to FDD only
 	...
 }
 
@@ -4810,6 +5490,10 @@ HS-DSCH-FDD-Secondary-Serving-Information ::= SEQUENCE {
 }
 
 HS-DSCH-FDD-Secondary-Serving-Information-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	{ID	id-MIMO-ActivationIndicator			CRITICALITY reject		EXTENSION MIMO-ActivationIndicator	PRESENCE optional}|
+	{ID id-Single-Stream-MIMO-ActivationIndicator	CRITICALITY reject		EXTENSION	Single-Stream-MIMO-ActivationIndicator		PRESENCE optional}|
+	{ID	id-DiversityMode			CRITICALITY reject		EXTENSION DiversityMode	PRESENCE optional}|
+	{ID	id-TransmitDiversityIndicator			CRITICALITY reject		EXTENSION TransmitDiversityIndicator	PRESENCE optional},
 	...
 }
 
@@ -4822,6 +5506,8 @@ HS-DSCH-FDD-Secondary-Serving-Information-Response ::= SEQUENCE {
 }
 
 HS-DSCH-FDD-Secondary-Serving-Information-Respons-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	{ID	id-MIMO-N-M-Ratio			CRITICALITY ignore		EXTENSION MIMO-N-M-Ratio			PRESENCE optional}|
+	{ID	id-HARQ-MemoryPartitioning	CRITICALITY ignore		EXTENSION HARQ-MemoryPartitioning	PRESENCE optional},
 	...
 }
 
@@ -4835,6 +5521,12 @@ HS-DSCH-Secondary-Serving-Information-To-Modify ::= SEQUENCE {
 }
 
 HS-DSCH-Secondary-Serving-Information-To-Modify-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	{ID	id-MIMO-Mode-Indicator			CRITICALITY reject		EXTENSION MIMO-Mode-Indicator		PRESENCE optional }|
+	{ID id-Single-Stream-MIMO-Mode-Indicator	CRITICALITY reject		EXTENSION 	Single-Stream-MIMO-Mode-Indicator	PRESENCE optional }|
+	{ID	id-DiversityMode		CRITICALITY reject		EXTENSION DiversityMode	PRESENCE optional}|
+	{ID	id-TransmitDiversityIndicator			CRITICALITY reject		EXTENSION TransmitDiversityIndicator	PRESENCE optional}|
+-- This IE shall be present if Diversity Mode IE is present and is not set to “none”
+	{ID	id-NonCellSpecificTxDiversity			CRITICALITY reject		EXTENSION NonCellSpecificTxDiversity	PRESENCE optional},
 	...
 }
 
@@ -4846,12 +5538,14 @@ HS-DSCH-FDD-Secondary-Serving-Information-To-Modify-Unsynchronised ::= SEQUENCE
 }
 
 HS-DSCH-FDD-Secondary-Serving-Information-To-Modify-Unsynchronised-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	{ID	id-MIMO-Mode-Indicator			CRITICALITY reject		EXTENSION MIMO-Mode-Indicator		PRESENCE optional}|	{ID id-Single-Stream-MIMO-Mode-Indicator	CRITICALITY reject		EXTENSION 	Single-Stream-MIMO-Mode-Indicator	PRESENCE optional },
 	...
 }
 
 HS-DSCH-FDD-Secondary-Serving-Update-Information ::= SEQUENCE {
 	hsSCCHCodeChangeIndicator					HSSCCH-CodeChangeIndicator					OPTIONAL,
 	hS-PDSCH-Code-Change-Indicator				HS-PDSCH-Code-Change-Indicator				OPTIONAL,
+	-- This IE shall never be included. If received it shall be ignored.
 	iE-Extensions								ProtocolExtensionContainer { { HS-DSCH-FDD-Secondary-Serving-Update-Information-ExtIEs } }		OPTIONAL,
 	...
 }
@@ -4942,8 +5636,10 @@ HSDSCH-TDD-Information-Response-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 	-- Applicable to 1.28Mcps TDD when using multiple frequencies ,This is the UARFCN for the first Frequency repetition
 { ID id-multipleFreq-HSPDSCH-InformationList-ResponseTDDLCR				CRITICALITY ignore	EXTENSION MultipleFreq-HSPDSCH-InformationList-ResponseTDDLCR	PRESENCE optional }|
 	-- Applicable to 1.28Mcps TDD when using multiple frequencies ,This MultipleFreq-HSPDSCH-InformationList-ResponseTDDLCR is the HS-SCCH and HARQ Memory Partitioning information for the 2nd and beyond HS-PDSCH frequencies.
-{ ID id-multicarrier-number												CRITICALITY ignore	EXTENSION  Multicarrier-Number													PRESENCE optional },
+{ ID id-multicarrier-number												CRITICALITY ignore	EXTENSION  Multicarrier-Number													PRESENCE optional }|
 	-- Applicable for 1.28Mcps TDD when using multiple frequencies
+	{ID id-MIMO-SFMode-For-HSPDSCHDualStream			CRITICALITY reject		EXTENSION MIMO-SFMode-For-HSPDSCHDualStream							PRESENCE optional}|	
+	{ID id-MIMO-ReferenceSignal-InformationListLCR		CRITICALITY reject	EXTENSION MIMO-ReferenceSignal-InformationListLCR		PRESENCE optional},
 	...
 }
 
@@ -5040,9 +5736,22 @@ HSDSCH-PreconfigurationInfo ::= SEQUENCE {
 }
 
 HSDSCH-PreconfigurationInfo-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	{ID	id-CellSpecificHARQMemoryPartitioning	CRITICALITY ignore		EXTENSION CellSpecificHARQMemoryPartitioning		PRESENCE optional}|
+	{ ID id-Additional-EDCH-Preconfiguration-Information		CRITICALITY ignore	EXTENSION Additional-EDCH-Preconfiguration-Information			PRESENCE optional },
+	...
+}
+
+Additional-EDCH-Preconfiguration-Information	::= SEQUENCE (SIZE (1..maxNrOfEDCH-1)) OF Additional-EDCH-Preconfiguration-Information-ItemIEs
+
+Additional-EDCH-Preconfiguration-Information-ItemIEs	::= SEQUENCE {
+	e-DCH-FDD-DL-Control-Channel-Information		E-DCH-FDD-DL-Control-Channel-Information,
+	iE-Extensions					ProtocolExtensionContainer { { Additional-EDCH-Preconfiguration-Information-ItemIEs-ExtIEs} } OPTIONAL,
 	...
 }
 
+Additional-EDCH-Preconfiguration-Information-ItemIEs-ExtIEs	NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
 HSDSCH-PreconfigurationSetup ::= SEQUENCE {
 	mAChsResetScheme		MAChsResetScheme,
@@ -5054,13 +5763,14 @@ HSDSCH-PreconfigurationSetup ::= SEQUENCE {
 	mIMO-ActivationIndicator		MIMO-ActivationIndicator			OPTIONAL,
 	hSDSCH-MACdPDUSizeFormat		HSDSCH-MACdPDUSizeFormat			OPTIONAL,
 	sixtyfourQAM-UsageAllowedIndicator		SixtyfourQAM-UsageAllowedIndicator			OPTIONAL,
-	uE-without-HS-SCCH-constraint-indicator		NULL		OPTIONAL,
+	uE-with-enhanced-HS-SCCH-support-indicator		NULL		OPTIONAL,
 	continuousPacketConnectivityHS-SCCH-less-Information			ContinuousPacketConnectivityHS-SCCH-less-Information		OPTIONAL,
 	iE-Extensions						ProtocolExtensionContainer { { HSDSCHPreconfigurationSetup-ExtIEs } }			OPTIONAL,
 	...
 }
 
 HSDSCHPreconfigurationSetup-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	{ID id-UE-SupportIndicatorExtension		CRITICALITY ignore		EXTENSION	UE-SupportIndicatorExtension	PRESENCE optional},
 	...
 }
 
@@ -5314,7 +6024,7 @@ HS-serving-cell-change-unsuccessful-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 
 HS-DSCH-DRX-Cycle-FACH ::= ENUMERATED {v4,v8,v16,v32,...}
 
-HS-DSCH-RX-Burst-FACH::= ENUMERATED {v2,v4,v8,v16,...}
+HS-DSCH-RX-Burst-FACH::= ENUMERATED {v1,v2,v4,v8,v16,...}
 
 
 HSDSCH-FDD-Update-Information ::= SEQUENCE {
@@ -5403,12 +6113,17 @@ HSDSCH-Common-System-InformationLCR-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 HSDSCH-Common-System-Information-ResponseLCR  ::= SEQUENCE {
 	hsSCCH-Specific-Information-ResponseLCR			HSSCCH-Specific-InformationRespListLCR				OPTIONAL,
 	hARQ-MemoryPartitioning							HARQ-MemoryPartitioning								OPTIONAL, 
+-- This HARQ Memory Partitioning Information is for the first Frequency repetition, HARQ Memory Partitioning Information for Frequency repetitions 2 and on, should be defined in MultipleFreq-HARQ-MemoryPartitioning-InformationList.
 	commonMACFlow-Specific-Info-ResponseLCR			CommonMACFlow-Specific-InfoList-ResponseLCR			OPTIONAL,
 	iE-Extensions									ProtocolExtensionContainer { { HSDSCH-Common-System-Information-ResponseLCR-ExtIEs } }		OPTIONAL,
 	...
 }
 
 HSDSCH-Common-System-Information-ResponseLCR-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+{ ID id-UARFCNforNt										CRITICALITY ignore	EXTENSION UARFCN	PRESENCE optional}|
+-- Applicable to 1.28Mcps TDD when using multiple frequencies ,This is the UARFCN for the first Frequency repetition
+{ ID id-MultipleFreq-HARQ-MemoryPartitioning-InformationList	CRITICALITY ignore	EXTENSION MultipleFreq-HARQ-MemoryPartitioning-InformationList	PRESENCE optional },
+-- Applicable to 1.28Mcps TDD when using multiple frequencies.This HARQ MemoryPartitioning Information is for the 2nd and beyond frequencies.
 	...
 }
 
@@ -5470,6 +6185,243 @@ HSSCCH-Specific-InformationRespItemLCR ::= SEQUENCE {
 HSSCCH-Specific-InformationRespItemLCR-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 	...
 }
+HS-DSCH-Semi-PersistentScheduling-Information-LCR ::= SEQUENCE {
+	transport-Block-Size-List				Transport-Block-Size-List-LCR,
+	repetition-Period-List-LCR				Repetition-Period-List-LCR,
+	hS-DSCH-SPS-Reservation-Indicator		SPS-Reservation-Indicator				OPTIONAL,
+	hS-DSCH-SPS-Operation-Indicator			HS-DSCH-SPS-Operation-Indicator,
+	iE-Extensions							ProtocolExtensionContainer { { HS-DSCH-Semi-PersistentScheduling-Information-LCR-ExtIEs } }			OPTIONAL,
+	...
+}
+
+HS-DSCH-Semi-PersistentScheduling-Information-LCR-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+Transport-Block-Size-List-LCR ::= SEQUENCE (SIZE (1..maxNoOfTBSs-Mapping-HS-DSCH-SPS)) OF Transport-Block-Size-Item-LCR
+
+Transport-Block-Size-Item-LCR ::= SEQUENCE {
+	transport-Block-Size-maping-Index-LCR		Transport-Block-Size-maping-Index-LCR,
+	transport-Block-Size-Index-LCR				Transport-Block-Size-Index-LCR,
+	iE-Extensions								ProtocolExtensionContainer { { Transport-Block-Size-Item-LCR-ExtIEs } }			OPTIONAL,
+	...
+}
+
+Transport-Block-Size-Item-LCR-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+Transport-Block-Size-maping-Index-LCR ::= INTEGER (0..maxNoOfTBSs-Mapping-HS-DSCH-SPS-1)
+
+Transport-Block-Size-Index-LCR ::= INTEGER (1..maxNoOfHS-DSCH-TBSsLCR)
+
+Repetition-Period-List-LCR ::= SEQUENCE (SIZE (1..maxNoOfRepetition-Period-LCR)) OF Repetition-Period-Item-LCR
+
+Repetition-Period-Item-LCR ::= SEQUENCE {
+	repetitionPeriodIndex		RepetitionPeriodIndex,
+	repetitionPeriod			RepetitionPeriod,
+	repetitionLength			RepetitionLength				OPTIONAL,
+	iE-Extensions				ProtocolExtensionContainer { { Repetition-Period-Item-LCR-ExtIEs } }			OPTIONAL,
+	...
+}
+
+Repetition-Period-Item-LCR-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+RepetitionPeriodIndex ::= INTEGER (0..maxNoOfRepetitionPeriod-SPS-LCR-1)
+
+SPS-Reservation-Indicator ::= ENUMERATED {
+	reserve
+}
+
+HS-DSCH-SPS-Operation-Indicator ::= CHOICE {
+	logicalChannellevel			LogicalChannellevel,
+	priorityQueuelevel			PriorityQueuelevel,
+	...
+}
+
+LogicalChannellevel ::= BIT STRING (SIZE (16))
+
+PriorityQueuelevel ::= BIT STRING (SIZE (8))
+
+HS-DSCH-Semi-PersistentScheduling-Information-to-Modify-LCR ::= SEQUENCE {
+	transport-Block-Size-List				Transport-Block-Size-List-LCR			OPTIONAL,
+	repetition-Period-List-LCR				Repetition-Period-List-LCR				OPTIONAL,
+	iE-Extensions							ProtocolExtensionContainer { { HS-DSCH-Semi-PersistentScheduling-Information-to-Modify-LCR-ExtIEs } }							OPTIONAL,
+	...
+}
+
+HS-DSCH-Semi-PersistentScheduling-Information-to-Modify-LCR-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+{ ID id-HS-DSCH-SPS-Reservation-Indicator		CRITICALITY ignore	EXTENSION SPS-Reservation-Indicator	PRESENCE optional },
+	...
+}
+
+HS-DSCH-Semi-PersistentScheduling-Information-ResponseLCR ::= SEQUENCE {
+	hS-SICH-InformationList-for-HS-DSCH-SPS		HS-SICH-InformationList-for-HS-DSCH-SPS,
+	initial-HS-PDSCH-SPS-Resource				Initial-HS-PDSCH-SPS-Resource			OPTIONAL,
+	buffer-Size-for-HS-DSCH-SPS					Process-Memory-Size						OPTIONAL,
+	number-of-Processes-for-HS-DSCH-SPS			Number-of-Processes-for-HS-DSCH-SPS		OPTIONAL,
+	iE-Extensions								ProtocolExtensionContainer { { HS-DSCH-Semi-PersistentScheduling-Information-ResponseLCR-ExtIEs } }			OPTIONAL,
+	...
+}
+
+HS-DSCH-Semi-PersistentScheduling-Information-ResponseLCR-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+HS-SICH-InformationList-for-HS-DSCH-SPS ::= SEQUENCE (SIZE (1..maxNoOf-HS-SICH-SPS)) OF HS-SICH-InformationItem-for-HS-DSCH-SPS
+
+HS-SICH-InformationItem-for-HS-DSCH-SPS ::= SEQUENCE {
+	hS-SICH-Mapping-Index			HS-SICH-Mapping-Index			OPTIONAL,
+	-- the IE is madatory for 1.28Mcps TDD.
+	hS-SICH-Type					HS-SICH-Type,
+	iE-Extensions					ProtocolExtensionContainer { { HS-SICH-InformationItem-for-HS-DSCH-SPS-ExtIEs } }			OPTIONAL,
+	...
+}
+
+HS-SICH-InformationItem-for-HS-DSCH-SPS-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+HS-SICH-Mapping-Index ::= INTEGER (0..maxNoOf-HS-SICH-SPS-1)
+
+HS-SICH-Type ::= CHOICE {
+	hS-SCCH-Associated-HS-SICH			HS-SCCH-Associated-HS-SICH,
+	non-HS-SCCH-Associated-HS-SICH		Non-HS-SCCH-Associated-HS-SICH,
+	...
+}
+
+
+HS-SCCH-Associated-HS-SICH ::= SEQUENCE {
+	hsSICH-ID							HS-SICH-ID,
+	extended-HS-SICH-ID					Extended-HS-SICH-ID			OPTIONAL,
+...
+}
+
+
+Non-HS-SCCH-Associated-HS-SICH::= SEQUENCE {
+	non-HS-SCCH-Aassociated-HS-SICH-ID	Non-HS-SCCH-Aassociated-HS-SICH-ID,
+...
+}
+
+Non-HS-SCCH-Aassociated-HS-SICH-ID ::= INTEGER (0..255)
+
+Initial-HS-PDSCH-SPS-Resource::= SEQUENCE {
+	repetitionPeriodIndex						RepetitionPeriodIndex,
+	repetitionLength							RepetitionLength			OPTIONAL,
+	-- the IE is not used.
+	hS-PDSCH-Offset								TDD-PhysicalChannelOffset,
+	timeslot-Resource-Related-Information		HS-DSCH-TimeslotResourceLCR,
+	startCode									TDD-ChannelisationCode,
+	endCode										TDD-ChannelisationCode,
+	transport-Block-Size-Index					Transport-Block-Size-Index-LCR,
+	modulationType								ModulationSPS-LCR,
+	hS-SICH-Mapping-Index						HS-SICH-Mapping-Index,
+	iE-Extensions								ProtocolExtensionContainer { { Initial-HS-PDSCH-SPS-Resource-ExtIEs } }			OPTIONAL,
+...
+}
+
+Initial-HS-PDSCH-SPS-Resource-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	{ ID id-MidambleShiftLCR	CRITICALITY reject	EXTENSION MidambleShiftLCR		PRESENCE	optional },
+	-- mandaroty for 1.28Mcps TDD.
+	...
+}
+
+HS-DSCH-TimeslotResourceLCR ::= BIT STRING (SIZE (5))
+
+ModulationSPS-LCR ::= ENUMERATED {
+	qPSK,
+	sixteenQAM,
+	...
+}
+
+Number-of-Processes-for-HS-DSCH-SPS ::= INTEGER (1..16)
+
+Add-To-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst::= SEQUENCE {
+	non-HS-SCCH-Associated-HS-SICH-InformationList		Non-HS-SCCH-Associated-HS-SICH-InformationList,
+	iE-Extensions										ProtocolExtensionContainer { { Add-To-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst-ExtIEs } }			OPTIONAL,
+...
+}
+
+Add-To-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+Non-HS-SCCH-Associated-HS-SICH-InformationList ::= SEQUENCE (SIZE (0..maxNoOfNon-HS-SCCH-Assosiated-HS-SICH)) OF Non-HS-SCCH-Associated-HS-SICH-InformationItem
+
+Non-HS-SCCH-Associated-HS-SICH-InformationItem ::= SEQUENCE {
+	non-HS-SCCH-Aassociated-HS-SICH-ID		Non-HS-SCCH-Aassociated-HS-SICH-ID,
+	timeSlotLCR								TimeSlotLCR,
+	midambleShiftLCR						MidambleShiftLCR,
+	tdd-ChannelisationCode					TDD-ChannelisationCode,
+	uARFCN									UARFCN						OPTIONAL,
+	iE-Extensions							ProtocolExtensionContainer { { Non-HS-SCCH-Associated-HS-SICH-InformationItem-ExtIEs } }			OPTIONAL,
+	...
+}
+
+Non-HS-SCCH-Associated-HS-SICH-InformationItem-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
+Modify-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst::= SEQUENCE {
+	modify-non-HS-SCCH-Associated-HS-SICH-InformationList		Modify-Non-HS-SCCH-Associated-HS-SICH-InformationList,
+	iE-Extensions						ProtocolExtensionContainer { { Modify-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst-ExtIEs } }			OPTIONAL,
+...
+}
+
+Modify-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+Modify-Non-HS-SCCH-Associated-HS-SICH-InformationList ::= SEQUENCE (SIZE (0..maxNoOfNon-HS-SCCH-Assosiated-HS-SICH)) OF Modify-Non-HS-SCCH-Associated-HS-SICH-InformationItem
+
+Modify-Non-HS-SCCH-Associated-HS-SICH-InformationItem ::= SEQUENCE {
+	non-HS-SCCH-Aassociated-HS-SICH-ID		Non-HS-SCCH-Aassociated-HS-SICH-ID,
+	timeSlotLCR								TimeSlotLCR						OPTIONAL,
+	midambleShiftLCR						MidambleShiftLCR				OPTIONAL,
+	tdd-ChannelisationCode					TDD-ChannelisationCode			OPTIONAL,
+	uARFCN									UARFCN							OPTIONAL,
+	iE-Extensions							ProtocolExtensionContainer { { Modify-Non-HS-SCCH-Associated-HS-SICH-InformationItem-ExtIEs } }			OPTIONAL,
+	...
+}
+
+Modify-Non-HS-SCCH-Associated-HS-SICH-InformationItem-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
+Delete-From-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst ::= SEQUENCE (SIZE (0..maxNoOfNon-HS-SCCH-Assosiated-HS-SICH)) OF Delete-From-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqstItem
+
+Delete-From-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqstItem ::= SEQUENCE {
+non-HS-SCCH-Aassociated-HS-SICH-ID			Non-HS-SCCH-Aassociated-HS-SICH-ID,
+...
+}
+
+MIMO-ReferenceSignal-InformationListLCR ::= SEQUENCE (SIZE (1..maxNrOfHSSCCHCodes)) OF HSSICH-ReferenceSignal-InformationLCR
+
+HSSICH-ReferenceSignal-InformationLCR ::= SEQUENCE {
+	midambleConfigurationLCR		MidambleConfigurationLCR,
+	midambleShift					INTEGER (0..15),
+	timeSlotLCR						TimeSlotLCR,
+	iE-Extensions					ProtocolExtensionContainer { { HSSICH-ReferenceSignal-InformationLCR-ExtIEs } }		OPTIONAL,
+	...
+}
+
+HSSICH-ReferenceSignal-InformationLCR-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+HSSICH-ReferenceSignal-InformationModifyLCR ::= SEQUENCE {
+	hSSICH-ReferenceSignal-InformationLCR		HSSICH-ReferenceSignal-InformationLCR	OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { { HSSICH-ReferenceSignal-InformationModifyLCR-ExtIEs } }		OPTIONAL,
+	...
+}
+
+HSSICH-ReferenceSignal-InformationModifyLCR-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
 -- ==========================================
 --	I
@@ -5531,8 +6483,9 @@ IB-Type ::= ENUMERATED {
 }
 
 IMB-Parameters ::= SEQUENCE {
-	sub-Frame-Number		Sub-Frame-Number,
-	ie-Extensions			ProtocolExtensionContainer { { IMB-Parameters-ExtIEs} }	OPTIONAL,
+	sub-Frame-Number						Sub-Frame-Number,
+	fdd-dl-ChannelisationCodeNumber			FDD-DL-ChannelisationCodeNumber							OPTIONAL,
+	ie-Extensions							ProtocolExtensionContainer { { IMB-Parameters-ExtIEs} }	OPTIONAL,
 	...
 }
 
@@ -5686,6 +6639,13 @@ IPDLTDDParameterLCR-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+IdleIntervalInformation	::= SEQUENCE {
+	idleIntervalInfo-k							INTEGER{none(0),two(2),three(3)} (0..3),
+	idleIntervalInfo-offset						INTEGER(0..7),
+	...
+}
+
+
 -- ==========================================
 --	J
 -- ==========================================
@@ -5732,7 +6692,7 @@ MAC-ehs-Reset-Timer ::= ENUMERATED {v1, v2, v3, v4,...}
 MACdPDU-Size ::= INTEGER (1..5000,...)
 	-- In case of E-DCH value 8 and values not multiple of 8 shall not be used
 
-MAC-PDU-SizeExtended ::= INTEGER (1..1504,...)
+MAC-PDU-SizeExtended ::= INTEGER (1..1504,...,1505)
 	-- In case of E-DCH value 1 shall not be used
 
 MAC-Inactivity-Threshold ::= ENUMERATED {v1, v2, v4, v8, v16, v32, v64, v128, v256, v512, infinity}
@@ -5766,6 +6726,8 @@ MACdPDU-Size-IndexItem-to-Modify-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 
 MACesGuaranteedBitRate ::= INTEGER (0..16777215,...,16777216..256000000)
 
+MACes-Maximum-Bitrate-LCR ::= INTEGER (0..256000000,...)
+
 MACeReset-Indicator ::= ENUMERATED {mACeReset}
 
 MAChsGuaranteedBitRate ::= INTEGER (0..16777215,...,16777216..256000000)
@@ -5773,7 +6735,7 @@ MAChsGuaranteedBitRate ::= INTEGER (0..16777215,...,16777216..256000000)
 MAChsReorderingBufferSize-for-RLC-UM ::= INTEGER (0..300,...)
 -- Unit kBytes
 
-MAC-hsWindowSize		::= ENUMERATED {v4, v6, v8, v12, v16, v24, v32,...}
+MAC-hsWindowSize		::= ENUMERATED {v4, v6, v8, v12, v16, v24, v32,..., v64, v128}
 -- For 1.28Mcps TDD when TSN length is configured to 9bits, ENUMERATED (32, 64, 96, 128, 160, 192, 256,...)
 
 
@@ -5792,15 +6754,15 @@ Max-EDCH-Resource-Allocation-for-CCCH ::= ENUMERATED {v8, v12, v16, v24, v32, v4
 
 Max-Period-for-Collistion-Resolution ::= INTEGER(8..24,...)
 
-Max-TB-Size ::= SEQUENCE {
+Max-TB-Sizes ::= SEQUENCE {
 	maximum-TB-Size-cell-edge-users		INTEGER (0..5000,...),
 	maximum-TB-Size-other-users			INTEGER (0..5000,...),
-	iE-Extensions						ProtocolExtensionContainer { {Max-TB-Size-ExtIEs} } OPTIONAL,
+	iE-Extensions						ProtocolExtensionContainer { {Max-TB-Sizes-ExtIEs} } OPTIONAL,
 	...
 	}
 
 
-Max-TB-Size-ExtIEs  NBAP-PROTOCOL-EXTENSION ::= {
+Max-TB-Sizes-ExtIEs  NBAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -6002,6 +6964,18 @@ MIMO-PilotConfiguration ::= CHOICE {
 	...
 }
 
+MIMO-PilotConfigurationExtension ::= CHOICE {
+	primary-and-secondary-CPICH				PrimaryAndSecondaryCPICHContainer,
+	normal-and-diversity-primary-CPICH		NormalAndDiversityPrimaryCPICHContainer,
+	...
+}
+
+
+MIMO-PowerOffsetForS-CPICHCapability ::= ENUMERATED {
+	s-CPICH-Power-Offset-Capable,  
+	s-CPICH-Power-Offset-Not-Capable
+}
+
 MinimumDL-PowerCapability ::=  INTEGER(0..800)
 -- Unit dBm, Range -30dBm .. 50dBm, Step +0.1dB
 
@@ -6080,6 +7054,20 @@ MBSFN-Only-Mode-Capability ::= ENUMERATED {
 
 Multicarrier-Number ::= INTEGER (1..maxHSDPAFrequency)
 
+MultipleFreq-HARQ-MemoryPartitioning-InformationList ::= SEQUENCE (SIZE (1..maxFrequencyinCell-1)) OF MultipleFreq-HARQ-MemoryPartitioning-InformationItem
+--Includes the 2nd through the max number of frequencies information repetitions.
+
+MultipleFreq-HARQ-MemoryPartitioning-InformationItem ::= SEQUENCE {
+	hARQ-MemoryPartitioning						HARQ-MemoryPartitioning,
+	uARFCN										UARFCN,
+	iE-Extensions					ProtocolExtensionContainer { { MultipleFreq-HARQ-MemoryPartitioning-InformationItem-ExtIEs} }					OPTIONAL,
+	...
+}
+
+MultipleFreq-HARQ-MemoryPartitioning-InformationItem-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 MultipleFreq-HSPDSCH-InformationList-ResponseTDDLCR ::= SEQUENCE (SIZE (1.. maxHSDPAFrequency-1)) OF MultipleFreq-HSPDSCH-InformationItem-ResponseTDDLCR
 --Includes the 2nd through the max number of frequency repetitions.
 
@@ -6112,6 +7100,11 @@ Multi-Cell-Capability-Info-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 }
 
 
+MIMO-SFMode-For-HSPDSCHDualStream ::= ENUMERATED {
+	sF1,
+	sF1SF16
+}
+
 -- ==========================================
 --	N
 -- ==========================================
@@ -6209,6 +7202,11 @@ NeighbouringTDDCellMeasurementInformation768Item-ExtIEs NBAP-PROTOCOL-EXTENSION
 	...
 }
 
+NonCellSpecificTxDiversity ::= ENUMERATED {
+	txDiversity,
+	...
+}
+
 NI-Information ::= SEQUENCE (SIZE (1..maxNrOfNIs)) OF Notification-Indicator
 
 Notification-Indicator ::= INTEGER (0..65535)
@@ -6216,6 +7214,16 @@ Notification-Indicator ::= INTEGER (0..65535)
 
 NodeB-CommunicationContextID ::= INTEGER (0..1048575)
 
+NormalAndDiversityPrimaryCPICHContainer ::= SEQUENCE {
+		iE-Extensions						ProtocolExtensionContainer { { NormalAndDiversityPrimaryCPICHContainer-ExtIEs} } OPTIONAL,
+	...
+}
+ 
+NormalAndDiversityPrimaryCPICHContainer-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
 NotificationIndicatorLength ::= ENUMERATED {
 	v2,
 	v4,
@@ -6224,7 +7232,9 @@ NotificationIndicatorLength ::= ENUMERATED {
 }
 
 
-NumberOfReportedCellPortions ::= INTEGER (1..maxNrOfCellPortionsPerCell,...)
+NumberOfReportedCellPortions ::= INTEGER (1..maxNrOfCellPortionsPerCell,...) 
+
+NumberOfReportedCellPortionsLCR ::= INTEGER (1..maxNrOfCellPortionsPerCellLCR,...)
 
 Number-of-PCCH-transmission ::= INTEGER (1..5)
 
@@ -6377,6 +7387,9 @@ PowerOffset ::= INTEGER (0..24)
 -- PowerOffset = offset * 0.25
 -- Unit dB, Range 0dB .. +6dB, Step +0.25dB
 
+PowerOffsetForSecondaryCPICHforMIMO ::= INTEGER (-6..0)
+-- Unit dB, Range -6dB .. 0dB, Step +1dB
+
 PowerRaiseLimit ::= INTEGER (0..10)
 
 PRACH-Midamble ::= ENUMERATED {
@@ -6434,6 +7447,17 @@ Pre-emptionVulnerability ::= ENUMERATED {
 	pre-emptable
 }
 
+PrimaryAndSecondaryCPICHContainer ::= SEQUENCE {
+	power-Offset-For-Secondary-CPICH-for-MIMO		PowerOffsetForSecondaryCPICHforMIMO,
+	iE-Extensions						ProtocolExtensionContainer { { PrimaryAndSecondaryCPICHContainer-ExtIEs} } OPTIONAL,
+	...
+}
+ 
+
+PrimaryAndSecondaryCPICHContainer-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 PrimaryCPICH-Power ::= INTEGER(-100..500)
 -- step 0.1 (Range –10.0..50.0) Unit is dBm
 
@@ -6483,7 +7507,9 @@ PriorityQueue-InfoItem ::= SEQUENCE {
 }
 
 PriorityQueue-InfoItem-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
-	{ ID id-MaximumMACdPDU-SizeExtended		CRITICALITY reject		EXTENSION	MAC-PDU-SizeExtended	PRESENCE optional},
+	{ ID id-MaximumMACdPDU-SizeExtended		CRITICALITY reject		EXTENSION	MAC-PDU-SizeExtended	PRESENCE optional}|
+	{ ID id-DL-RLC-PDU-Size-Format			CRITICALITY ignore		EXTENSION	DL-RLC-PDU-Size-Format		PRESENCE optional}|
+	{ ID id-SRB-Indicator					CRITICALITY ignore		EXTENSION	SRB-Indicator		PRESENCE optional},
 	...
 }
 
@@ -6504,7 +7530,8 @@ PriorityQueue-InfoItem-to-Add ::= SEQUENCE {
 }
 
 PriorityQueue-InfoItem-to-Add-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
-	{ ID id-MaximumMACdPDU-SizeExtended		CRITICALITY reject		EXTENSION	MAC-PDU-SizeExtended		PRESENCE optional},
+	{ ID id-MaximumMACdPDU-SizeExtended		CRITICALITY reject		EXTENSION	MAC-PDU-SizeExtended		PRESENCE optional} |
+	{ ID id-DL-RLC-PDU-Size-Format				CRITICALITY ignore		EXTENSION	DL-RLC-PDU-Size-Format	PRESENCE optional},
 	...
 }
 
@@ -6521,7 +7548,8 @@ PriorityQueue-InfoItem-to-Modify ::= SEQUENCE {
 }
 
 PriorityQueue-InfoItem-to-Modify-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
-	{ ID id-MaximumMACdPDU-SizeExtended		CRITICALITY reject		EXTENSION	MAC-PDU-SizeExtended	PRESENCE optional},
+	{ ID id-MaximumMACdPDU-SizeExtended		CRITICALITY reject		EXTENSION	MAC-PDU-SizeExtended	PRESENCE optional}|
+	{ ID id-DL-RLC-PDU-Size-Format			CRITICALITY ignore		EXTENSION	DL-RLC-PDU-Size-Format	PRESENCE optional},
 	...
 }
 
@@ -6562,6 +7590,51 @@ PunctureLimit ::= INTEGER (0..15)
 
 PUSCH-ID ::= INTEGER (0..255)
 
+UE-Selected-MBMS-Service-Information ::= CHOICE {
+	none							NULL,
+	selected-MBMS-Service			Selected-MBMS-Service,
+	...
+}
+Selected-MBMS-Service ::= SEQUENCE {
+	selected-MBMS-Service-List				Selected-MBMS-Service-List,
+	iE-Extensions							ProtocolExtensionContainer { { Selected-MBMS-Service-ExtIEs} }		OPTIONAL,
+	...
+}
+
+Selected-MBMS-Service-ExtIEs  NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
+Selected-MBMS-Service-List ::= SEQUENCE (SIZE (1.. maxMBMSServiceSelect)) OF Selected-MBMS-Service-Item
+
+
+Selected-MBMS-Service-Item ::= SEQUENCE {
+	selected-MBMS-Service-TimeSlot-Information-LCR			Selected-MBMS-Service-TimeSlot-Information-LCR		OPTIONAL,
+	mBMS-Service-TDM-Information			MBMS-Service-TDM-Information		OPTIONAL,
+	iE-Extensions							ProtocolExtensionContainer { { Selected-MBMS-Service-Item-ExtIEs} }		OPTIONAL,
+	...
+}
+
+Selected-MBMS-Service-Item-ExtIEs  NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+Selected-MBMS-Service-TimeSlot-Information-LCR ::= SEQUENCE (SIZE (1..7)) OF TimeSlotLCR
+
+MBMS-Service-TDM-Information ::= SEQUENCE {
+	transmission-Time-Interval			ENUMERATED {v10, v20, v40, v80,...},
+	tDM-Rep					INTEGER (2..9),
+	tDM-Offset				INTEGER (0..8),
+	tDM-Length				INTEGER (1..8),
+	iE-Extensions							ProtocolExtensionContainer { { MBMS-Service-TDM-Information-ExtIEs} }		OPTIONAL,
+	...
+}
+
+MBMS-Service-TDM-Information-ExtIEs  NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 PUSCHSet-ID ::= INTEGER (0..255)
 
 Paging-MACFlow-Specific-InformationLCR ::= SEQUENCE (SIZE (1.. maxNrOfPagingMACFlow)) OF Paging-MAC-Flow-Specific-Information-ItemLCR
@@ -6595,6 +7668,21 @@ Paging-MACFlows-to-DeleteLCR-Item ::= SEQUENCE {
 Paging-MACFlows-to-DeleteLCR-Item-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 	...
 }
+Process-Memory-Size	::=	ENUMERATED {
+										hms800, hms1600, hms2400, hms3200, hms4000,
+										hms4800, hms5600, hms6400, hms7200, hms8000,
+										hms8800, hms9600, hms10400, hms11200, hms12000,
+										hms12800, hms13600, hms14400, hms15200, hms16000,
+										hms17600, hms19200, hms20800, hms22400, hms24000,
+										hms25600, hms27200, hms28800, hms30400, hms32000,
+										hms36000, hms40000, hms44000, hms48000, hms52000,
+										hms56000, hms60000, hms64000, hms68000, hms72000,
+										hms76000, hms80000, hms88000, hms96000, hms104000,
+										hms112000, hms120000, hms128000, hms136000, hms144000,
+										hms152000, hms160000, hms176000, hms192000, hms208000,
+										hms224000, hms240000, hms256000, hms272000, hms288000,
+										hms304000,...}
+
 
 
 -- ==========================================
@@ -6867,8 +7955,11 @@ Extension-ReportCharacteristicsType-MeasurementIncreaseDecreaseThresholdIE NBAP-
 { ID id-UpPTSInterferenceValue		CRITICALITY reject	TYPE 	UpPTSInterferenceValue					PRESENCE mandatory }|
 { ID id-Received-Scheduled-EDCH-Power-Share		CRITICALITY reject	TYPE RSEPS-Value-IncrDecrThres		PRESENCE mandatory }|
 { ID id-Received-Scheduled-EDCH-Power-Share-For-CellPortion	CRITICALITY reject	TYPE RSEPS-Value-IncrDecrThres		PRESENCE mandatory }|
-{ ID id-EDCH-RACH-Report-IncrDecrThres						CRITICALITY ignore	TYPE EDCH-RACH-Report-IncrDecrThres		PRESENCE mandatory }
+{ ID id-EDCH-RACH-Report-IncrDecrThres						CRITICALITY reject	TYPE EDCH-RACH-Report-IncrDecrThres		PRESENCE mandatory }|
 	-- FDD only
+{ ID id-TransmittedCarrierPowerOfAllCodesNotUsedForHS-PDSCH-HS-SCCH-E-AGCHOrE-HICHTransmissionCellPortion	CRITICALITY reject	TYPE TransmittedCarrierPowerOfAllCodesNotUsedForHSTransmissionValue		PRESENCE mandatory }|
+{ ID id-ULTimeslotISCPValue-For-CellPortion		CRITICALITY reject	TYPE 	UL-TimeslotISCP-Value-IncrDecrThres					PRESENCE mandatory }|
+{ ID id-UpPTSInterferenceValue-For-CellPortion		CRITICALITY reject	TYPE 	UpPTSInterferenceValue					PRESENCE mandatory }
 }
 
 EDCH-RACH-Report-IncrDecrThres ::= SEQUENCE {
@@ -6929,8 +8020,11 @@ Extension-ReportCharacteristicsType-MeasurementThresholdIE NBAP-PROTOCOL-IES ::=
 	{ ID id-Additional-HS-SICH-Reception-Quality-Measurement-Value	CRITICALITY reject	TYPE HS-SICH-Reception-Quality-Measurement-Value			PRESENCE mandatory}|
 	-- Applicable to 1.28Mcps TDD only, used when the Measurement Threshold Value for HS-SICH Reception Quality are more than 20, Measurement Threshold Value = 20 + IE Value
 	{ ID id-TUTRANGANSSMeasurementThresholdInformation	CRITICALITY reject	TYPE TUTRANGANSSMeasurementThresholdInformation	PRESENCE mandatory }|
-	{ ID id-EDCH-RACH-Report-ThresholdInformation		CRITICALITY ignore	TYPE EDCH-RACH-Report-ThresholdInformation			PRESENCE mandatory }
+	{ ID id-EDCH-RACH-Report-ThresholdInformation		CRITICALITY reject	TYPE EDCH-RACH-Report-ThresholdInformation			PRESENCE mandatory }|
 	-- FDD only
+	{ ID id-TransmittedCarrierPowerOfAllCodesNotUsedForHS-PDSCH-HS-SCCH-E-AGCHOrE-HICHTransmissionCellPortion	CRITICALITY reject	TYPE TransmittedCarrierPowerOfAllCodesNotUsedForHSTransmissionValue		PRESENCE mandatory }|
+	{ ID id-ULTimeslotISCPValue-For-CellPortion			CRITICALITY reject	TYPE 	UL-TimeslotISCP-Value				PRESENCE mandatory }|
+	{ ID id-UpPTSInterferenceValue-For-CellPortion		CRITICALITY reject	TYPE 	UpPTSInterferenceValue				PRESENCE mandatory }
 }
 
 EDCH-RACH-Report-ThresholdInformation ::= SEQUENCE {
@@ -6992,6 +8086,12 @@ RLC-Mode	::= ENUMERATED {
 	...
 }
 
+DL-RLC-PDU-Size-Format	::= ENUMERATED {
+	fixed-RLC-PDU-Size,
+	flexible-RLC-PDU-Size,
+	...
+}
+
 Round-Trip-Time-IncrDecrThres ::= INTEGER(0..32766)
 
 RNC-ID					::= INTEGER (0..4095)
@@ -7017,6 +8117,19 @@ Received-total-wide-band-power-For-CellPortion-Value-Item-ExtIEs NBAP-PROTOCOL-E
 	...
 }
 
+Received-total-wide-band-power-For-CellPortion-ValueLCR ::= SEQUENCE (SIZE (1..maxNrOfCellPortionsPerCellLCR)) OF Received-total-wide-band-power-For-CellPortion-ValueLCR-Item
+
+Received-total-wide-band-power-For-CellPortion-ValueLCR-Item ::= SEQUENCE{
+	cellPortionLCRID							CellPortionLCRID, 
+	received-total-wide-band-power-value	Received-total-wide-band-power-Value,
+	iE-Extensions							ProtocolExtensionContainer { { Received-total-wide-band-power-For-CellPortion-ValueLCR-Item-ExtIEs} }		OPTIONAL,
+...
+}
+
+Received-total-wide-band-power-For-CellPortion-ValueLCR-Item-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 Received-total-wide-band-power-Value ::= INTEGER(0..621)
 -- According to mapping in [22]/[23]
 
@@ -7068,8 +8181,8 @@ InformationnotAvailable ::= NULL
 
 RequestedDataValue ::= SEQUENCE {
 	dgps-corrections		DGPSCorrections													OPTIONAL,
-	gps-navandrecovery		GPS-NavigationModel-and-TimeRecovery								OPTIONAL,
-	gps-ionos-model			GPS-Ionospheric-Model												OPTIONAL,
+	gps-navandrecovery		GPS-NavigationModel-and-TimeRecovery							OPTIONAL,
+	gps-ionos-model			GPS-Ionospheric-Model											OPTIONAL,
 	gps-utc-model			GPS-UTC-Model													OPTIONAL,
 	gps-almanac				GPS-Almanac														OPTIONAL,
 	gps-rt-integrity		GPS-RealTime-Integrity											OPTIONAL,
@@ -7217,9 +8330,16 @@ SecondaryServingCellsItem ::= SEQUENCE {
 }
 
 SecondaryServingCellsItem-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	{ID	id-MIMO-ActivationIndicator			CRITICALITY ignore		EXTENSION MIMO-ActivationIndicator	PRESENCE optional}|
+{ID	id-EDCH-Indicator			CRITICALITY ignore		EXTENSION NULL		PRESENCE optional},
 	...
 }
 
+Secondary-UL-Frequency-Activation-State ::= ENUMERATED {
+	activated,
+	deactivated,
+		...
+}
 
 SchedulingPriorityIndicator 			::= INTEGER (0..15)		 -- lowest (0), highest (15)
 
@@ -7275,6 +8395,8 @@ SetsOfHS-SCCH-CodesItem ::= SEQUENCE {
 }
 
 SetsOfHS-SCCH-CodesItem-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	{ID	id-MIMO-N-M-Ratio				CRITICALITY ignore		EXTENSION MIMO-N-M-Ratio			PRESENCE optional}|
+	{ID	id-HARQ-MemoryPartitioning		CRITICALITY ignore		EXTENSION HARQ-MemoryPartitioning	PRESENCE optional},
 	...
 }
 
@@ -7378,6 +8500,19 @@ SFNSFNValue ::= CHOICE {
 	sFNSFN-TDD768	SFNSFN-TDD768
 }
 
+Single-Stream-MIMO-ActivationIndicator ::= NULL
+
+Single-Stream-MIMO-Capability ::= ENUMERATED {
+	single-stream-mimo-capable,
+	single-stream-mimo-non-capable
+}
+
+
+Single-Stream-MIMO-Mode-Indicator ::= ENUMERATED {
+	activate,
+	deactivate
+}
+
 SIR-Error-Value-IncrDecrThres ::= INTEGER (0..124)
 
 SIR-Value ::= INTEGER (0..63)
@@ -7431,6 +8566,8 @@ Soffset ::= INTEGER (0..9,...)
 
 SpecialBurstScheduling ::= INTEGER (1..256)	-- Number of frames between special burst transmission during DTX
 
+SRB-Indicator ::= NULL
+
 Start-Of-Audit-Sequence-Indicator ::= ENUMERATED {
 	start-of-audit-sequence,
 	not-start-of-audit-sequence
@@ -7537,6 +8674,10 @@ SynchronisationReportType ::= ENUMERATED {
 	frequencyAcquisition,
 	...
 }
+Semi-PersistentScheduling-CapabilityLCR ::= ENUMERATED {
+	semi-Persistent-scheduling-Capable,
+	semi-Persistent-scheduling-Non-Capable
+}
 
 -- ==========================================
 --	T
@@ -7987,6 +9128,19 @@ TransmittedCarrierPowerOfAllCodesNotUsedForHS-PDSCH-HS-SCCH-E-AGCH-E-RGCHOrE-HIC
 	...
 }
 
+TransmittedCarrierPowerOfAllCodesNotUsedForHS-PDSCH-HS-SCCH-E-AGCHOrE-HICHTransmissionCellPortionValue ::= SEQUENCE (SIZE (1..maxNrOfCellPortionsPerCellLCR)) OF TransmittedCarrierPowerOfAllCodesNotUsedForHS-PDSCH-HS-SCCH-E-AGCHOrE-HICHTransmissionCellPortionValue-Item
+
+TransmittedCarrierPowerOfAllCodesNotUsedForHS-PDSCH-HS-SCCH-E-AGCHOrE-HICHTransmissionCellPortionValue-Item ::= SEQUENCE{
+	cellPortionLCRID							CellPortionLCRID,
+	transmittedCarrierPowerOfAllCodesNotUsedForHSTransmissionValue	TransmittedCarrierPowerOfAllCodesNotUsedForHSTransmissionValue,
+	iE-Extensions							ProtocolExtensionContainer { { TransmittedCarrierPowerOfAllCodesNotUsedForHS-PDSCH-HS-SCCH-E-AGCHOrE-HICHTransmissionCellPortionValue-Item-ExtIEs} }		OPTIONAL,
+	...
+}
+
+TransmittedCarrierPowerOfAllCodesNotUsedForHS-PDSCH-HS-SCCH-E-AGCHOrE-HICHTransmissionCellPortionValue-Item-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 TransmittedCarrierPowerOfAllCodesNotUsedForHSTransmissionValue ::= INTEGER(0..100)
 -- According to mapping in [22] and [23]
 
@@ -8003,6 +9157,19 @@ Transmitted-Carrier-Power-For-CellPortion-Value-Item-ExtIEs NBAP-PROTOCOL-EXTENS
 	...
 }
 
+Transmitted-Carrier-Power-For-CellPortion-ValueLCR ::= SEQUENCE (SIZE (1..maxNrOfCellPortionsPerCellLCR)) OF Transmitted-Carrier-Power-For-CellPortion-ValueLCR-Item
+
+Transmitted-Carrier-Power-For-CellPortion-ValueLCR-Item ::= SEQUENCE{
+	cellPortionLCRID							CellPortionLCRID, 
+	transmitted-Carrier-Power-Value			Transmitted-Carrier-Power-Value,
+	iE-Extensions							ProtocolExtensionContainer { { Transmitted-Carrier-Power-For-CellPortion-ValueLCR-Item-ExtIEs} }		OPTIONAL,
+	...
+}
+
+Transmitted-Carrier-Power-For-CellPortion-ValueLCR-Item-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 Transmitted-Carrier-Power-Value ::= INTEGER(0..100)
 -- According to mapping in [22]/[23]
 
@@ -8313,6 +9480,11 @@ TUTRANGPSMeasurementValueInformationItem-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 TUTRANGPSQuality ::= INTEGER (0..255)
 -- Unit chip, Step 1/16 chip, Range 0.. 255/16 chip
 
+TxDiversityOnDLControlChannelsByMIMOUECapability ::= ENUMERATED {
+	dL-Control-Channel-Tx-Diversity-for-MIMO-UE-with-non-diverse-P-CPICH-Capable,
+	dL-Control-Channel-Tx-Diversity-for-MIMO-UE-with-non-diverse-P-CPICH-Not-Capable
+}
+
 TypeOfError ::= ENUMERATED {
 	not-understood,
 	missing,
@@ -8344,6 +9516,17 @@ UDRE ::= ENUMERATED {
     udre-greaterequaleight-m
 }
 
+UE-AggregateMaximumBitRate ::= SEQUENCE {
+	uE-AggregateMaximumBitRateDownlink		UE-AggregateMaximumBitRateDownlink	OPTIONAL,
+	uE-AggregateMaximumBitRateUplink		UE-AggregateMaximumBitRateUplink	OPTIONAL,
+	...
+}
+
+UE-AggregateMaximumBitRateDownlink			::= INTEGER (1..1000000000)
+-- Unit is bits per sec
+
+UE-AggregateMaximumBitRateUplink			::= INTEGER (1..1000000000)
+-- Unit is bits per sec
 
 UE-Capability-Information ::= SEQUENCE {
 	hSDSCH-Physical-Layer-Category		INTEGER (1..64,...),
@@ -8353,10 +9536,19 @@ UE-Capability-Information ::= SEQUENCE {
 
 UE-Capability-Information-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 	{ID id-LCRTDD-uplink-Physical-Channel-Capability		CRITICALITY ignore		EXTENSION LCRTDD-Uplink-Physical-Channel-Capability			PRESENCE optional}|
-	{ID id-number-Of-Supported-Carriers						CRITICALITY reject		EXTENSION Number-Of-Supported-Carriers							PRESENCE optional},
+	{ID id-number-Of-Supported-Carriers						CRITICALITY reject		EXTENSION Number-Of-Supported-Carriers							PRESENCE optional}|
+	{ID id-MultiCarrier-HSDSCH-Physical-Layer-Category		CRITICALITY ignore		EXTENSION LCRTDD-HSDSCH-Physical-Layer-Category			PRESENCE optional}|
+	{ID id-MIMO-SFMode-Supported-For-HSPDSCHDualStream			CRITICALITY reject		EXTENSION MIMO-SFMode-For-HSPDSCHDualStream							PRESENCE optional},
 	...
 }
 
+UE-SupportIndicatorExtension ::= BIT STRING (SIZE (32))
+-- First bit: Different HS-SCCH In Consecutive TTIs Support Indicator
+-- Second bit: HS-SCCH orders in HS-SCCH-less Operation Support Indicator
+-- Note that undefined bits are considered as a spare bit and spare bits shall be set to 0 by the transmitter and shall be ignored by the receiver.
+
+LCRTDD-HSDSCH-Physical-Layer-Category ::= INTEGER (1..64)
+
 UE-DPCCH-burst1 ::= ENUMERATED {v1, v2, v5}
 	-- Unit subframe
 
@@ -8532,6 +9724,19 @@ UL-TimeSlot-ISCP-LCR-InfoItem-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+UpPTSInterference-For-CellPortion-Value ::= SEQUENCE (SIZE (1..maxNrOfCellPortionsPerCellLCR)) OF UpPTSInterference-For-CellPortion-Value-Item
+
+UpPTSInterference-For-CellPortion-Value-Item ::= SEQUENCE{
+	cellPortionLCRID							CellPortionLCRID, 
+	upPTSInterferenceValue						UpPTSInterferenceValue,
+	iE-Extensions							ProtocolExtensionContainer { { UpPTSInterference-For-CellPortion-Value-Item-ExtIEs} }		OPTIONAL,
+	...
+}
+
+UpPTSInterference-For-CellPortion-Value-Item-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 UpPTSInterferenceValue ::= INTEGER (0..127,...)
 
 Unidirectional-DCH-Indicator	::= ENUMERATED {
@@ -8573,6 +9778,19 @@ USCH-InformationResponseItem-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+UL-TimeslotISCP-For-CellPortion-Value ::= SEQUENCE (SIZE (1..maxNrOfCellPortionsPerCellLCR)) OF UL-TimeslotISCP-For-CellPortion-Value-Item
+
+UL-TimeslotISCP-For-CellPortion-Value-Item ::= SEQUENCE{
+	cellPortionLCRID							CellPortionLCRID, 
+	uL-TimeslotISCP-Value						UL-TimeslotISCP-Value,
+	iE-Extensions							ProtocolExtensionContainer { { UL-TimeslotISCP-For-CellPortion-Value-Item-ExtIEs} }		OPTIONAL,
+	...
+}
+
+UL-TimeslotISCP-For-CellPortion-Value-Item-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 UL-TimeslotISCP-Value ::= INTEGER (0..127)
 -- According to mapping in [23]
 
@@ -8580,6 +9798,12 @@ UL-TimeslotISCP-Value-IncrDecrThres ::= INTEGER (0..126)
 
 USCH-ID ::= INTEGER (0..255)
 
+Uu-ActivationState ::= ENUMERATED {
+	activated,
+	de-activated,
+	...
+}
+
 -- ==========================================
 --	V
 -- ==========================================
@@ -8601,4 +9825,3 @@ USCH-ID ::= INTEGER (0..255)
 -- ==========================================
 
 END
-
diff --git a/asn1/nbap/NBAP-PDU-Contents.asn b/asn1/nbap/NBAP-PDU-Contents.asn
index 7f9f7bb709..0011283a5f 100644
--- a/asn1/nbap/NBAP-PDU-Contents.asn
+++ b/asn1/nbap/NBAP-PDU-Contents.asn
@@ -1,6 +1,6 @@
 -- NBAP-PDU-Contents.asn
 --
--- Taken from 3GPP TS 25.433 V8.3.0 (2008-12)
+-- Taken from 3GPP TS 25.433 V9.1.0 (2009-12)
 -- http://www.3gpp.org/ftp/Specs/archive/25_series/25.433
 --
 -- 9.3.3	PDU Definitions
@@ -51,7 +51,8 @@ IMPORTS
 	CellSyncBurstRepetitionPeriod,
 	CellSyncBurstSIR,
 	CellSyncBurstTiming,
-	CellSyncBurstTimingThreshold,
+	CellSyncBurstTimingThreshold, 
+	CellPortion-CapabilityLCR,
 	CFN,
 	ChipOffset,
 	C-ID,
@@ -66,6 +67,7 @@ IMPORTS
 	CommonPhysicalChannelID,
 	CommonPhysicalChannelID768,
 	Common-EDCH-Capability,
+	Common-E-DCH-HSDPCCH-Capability,
 	Common-EDCH-System-InformationFDD,
 	Common-EDCH-System-Information-ResponseFDD,
 	Common-PhysicalChannel-Status-Information,
@@ -81,6 +83,10 @@ IMPORTS
 	ContinuousPacketConnectivityHS-SCCH-less-Capability,
 	ContinuousPacketConnectivityHS-SCCH-less-Information,
 	ContinuousPacketConnectivityHS-SCCH-less-Information-Response,
+	ContinuousPacketConnectivity-DRX-CapabilityLCR,
+	ContinuousPacketConnectivity-DRX-InformationLCR,
+	ContinuousPacketConnectivity-DRX-Information-ResponseLCR,
+	CPC-InformationLCR,
 	CPC-Information,
 	CriticalityDiagnostics,
 	CRNC-CommunicationContextID,
@@ -122,6 +128,7 @@ IMPORTS
 	DSCH-ID,
 	DSCH-InformationResponse,
 	DSCH-TDD-Information,
+	Dual-Band-Capability-Info,
 	DwPCH-Power,
 	E-AGCH-FDD-Code-Information,
 	E-AI-Capability,
@@ -236,7 +243,8 @@ IMPORTS
 	NI-Information,
 	NodeB-CommunicationContextID,
 	NotificationIndicatorLength,
-	NumberOfReportedCellPortions,
+	NumberOfReportedCellPortions, 
+	NumberOfReportedCellPortionsLCR,
 	NSubCyclesPerCyclePeriod,
 	PagingIndicatorLength,
 	Paging-MACFlows-to-DeleteFDD,
@@ -292,6 +300,7 @@ IMPORTS
 	Secondary-CPICH-Information-Change,
 	SecondaryCCPCH-SlotFormat,
 	Segment-Type,
+	Semi-PersistentScheduling-CapabilityLCR,
 	Serving-E-DCH-RL-ID,
 	SixteenQAM-UL-Capability,
 	SixtyfourQAM-DL-Capability,
@@ -420,6 +429,7 @@ IMPORTS
 	MBSFN-Only-Mode-Capability,
 	UPPCHPositionLCR,
 	ControlGAP,
+	IdleIntervalInformation,
 	Extended-HS-SICH-ID,
 	Extended-HS-SCCH-ID,
 	TimeslotLCR-Extension,
@@ -454,7 +464,34 @@ IMPORTS
 	Multi-Cell-Capability-Info,
 	MinimumReducedE-DPDCH-GainFactor,
 	IMB-Parameters,
-	E-RNTI
+	E-RNTI,
+	E-DCH-Semi-PersistentScheduling-Information-LCR,
+	HS-DSCH-Semi-PersistentScheduling-Information-LCR,
+	Add-To-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst,
+	Modify-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst,
+	Delete-From-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst,
+	HS-DSCH-Semi-PersistentScheduling-Information-ResponseLCR,
+	E-DCH-Semi-PersistentScheduling-Information-ResponseLCR,
+	HSSICH-ReferenceSignal-InformationLCR,
+	UE-Selected-MBMS-Service-Information,
+	UE-AggregateMaximumBitRate,
+	HSSICH-ReferenceSignal-InformationModifyLCR,
+	TimeSlotMeasurementValueListLCR,
+	MIMO-PowerOffsetForS-CPICHCapability,
+	MIMO-PilotConfigurationExtension,
+	TxDiversityOnDLControlChannelsByMIMOUECapability,
+	Single-Stream-MIMO-Capability,
+	
+	ActivationInformation,
+	Cell-Capability-Container,
+	DormantModeIndicator,
+	Additional-EDCH-Setup-Info,
+	Additional-EDCH-Cell-Information-Response-List,
+	Additional-EDCH-Cell-Information-To-Add-List,
+	Additional-EDCH-FDD-Information-Response-ItemIEs,
+	Additional-EDCH-Cell-Information-ConfigurationChange-List,
+	Additional-EDCH-Cell-Information-Removal-List,
+	Additional-EDCH-FDD-Update-Information
 
 FROM NBAP-IEs
 
@@ -517,12 +554,14 @@ FROM NBAP-Containers
 	id-CellSyncBurstMeasReconfiguration-CellSyncReconfRqstTDD,
 	id-CellSyncBurstMeasInfoList-CellSyncReconfRqstTDD,
 	id-CellSyncBurstInfoList-CellSyncReconfRqstTDD,
-	id-CellSyncInfo-CellSyncReprtTDD,
+	id-CellSyncInfo-CellSyncReprtTDD, 
+	id-CellPortion-CapabilityLCR,
 	id-CFN,
 	id-CFNReportingIndicator,
 	id-C-ID,
 	id-Closed-Loop-Timing-Adjustment-Mode,
 	id-Common-EDCH-Capability,
+	id-Common-E-DCH-HSDPCCH-Capability,
 	id-Common-EDCH-MACdFlows-to-DeleteFDD,
 	id-Common-EDCH-System-InformationFDD,
 	id-Common-EDCH-System-Information-ResponseFDD,
@@ -547,6 +586,10 @@ FROM NBAP-Containers
 	id-ContinuousPacketConnectivityHS-SCCH-less-Capability,
 	id-ContinuousPacketConnectivityHS-SCCH-less-Information,
 	id-ContinuousPacketConnectivityHS-SCCH-less-Information-Response,
+	id-ContinuousPacketConnectivity-DRX-CapabilityLCR,
+	id-ContinuousPacketConnectivity-DRX-InformationLCR,
+	id-ContinuousPacketConnectivity-DRX-Information-ResponseLCR,
+	id-CPC-InformationLCR,
 	id-CPC-Information,
 	id-CRNC-CommunicationContextID,
 	id-CriticalityDiagnostics,
@@ -612,6 +655,7 @@ FROM NBAP-Containers
 	id-DSCH-Information-ModifyList-RL-ReconfPrepTDD,
 	id-DSCH-InformationResponse,
 	id-DSCH-TDD-Information,
+	id-Dual-Band-Capability-Info,
 	id-E-AGCH-And-E-RGCH-E-HICH-FDD-Scrambling-Code,
 	id-E-AI-Capability,
 	id-E-AGCH-FDD-Code-Information,
@@ -725,7 +769,8 @@ FROM NBAP-Containers
 	id-NI-Information-NotifUpdateCmd,
 	id-NodeB-CommunicationContextID,
 	id-NRepetitionsPerCyclePeriod,
-	id-NumberOfReportedCellPortions,
+	id-NumberOfReportedCellPortions, 
+	id-NumberOfReportedCellPortionsLCR,
 	id-Paging-MACFlows-to-DeleteFDD,
 	id-P-CCPCH-Information,
 	id-P-CPICH-Information,
@@ -855,6 +900,7 @@ FROM NBAP-Containers
 	id-Secondary-CPICH-Information-Change,
 	id-SecondarySCH-Information-Cell-ReconfRqstFDD,
 	id-SecondarySCH-Information-Cell-SetupRqstFDD,
+	id-Semi-PersistentScheduling-CapabilityLCR,
 	id-SegmentInformationListIE-SystemInfoUpdate,
 	id-Serving-Cell-Change-CFN,
 	id-Serving-E-DCH-RL-ID,
@@ -1184,6 +1230,7 @@ FROM NBAP-Containers
 	id-HS-SCCH-InformationExt-LCR-PSCH-ReconfRqst,
 	id-HS-SCCH-InformationModifyExt-LCR-PSCH-ReconfRqst,
 	id-PowerControlGAP,
+	id-IdleIntervalInformation,
 	id-MBSFN-SpecialTimeSlot-LCR,
 	id-MultipleFreq-E-DCH-Resources-InformationList-AuditRsp,
 	id-MultipleFreq-E-DCH-Resources-InformationList-ResourceStatusInd,
@@ -1228,6 +1275,35 @@ FROM NBAP-Containers
 	id-MinimumReducedE-DPDCH-GainFactor,
 	id-IMB-Parameters,
 	id-E-RNTI,
+	id-E-DCH-Semi-PersistentScheduling-Information-LCR,
+	id-HS-DSCH-Semi-PersistentScheduling-Information-LCR,
+	id-Add-To-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst,
+	id-Modify-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst,
+	id-Delete-From-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst,
+	id-HS-DSCH-Semi-PersistentScheduling-Information-ResponseLCR,
+	id-E-DCH-Semi-PersistentScheduling-Information-ResponseLCR,
+	id-HSSICH-ReferenceSignal-InformationLCR,
+	id-UE-Selected-MBMS-Service-Information, 
+	id-HSSICH-ReferenceSignal-InformationModifyLCR,
+	id-TimeSlotMeasurementValueListLCR,
+	id-MIMO-Power-Offset-For-S-CPICH-Capability,
+	id-MIMO-PilotConfigurationExtension,
+	id-TxDiversityOnDLControlChannelsByMIMOUECapability,
+	id-UE-AggregateMaximumBitRate,
+	id-Single-Stream-MIMO-Capability,
+
+	id-ActivationInformation, 
+	id-Cell-Capability-Container, 
+	id-DormantModeIndicator, 
+	id-Additional-EDCH-Cell-Information-RL-Setup-Req,
+	id-Additional-EDCH-Cell-Information-Response,
+	id-Additional-EDCH-Cell-Information-RL-Add-Req,
+	id-Additional-EDCH-Cell-Change-Information-Response,
+	id-Additional-EDCH-Cell-Information-RL-Reconf-Prep,
+	id-Additional-EDCH-Cell-Information-RL-Reconf-Req,
+	id-Additional-EDCH-Cell-Information-Bearer-Rearrangement,
+	id-Additional-EDCH-Cell-Information-RL-Param-Upd,
+
 
 
 	maxNrOfCCTrCHs,
@@ -1304,8 +1380,8 @@ FROM NBAP-Containers
 	maxNrOfHSSCCHsLCR,
 	maxNrOfEAGCHsLCR,
 	maxNrOfEHICHsLCR,
-	maxNrOfHSDSCH-1
-
+	maxNrOfHSDSCH-1,
+	maxNrOfEDCH-1
 
 FROM NBAP-Constants;
 
@@ -1316,8 +1392,8 @@ FROM NBAP-Constants;
 -- **************************************************************
 
 CommonTransportChannelSetupRequestFDD ::= SEQUENCE {
-	protocolIEs				ProtocolIE-Container		{{CommonTransportChannelSetupRequestFDD-IEs}},
-	protocolExtensions		ProtocolExtensionContainer	{{CommonTransportChannelSetupRequestFDD-Extensions}}     OPTIONAL,
+	protocolIEs	ProtocolIE-Container	{{CommonTransportChannelSetupRequestFDD-IEs}},
+	protocolExtensions	ProtocolExtensionContainer	{{CommonTransportChannelSetupRequestFDD-Extensions}}	OPTIONAL,
 	...
 }
 
@@ -1340,21 +1416,21 @@ CommonPhysicalChannelType-CTCH-SetupRqstFDD ::= CHOICE {
 }
 
 Secondary-CCPCH-CTCH-SetupRqstFDD ::= SEQUENCE {
-	commonPhysicalChannelID					CommonPhysicalChannelID,
-	fdd-S-CCPCH-Offset						FDD-S-CCPCH-Offset,
-	dl-ScramblingCode						DL-ScramblingCode							OPTIONAL,
+	commonPhysicalChannelID	CommonPhysicalChannelID,
+	fdd-S-CCPCH-Offset	FDD-S-CCPCH-Offset,
+	dl-ScramblingCode	DL-ScramblingCode	OPTIONAL,
 	-- This IE shall be present if the PCH Parameters IE is not present
-	fdd-DL-ChannelisationCodeNumber			FDD-DL-ChannelisationCodeNumber,
-	tFCS									TFCS,
-	secondary-CCPCH-SlotFormat				SecondaryCCPCH-SlotFormat,
-	tFCI-Presence							TFCI-Presence								OPTIONAL,
+	fdd-DL-ChannelisationCodeNumber	FDD-DL-ChannelisationCodeNumber,
+	tFCS	TFCS,
+	secondary-CCPCH-SlotFormat	SecondaryCCPCH-SlotFormat,
+	tFCI-Presence	TFCI-Presence	OPTIONAL,
 	-- This IE shall be present if the Secondary CCPCH Slot Format is set to any of the values from 8 to 17 or if 3.84Mcps TDD IMB is used
-	multiplexingPosition					MultiplexingPosition,
-	powerOffsetInformation					PowerOffsetInformation-CTCH-SetupRqstFDD,
-	sTTD-Indicator							STTD-Indicator,
-	fACH-Parameters							FACH-ParametersList-CTCH-SetupRqstFDD		OPTIONAL,
-	pCH-Parameters							PCH-Parameters-CTCH-SetupRqstFDD			OPTIONAL,
-	iE-Extensions							ProtocolExtensionContainer  { { Secondary-CCPCHItem-CTCH-SetupRqstFDD-ExtIEs} }		OPTIONAL,
+	multiplexingPosition	MultiplexingPosition,
+	powerOffsetInformation	PowerOffsetInformation-CTCH-SetupRqstFDD,
+	sTTD-Indicator	STTD-Indicator,
+	fACH-Parameters	FACH-ParametersList-CTCH-SetupRqstFDD		OPTIONAL,
+	pCH-Parameters	PCH-Parameters-CTCH-SetupRqstFDD	OPTIONAL,
+	iE-Extensions	ProtocolExtensionContainer  { { Secondary-CCPCHItem-CTCH-SetupRqstFDD-ExtIEs} }	OPTIONAL,
 	...
 }
 
@@ -1458,17 +1534,17 @@ MICH-Parameters-CTCH-SetupRqstFDD-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 }
 
 PRACH-CTCH-SetupRqstFDD ::= SEQUENCE {
-	commonPhysicalChannelID						CommonPhysicalChannelID,
-	scramblingCodeNumber						ScramblingCodeNumber,
-	tFCS										TFCS,
-	preambleSignatures							PreambleSignatures,
-	allowedSlotFormatInformation				AllowedSlotFormatInformationList-CTCH-SetupRqstFDD,
-	rACH-SubChannelNumbers						RACH-SubChannelNumbers,
-	ul-punctureLimit							PunctureLimit,
-	preambleThreshold							PreambleThreshold,
-	rACH-Parameters								RACH-Parameters-CTCH-SetupRqstFDD,
-    aICH-Parameters                             AICH-Parameters-CTCH-SetupRqstFDD,
-	iE-Extensions								ProtocolExtensionContainer { { PRACHItem-CTCH-SetupRqstFDD-ExtIEs} }		OPTIONAL,
+	commonPhysicalChannelID	CommonPhysicalChannelID,
+	scramblingCodeNumber	ScramblingCodeNumber,
+	tFCS	TFCS,
+	preambleSignatures	PreambleSignatures,
+	allowedSlotFormatInformation	AllowedSlotFormatInformationList-CTCH-SetupRqstFDD,
+	rACH-SubChannelNumbers	RACH-SubChannelNumbers,
+	ul-punctureLimit	PunctureLimit,
+	preambleThreshold	PreambleThreshold,
+	rACH-Parameters	RACH-Parameters-CTCH-SetupRqstFDD,
+	aICH-Parameters	AICH-Parameters-CTCH-SetupRqstFDD,
+	iE-Extensions	ProtocolExtensionContainer { { PRACHItem-CTCH-SetupRqstFDD-ExtIEs} }	OPTIONAL,
 	...
 }
 
@@ -1479,8 +1555,8 @@ PRACHItem-CTCH-SetupRqstFDD-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 AllowedSlotFormatInformationList-CTCH-SetupRqstFDD ::= SEQUENCE (SIZE (1.. maxNrOfSlotFormatsPRACH)) OF AllowedSlotFormatInformationItem-CTCH-SetupRqstFDD
 
 AllowedSlotFormatInformationItem-CTCH-SetupRqstFDD ::= SEQUENCE {
-	rACHSlotFormat								RACH-SlotFormat,
-	iE-Extensions								ProtocolExtensionContainer  { { AllowedSlotFormatInformationItem-CTCH-SetupRqstFDD-ExtIEs} }		OPTIONAL,
+	rACHSlotFormat	RACH-SlotFormat,
+	iE-Extensions	ProtocolExtensionContainer  { { AllowedSlotFormatInformationItem-CTCH-SetupRqstFDD-ExtIEs} }	OPTIONAL,
 	...
 }
 
@@ -1556,8 +1632,8 @@ Extension-CommonPhysicalChannelType-CTCH-SetupRqstTDD ::= ProtocolIE-Single-Cont
 
 Extension-CommonPhysicalChannelType-CTCH-SetupRqstTDDIE NBAP-PROTOCOL-IES ::= {
 	{ ID id-PLCCH-parameters			CRITICALITY ignore	TYPE PLCCH-parameters		PRESENCE mandatory }|
-	{ ID id-E-RUCCH-parameters		CRITICALITY ignore		TYPE E-RUCCH-parameters		PRESENCE mandatory }|
-	{ ID id-E-RUCCH-768-parameters	CRITICALITY ignore		TYPE E-RUCCH-768-parameters	PRESENCE mandatory },
+	{ ID id-E-RUCCH-parameters		CRITICALITY ignore	TYPE E-RUCCH-parameters		PRESENCE mandatory }|
+	{ ID id-E-RUCCH-768-parameters	CRITICALITY ignore	TYPE E-RUCCH-768-parameters	PRESENCE mandatory },
 	...
 }
 
@@ -1574,15 +1650,15 @@ Secondary-CCPCH-CTCH-SetupRqstTDD ::= SEQUENCE {
 }
 
 Secondary-CCPCHItem-CTCH-SetupRqstTDD-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
-	{ ID id-Tstd-indicator										CRITICALITY reject	EXTENSION TSTD-Indicator				PRESENCE optional	}|
-	{ ID id-MICH-Parameters-CTCH-SetupRqstTDD					CRITICALITY reject	EXTENSION MICH-Parameters-CTCH-SetupRqstTDD		PRESENCE optional	}|
-	{ ID id-Additional-S-CCPCH-Parameters-CTCH-SetupRqstTDD		CRITICALITY reject	EXTENSION Secondary-CCPCH-parameterExtendedList-CTCH-SetupRqstTDD		PRESENCE optional	}|
+	{ ID id-Tstd-indicator									CRITICALITY reject	EXTENSION TSTD-Indicator				PRESENCE optional	}|
+	{ ID id-MICH-Parameters-CTCH-SetupRqstTDD				CRITICALITY reject	EXTENSION MICH-Parameters-CTCH-SetupRqstTDD		PRESENCE optional	}|
+	{ ID id-Additional-S-CCPCH-Parameters-CTCH-SetupRqstTDD	CRITICALITY reject	EXTENSION Secondary-CCPCH-parameterExtendedList-CTCH-SetupRqstTDD		PRESENCE optional	}|
 	-- Applicable to 3.84Mcps TDD only, used when more than maxNrOfSCCPCHs SCCPCHs are to be established.
 	{ ID id-Additional-S-CCPCH-LCR-Parameters-CTCH-SetupRqstTDD	CRITICALITY reject	EXTENSION Secondary-CCPCH-LCR-parameterExtendedList-CTCH-SetupRqstTDD		PRESENCE optional	}|
 	-- Applicable to 1.28Mcps TDD only, used when more than maxNrOfSCCPCHLCRs SCCPCHs are to be established.
-	{ ID id-S-CCPCH-768-Parameters-CTCH-SetupRqstTDD			CRITICALITY reject	EXTENSION Secondary-CCPCH-768-parameterList-CTCH-SetupRqstTDD		PRESENCE optional	}|
-	{ ID id-S-CCPCH-Modulation									CRITICALITY reject	EXTENSION ModulationMBSFN								PRESENCE optional	}|	-- Applicable to 1.28Mcps TDD, Not Applicable to 3.84Mcps TDD or 7.68Mcps TDD
-	{ ID id-TimeSlotConfigurationList-LCR-CTCH-SetupRqstTDD		CRITICALITY reject	EXTENSION TimeSlotConfigurationList-LCR-CTCH-SetupRqstTDD		PRESENCE optional }|
+	{ ID id-S-CCPCH-768-Parameters-CTCH-SetupRqstTDD		CRITICALITY reject	EXTENSION Secondary-CCPCH-768-parameterList-CTCH-SetupRqstTDD		PRESENCE optional	}|
+	{ ID id-S-CCPCH-Modulation								CRITICALITY reject	EXTENSION ModulationMBSFN								PRESENCE optional	}|	-- Applicable to 1.28Mcps TDD, Not Applicable to 3.84Mcps TDD or 7.68Mcps TDD
+	{ ID id-TimeSlotConfigurationList-LCR-CTCH-SetupRqstTDD	CRITICALITY reject	EXTENSION TimeSlotConfigurationList-LCR-CTCH-SetupRqstTDD		PRESENCE optional }|
 	{ ID id-UARFCNforNt		CRITICALITY reject	EXTENSION UARFCN		PRESENCE optional },
 	-- Applicable to 1.28Mcps TDD when using multiple frequencies. This IE indicates the frequency of Secondary Frequency on which SCCPCH to be set up
 	...
@@ -1708,13 +1784,13 @@ PCH-ParametersItem-CTCH-SetupRqstTDD ::= SEQUENCE {
 }
 
 PCH-ParametersItem-CTCH-SetupRqstTDD-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
-	{ ID	id-PCH-Power-LCR-CTCH-SetupRqstTDD			CRITICALITY	reject	EXTENSION DL-Power							PRESENCE optional	}|
-	{ ID	id-bindingID								CRITICALITY	ignore	EXTENSION BindingID							PRESENCE optional	}|
+	{ ID id-PCH-Power-LCR-CTCH-SetupRqstTDD	CRITICALITY reject	EXTENSION DL-Power	PRESENCE optional	}|
+	{ ID id-bindingID	CRITICALITY ignore	EXTENSION BindingID	PRESENCE optional	}|
 	-- Shall be ignored if bearer establishment with ALCAP.
-	{ ID	id-transportlayeraddress					CRITICALITY	ignore	EXTENSION TransportLayerAddress						PRESENCE optional	}|
+	{ ID id-transportlayeraddress	CRITICALITY ignore	EXTENSION TransportLayerAddress	PRESENCE optional	}|
 	-- Shall be ignored if bearer establishment with ALCAP.
-	{ ID id-PICH-768-Parameters-CTCH-SetupRqstTDD		CRITICALITY reject	EXTENSION PICH-768-ParametersItem-CTCH-SetupRqstTDD		PRESENCE optional	}|
-	{ ID id-TnlQos										CRITICALITY ignore	EXTENSION TnlQos							PRESENCE optional	},
+	{ ID id-PICH-768-Parameters-CTCH-SetupRqstTDD	CRITICALITY reject	EXTENSION PICH-768-ParametersItem-CTCH-SetupRqstTDD	PRESENCE optional	}|
+	{ ID id-TnlQos	CRITICALITY ignore	EXTENSION TnlQos	PRESENCE optional	},
 	-- Shall be ignored if bearer establishment with ALCAP.
 	...
 }
@@ -1755,7 +1831,7 @@ PICH-LCR-Parameters-CTCH-SetupRqstTDD ::= SEQUENCE {
  	pagingIndicatorLength					PagingIndicatorLength,
 	pICH-Power								PICH-Power,
 	second-TDD-ChannelisationCodeLCR		TDD-ChannelisationCodeLCR,
-	iE-Extensions							ProtocolExtensionContainer  { { PICH-LCR-ParametersItem-CTCH-SetupRqstTDD-ExtIEs} }		OPTIONAL,
+	iE-Extensions							ProtocolExtensionContainer { { PICH-LCR-ParametersItem-CTCH-SetupRqstTDD-ExtIEs} }		OPTIONAL,
 	...
 }
 
@@ -1775,7 +1851,7 @@ PICH-768-ParametersItem-CTCH-SetupRqstTDD ::= SEQUENCE {
 	repetitionLength						RepetitionLength,
 	pagingIndicatorLength					PagingIndicatorLength,
 	pICH-Power								PICH-Power,
-	iE-Extensions							ProtocolExtensionContainer  { { PICH-768-ParametersItem-CTCH-SetupRqstTDD-ExtIEs} }		OPTIONAL,
+	iE-Extensions							ProtocolExtensionContainer { { PICH-768-ParametersItem-CTCH-SetupRqstTDD-ExtIEs} }		OPTIONAL,
 	...
 }
 
@@ -1792,7 +1868,7 @@ MICH-Parameters-CTCH-SetupRqstTDD ::= SEQUENCE {
 	notificationIndicatorLength				NotificationIndicatorLength,
 	mICH-Power								PICH-Power,
 	mICH-TDDOption-Specific-Parameters		MICH-TDDOption-Specific-Parameters-CTCH-SetupRqstTDD,
-	iE-Extensions							ProtocolExtensionContainer  { { MICH-Parameters-CTCH-SetupRqstTDD-ExtIEs} }		OPTIONAL,
+	iE-Extensions							ProtocolExtensionContainer { { MICH-Parameters-CTCH-SetupRqstTDD-ExtIEs} }		OPTIONAL,
 	...
 }
 
@@ -2028,7 +2104,7 @@ E-RUCCH-768-ParametersItem-CTCH-SetupRqstTDD-ExtIEs NBAP-PROTOCOL-EXTENSION ::=
 
 CommonTransportChannelSetupResponse ::= SEQUENCE {
 	protocolIEs				ProtocolIE-Container		{{CommonTransportChannelSetupResponse-IEs}},
-	protocolExtensions		ProtocolExtensionContainer	{{CommonTransportChannelSetupResponse-Extensions}}    OPTIONAL,
+	protocolExtensions		ProtocolExtensionContainer	{{CommonTransportChannelSetupResponse-Extensions}}	OPTIONAL,
 	...
 }
 
@@ -2054,7 +2130,7 @@ FACH-CommonTransportChannel-InformationResponse ::= SEQUENCE (SIZE (1..maxNrOfFA
 
 CommonTransportChannelSetupFailure ::= SEQUENCE {
 	protocolIEs				ProtocolIE-Container		{{CommonTransportChannelSetupFailure-IEs}},
-	protocolExtensions		ProtocolExtensionContainer	{{CommonTransportChannelSetupFailure-Extensions}}     OPTIONAL,
+	protocolExtensions		ProtocolExtensionContainer	{{CommonTransportChannelSetupFailure-Extensions}}	OPTIONAL,
 	...
 }
 
@@ -2100,9 +2176,9 @@ CommonPhysicalChannelType-CTCH-ReconfRqstFDD ::= CHOICE {
 
 Secondary-CCPCHList-CTCH-ReconfRqstFDD ::= SEQUENCE {
 	fACH-ParametersList-CTCH-ReconfRqstFDD		FACH-ParametersList-CTCH-ReconfRqstFDD	OPTIONAL,
-	pCH-Parameters-CTCH-ReconfRqstFDD			PCH-Parameters-CTCH-ReconfRqstFDD		OPTIONAL,
-	pICH-Parameters-CTCH-ReconfRqstFDD			PICH-Parameters-CTCH-ReconfRqstFDD		OPTIONAL,
-	iE-Extensions								ProtocolExtensionContainer { { Secondary-CCPCH-CTCH-ReconfRqstFDD-ExtIEs} } OPTIONAL,
+	pCH-Parameters-CTCH-ReconfRqstFDD			PCH-Parameters-CTCH-ReconfRqstFDD	OPTIONAL,
+	pICH-Parameters-CTCH-ReconfRqstFDD			PICH-Parameters-CTCH-ReconfRqstFDD	OPTIONAL,
+	iE-Extensions								ProtocolExtensionContainer { { Secondary-CCPCH-CTCH-ReconfRqstFDD-ExtIEs} }	OPTIONAL,
 	...
 }
 
@@ -2120,11 +2196,11 @@ FACH-ParametersListIEs-CTCH-ReconfRqstFDD NBAP-PROTOCOL-IES ::= {
 FACH-ParametersListIE-CTCH-ReconfRqstFDD ::= SEQUENCE (SIZE (1..maxFACHCell)) OF FACH-ParametersItem-CTCH-ReconfRqstFDD
 
 FACH-ParametersItem-CTCH-ReconfRqstFDD ::= SEQUENCE {
-	commonTransportChannelID				CommonTransportChannelID,
-	maxFACH-Power							DL-Power		OPTIONAL,
-	toAWS									ToAWS			OPTIONAL,
-	toAWE									ToAWE			OPTIONAL,
-	iE-Extensions							ProtocolExtensionContainer  { { FACH-ParametersItem-CTCH-ReconfRqstFDD-ExtIEs} }		OPTIONAL,
+	commonTransportChannelID	CommonTransportChannelID,
+	maxFACH-Power	DL-Power	OPTIONAL,
+	toAWS	ToAWS	OPTIONAL,
+	toAWE	ToAWE	OPTIONAL,
+	iE-Extensions	ProtocolExtensionContainer  { { FACH-ParametersItem-CTCH-ReconfRqstFDD-ExtIEs} }	OPTIONAL,
 	...
 }
 
@@ -2140,11 +2216,11 @@ PCH-ParametersIE-CTCH-ReconfRqstFDD NBAP-PROTOCOL-IES ::= {
 }
 
 PCH-ParametersItem-CTCH-ReconfRqstFDD ::= SEQUENCE {
-	commonTransportChannelID				CommonTransportChannelID,
-	pCH-Power								DL-Power		OPTIONAL,
-	toAWS									ToAWS			OPTIONAL,
-	toAWE									ToAWE			OPTIONAL,
-	iE-Extensions							ProtocolExtensionContainer  { { PCH-ParametersItem-CTCH-ReconfRqstFDD-ExtIEs} }			OPTIONAL,
+	commonTransportChannelID	CommonTransportChannelID,
+	pCH-Power	DL-Power	OPTIONAL,
+	toAWS	ToAWS	OPTIONAL,
+	toAWE	ToAWE	OPTIONAL,
+	iE-Extensions	ProtocolExtensionContainer  { { PCH-ParametersItem-CTCH-ReconfRqstFDD-ExtIEs} }	OPTIONAL,
 	...
 }
 
@@ -2182,9 +2258,9 @@ MICH-Parameters-CTCH-ReconfRqstFDD-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 }
 
 PRACHList-CTCH-ReconfRqstFDD ::= SEQUENCE {
-	pRACH-ParametersList-CTCH-ReconfRqstFDD		PRACH-ParametersList-CTCH-ReconfRqstFDD	OPTIONAL,
-	aICH-ParametersList-CTCH-ReconfRqstFDD		AICH-ParametersList-CTCH-ReconfRqstFDD	OPTIONAL,
-	iE-Extensions								ProtocolExtensionContainer { { PRACH-CTCH-ReconfRqstFDD-ExtIEs} } OPTIONAL,
+	pRACH-ParametersList-CTCH-ReconfRqstFDD	PRACH-ParametersList-CTCH-ReconfRqstFDD	OPTIONAL,
+	aICH-ParametersList-CTCH-ReconfRqstFDD	AICH-ParametersList-CTCH-ReconfRqstFDD	OPTIONAL,
+	iE-Extensions	ProtocolExtensionContainer { { PRACH-CTCH-ReconfRqstFDD-ExtIEs} }	OPTIONAL,
 	...
 }
 
@@ -2217,8 +2293,8 @@ PRACH-ParametersItem-CTCH-ReconfRqstFDD-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 AllowedSlotFormatInformationList-CTCH-ReconfRqstFDD ::= SEQUENCE (SIZE (1.. maxNrOfSlotFormatsPRACH)) OF AllowedSlotFormatInformationItem-CTCH-ReconfRqstFDD
 
 AllowedSlotFormatInformationItem-CTCH-ReconfRqstFDD ::= SEQUENCE {
-	rACH-SlotFormat							RACH-SlotFormat,
-	iE-Extensions							ProtocolExtensionContainer  { { AllowedSlotFormatInformationItem-CTCH-ReconfRqstFDD-ExtIEs} }		OPTIONAL,
+	rACH-SlotFormat	RACH-SlotFormat,
+	iE-Extensions	ProtocolExtensionContainer { { AllowedSlotFormatInformationItem-CTCH-ReconfRqstFDD-ExtIEs} }	OPTIONAL,
 	...
 }
 
@@ -2258,24 +2334,24 @@ CommonTransportChannelReconfigurationRequestTDD ::= SEQUENCE {
 }
 
 CommonTransportChannelReconfigurationRequestTDD-IEs NBAP-PROTOCOL-IES ::= {
-	{ ID id-C-ID									CRITICALITY reject	TYPE C-ID						PRESENCE mandatory }|
-	{ ID id-ConfigurationGenerationID				CRITICALITY reject	TYPE ConfigurationGenerationID		PRESENCE mandatory }|
-	{ ID id-Secondary-CCPCH-Parameters-CTCH-ReconfRqstTDD	CRITICALITY reject	TYPE Secondary-CCPCH-Parameters-CTCH-ReconfRqstTDD		PRESENCE optional	}|
-	{ ID id-PICH-Parameters-CTCH-ReconfRqstTDD		CRITICALITY reject	TYPE PICH-Parameters-CTCH-ReconfRqstTDD		PRESENCE optional }|
-	{ ID id-FACH-ParametersList-CTCH-ReconfRqstTDD	CRITICALITY reject	TYPE FACH-ParametersList-CTCH-ReconfRqstTDD		PRESENCE optional }|
-	{ ID id-PCH-Parameters-CTCH-ReconfRqstTDD		CRITICALITY reject	TYPE PCH-Parameters-CTCH-ReconfRqstTDD		PRESENCE optional },
+	{ ID id-C-ID	CRITICALITY reject	TYPE C-ID	PRESENCE mandatory }|
+	{ ID id-ConfigurationGenerationID	CRITICALITY reject	TYPE ConfigurationGenerationID	PRESENCE mandatory }|
+	{ ID id-Secondary-CCPCH-Parameters-CTCH-ReconfRqstTDD	CRITICALITY reject	TYPE Secondary-CCPCH-Parameters-CTCH-ReconfRqstTDD	PRESENCE optional	}|
+	{ ID id-PICH-Parameters-CTCH-ReconfRqstTDD	CRITICALITY reject	TYPE PICH-Parameters-CTCH-ReconfRqstTDD	PRESENCE optional }|
+	{ ID id-FACH-ParametersList-CTCH-ReconfRqstTDD	CRITICALITY reject	TYPE FACH-ParametersList-CTCH-ReconfRqstTDD	PRESENCE optional }|
+	{ ID id-PCH-Parameters-CTCH-ReconfRqstTDD	CRITICALITY reject	TYPE PCH-Parameters-CTCH-ReconfRqstTDD	PRESENCE optional },
 	...
 }
 
 CommonTransportChannelReconfigurationRequestTDD-Extensions NBAP-PROTOCOL-EXTENSION ::= {
-	{ ID id-FPACH-LCR-Parameters-CTCH-ReconfRqstTDD			CRITICALITY reject	EXTENSION FPACH-LCR-Parameters-CTCH-ReconfRqstTDD						PRESENCE optional }|
+	{ ID id-FPACH-LCR-Parameters-CTCH-ReconfRqstTDD		CRITICALITY reject	EXTENSION FPACH-LCR-Parameters-CTCH-ReconfRqstTDD						PRESENCE optional }|
 	-- Applicable to 1.28Mcps TDD only
-	{ ID id-MICH-Parameters-CTCH-ReconfRqstTDD				CRITICALITY reject	EXTENSION MICH-Parameters-CTCH-ReconfRqstTDD							PRESENCE optional }|
-	{ ID id-PLCCH-Parameters-CTCH-ReconfRqstTDD				CRITICALITY ignore	EXTENSION PLCCH-Parameters-CTCH-ReconfRqstTDD						PRESENCE optional }|
-	{ ID id-S-CCPCH-768-Parameters-CTCH-ReconfRqstTDD		CRITICALITY reject	EXTENSION Secondary-CCPCH-768-Parameters-CTCH-ReconfRqstTDD		PRESENCE optional }|
-	{ ID id-PICH-768-Parameters-CTCH-ReconfRqstTDD			CRITICALITY reject	EXTENSION PICH-768-Parameters-CTCH-ReconfRqstTDD					PRESENCE optional }|
-	{ ID id-MICH-768-Parameters-CTCH-ReconfRqstTDD			CRITICALITY reject	EXTENSION MICH-768-Parameters-CTCH-ReconfRqstTDD					PRESENCE optional }|
-	{ ID id-UPPCH-LCR-Parameters-CTCH-ReconfRqstTDD			CRITICALITY reject	EXTENSION UPPCH-LCR-Parameters-CTCH-ReconfRqstTDD				PRESENCE optional },	-- Applicable to 1.28Mcps TDD only	
+	{ ID id-MICH-Parameters-CTCH-ReconfRqstTDD			CRITICALITY reject	EXTENSION MICH-Parameters-CTCH-ReconfRqstTDD							PRESENCE optional }|
+	{ ID id-PLCCH-Parameters-CTCH-ReconfRqstTDD			CRITICALITY ignore	EXTENSION PLCCH-Parameters-CTCH-ReconfRqstTDD						PRESENCE optional }|
+	{ ID id-S-CCPCH-768-Parameters-CTCH-ReconfRqstTDD	CRITICALITY reject	EXTENSION Secondary-CCPCH-768-Parameters-CTCH-ReconfRqstTDD		PRESENCE optional }|
+	{ ID id-PICH-768-Parameters-CTCH-ReconfRqstTDD		CRITICALITY reject	EXTENSION PICH-768-Parameters-CTCH-ReconfRqstTDD					PRESENCE optional }|
+	{ ID id-MICH-768-Parameters-CTCH-ReconfRqstTDD		CRITICALITY reject	EXTENSION MICH-768-Parameters-CTCH-ReconfRqstTDD					PRESENCE optional }|
+	{ ID id-UPPCH-LCR-Parameters-CTCH-ReconfRqstTDD		CRITICALITY reject	EXTENSION UPPCH-LCR-Parameters-CTCH-ReconfRqstTDD				PRESENCE optional },	-- Applicable to 1.28Mcps TDD only	
 	...
 }
 
@@ -2348,10 +2424,10 @@ FACH-ParametersItem-CTCH-ReconfRqstTDD-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 }
 
 PCH-Parameters-CTCH-ReconfRqstTDD ::= SEQUENCE {
-	commonTransportChannelID		CommonTransportChannelID,
-	toAWS							ToAWS			OPTIONAL,
-	toAWE							ToAWE			OPTIONAL,
-	iE-Extensions					ProtocolExtensionContainer  { { PCH-Parameters-CTCH-ReconfRqstTDD-ExtIEs} }		OPTIONAL,
+	commonTransportChannelID	CommonTransportChannelID,
+	toAWS	ToAWS	OPTIONAL,
+	toAWE	ToAWE	OPTIONAL,
+	iE-Extensions	ProtocolExtensionContainer  { { PCH-Parameters-CTCH-ReconfRqstTDD-ExtIEs} }	OPTIONAL,
 	...
 }
 
@@ -2442,11 +2518,10 @@ MICH-768-Parameters-CTCH-ReconfRqstTDD-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 
 
 UPPCH-LCR-Parameters-CTCH-ReconfRqstTDD ::= SEQUENCE {
-	uPPCHPositionLCR				UPPCHPositionLCR		OPTIONAL,
-	uARFCN							UARFCN					OPTIONAL,
+	uPPCHPositionLCR	UPPCHPositionLCR	OPTIONAL,
+	uARFCN	UARFCN	OPTIONAL,
 	-- Mandatory for 1.28Mcps TDD when using multiple frequencies Corresponds to Nt [15]
-	iE-Extensions					ProtocolExtensionContainer { { UPPCH-LCR-Parameters-CTCH-ReconfRqstTDD-ExtIEs} }	
-	OPTIONAL,
+	iE-Extensions	ProtocolExtensionContainer { { UPPCH-LCR-Parameters-CTCH-ReconfRqstTDD-ExtIEs} }	OPTIONAL,
 	...
 }
 
@@ -2483,7 +2558,7 @@ CommonTransportChannelReconfigurationResponse-Extensions NBAP-PROTOCOL-EXTENSION
 
 CommonTransportChannelReconfigurationFailure ::= SEQUENCE {
 	protocolIEs				ProtocolIE-Container		{{CommonTransportChannelReconfigurationFailure-IEs}},
-	protocolExtensions		ProtocolExtensionContainer	{{CommonTransportChannelReconfigurationFailure-Extensions}}          OPTIONAL,
+	protocolExtensions		ProtocolExtensionContainer	{{CommonTransportChannelReconfigurationFailure-Extensions}}		OPTIONAL,
 	...
 }
 
@@ -2505,7 +2580,7 @@ CommonTransportChannelReconfigurationFailure-Extensions NBAP-PROTOCOL-EXTENSION
 
 CommonTransportChannelDeletionRequest ::= SEQUENCE {
 	protocolIEs					ProtocolIE-Container		{{CommonTransportChannelDeletionRequest-IEs}},
-	protocolExtensions			ProtocolExtensionContainer	{{CommonTransportChannelDeletionRequest-Extensions}}        	OPTIONAL,
+	protocolExtensions			ProtocolExtensionContainer	{{CommonTransportChannelDeletionRequest-Extensions}}		OPTIONAL,
 	...
 }
 
@@ -2529,7 +2604,7 @@ CommonTransportChannelDeletionRequest-Extensions NBAP-PROTOCOL-EXTENSION ::= {
 
 CommonTransportChannelDeletionResponse ::= SEQUENCE {
 	protocolIEs				ProtocolIE-Container		{{CommonTransportChannelDeletionResponse-IEs}},
-	protocolExtensions		ProtocolExtensionContainer	{{CommonTransportChannelDeletionResponse-Extensions}}     		OPTIONAL,
+	protocolExtensions		ProtocolExtensionContainer	{{CommonTransportChannelDeletionResponse-Extensions}}			OPTIONAL,
 	...
 }
 
@@ -2549,8 +2624,8 @@ CommonTransportChannelDeletionResponse-Extensions NBAP-PROTOCOL-EXTENSION ::= {
 -- **************************************************************
 
 BlockResourceRequest ::= SEQUENCE {
-	protocolIEs				ProtocolIE-Container       	{{BlockResourceRequest-IEs}},
-	protocolExtensions		ProtocolExtensionContainer	{{BlockResourceRequest-Extensions}}                   OPTIONAL,
+	protocolIEs				ProtocolIE-Container		{{BlockResourceRequest-IEs}},
+	protocolExtensions		ProtocolExtensionContainer	{{BlockResourceRequest-Extensions}}			OPTIONAL,
 	...
 }
 
@@ -2573,7 +2648,7 @@ BlockResourceRequest-Extensions NBAP-PROTOCOL-EXTENSION ::= {
 -- **************************************************************
 
 BlockResourceResponse ::= SEQUENCE {
-	protocolIEs					ProtocolIE-Container       	{{BlockResourceResponse-IEs}},
+	protocolIEs					ProtocolIE-Container		{{BlockResourceResponse-IEs}},
 	protocolExtensions			ProtocolExtensionContainer	{{BlockResourceResponse-Extensions}}		OPTIONAL,
 	...
 }
@@ -2594,7 +2669,7 @@ BlockResourceResponse-Extensions NBAP-PROTOCOL-EXTENSION ::= {
 -- **************************************************************
 
 BlockResourceFailure ::= SEQUENCE {
-	protocolIEs				ProtocolIE-Container       	{{BlockResourceFailure-IEs}},
+	protocolIEs				ProtocolIE-Container		{{BlockResourceFailure-IEs}},
 	protocolExtensions		ProtocolExtensionContainer	{{BlockResourceFailure-Extensions}}		OPTIONAL,
 	...
 }
@@ -2638,7 +2713,7 @@ UnblockResourceIndication-Extensions NBAP-PROTOCOL-EXTENSION ::= {
 
 AuditRequiredIndication ::= SEQUENCE {
 	protocolIEs				ProtocolIE-Container		{{AuditRequiredIndication-IEs}},
-	protocolExtensions 		ProtocolExtensionContainer	{{AuditRequiredIndication-Extensions}}    	OPTIONAL,
+	protocolExtensions		ProtocolExtensionContainer	{{AuditRequiredIndication-Extensions}}		OPTIONAL,
 	...
 }
 
@@ -2706,30 +2781,30 @@ Cell-InformationItemIE-AuditRsp NBAP-PROTOCOL-IES ::= {
 }
 
 Cell-InformationItem-AuditRsp ::= SEQUENCE {
-	c-ID									C-ID,
-	configurationGenerationID				ConfigurationGenerationID,
-	resourceOperationalState				ResourceOperationalState,
-	availabilityStatus						AvailabilityStatus,
-	local-Cell-ID							Local-Cell-ID,
-	primary-SCH-Information					P-SCH-Information-AuditRsp					OPTIONAL,
-	secondary-SCH-Information				S-SCH-Information-AuditRsp					OPTIONAL,
-	primary-CPICH-Information				P-CPICH-Information-AuditRsp				OPTIONAL,
-	secondary-CPICH-InformationList			S-CPICH-InformationList-AuditRsp			OPTIONAL,
-	primary-CCPCH-Information				P-CCPCH-Information-AuditRsp				OPTIONAL,
-	bCH-Information							BCH-Information-AuditRsp					OPTIONAL,
-	secondary-CCPCH-InformationList			S-CCPCH-InformationList-AuditRsp			OPTIONAL,
-	pCH-Information							PCH-Information-AuditRsp					OPTIONAL,
-	pICH-Information						PICH-Information-AuditRsp					OPTIONAL,
-	fACH-InformationList					FACH-InformationList-AuditRsp				OPTIONAL,
-	pRACH-InformationList					PRACH-InformationList-AuditRsp				OPTIONAL,
-	rACH-InformationList					RACH-InformationList-AuditRsp				OPTIONAL,
-	aICH-InformationList					AICH-InformationList-AuditRsp				OPTIONAL,
-	notUsed-1-pCPCH-InformationList			NULL										OPTIONAL,
-	notUsed-2-cPCH-InformationList			NULL										OPTIONAL,
-	notUsed-3-aP-AICH-InformationList		NULL										OPTIONAL,
-	notUsed-4-cDCA-ICH-InformationList		NULL										OPTIONAL,
-	sCH-Information							SCH-Information-AuditRsp					OPTIONAL,
-	iE-Extensions							ProtocolExtensionContainer  { { Cell-InformationItem-AuditRsp-ExtIEs} }		OPTIONAL,
+	c-ID	C-ID,
+	configurationGenerationID	ConfigurationGenerationID,
+	resourceOperationalState	ResourceOperationalState,
+	availabilityStatus	AvailabilityStatus,
+	local-Cell-ID	Local-Cell-ID,
+	primary-SCH-Information	P-SCH-Information-AuditRsp	OPTIONAL,
+	secondary-SCH-Information	S-SCH-Information-AuditRsp	OPTIONAL,
+	primary-CPICH-Information	P-CPICH-Information-AuditRsp	OPTIONAL,
+	secondary-CPICH-InformationList	S-CPICH-InformationList-AuditRsp	OPTIONAL,
+	primary-CCPCH-Information	P-CCPCH-Information-AuditRsp	OPTIONAL,
+	bCH-Information	BCH-Information-AuditRsp	OPTIONAL,
+	secondary-CCPCH-InformationList	S-CCPCH-InformationList-AuditRsp	OPTIONAL,
+	pCH-Information	PCH-Information-AuditRsp	OPTIONAL,
+	pICH-Information	PICH-Information-AuditRsp	OPTIONAL,
+	fACH-InformationList	FACH-InformationList-AuditRsp	OPTIONAL,
+	pRACH-InformationList	PRACH-InformationList-AuditRsp	OPTIONAL,
+	rACH-InformationList	RACH-InformationList-AuditRsp	OPTIONAL,
+	aICH-InformationList	AICH-InformationList-AuditRsp	OPTIONAL,
+	notUsed-1-pCPCH-InformationList	NULL	OPTIONAL,	
+	notUsed-2-cPCH-InformationList	NULL	OPTIONAL,
+	notUsed-3-aP-AICH-InformationList	NULL	OPTIONAL,
+	notUsed-4-cDCA-ICH-InformationList	NULL	OPTIONAL,
+	sCH-Information	SCH-Information-AuditRsp	OPTIONAL,
+	iE-Extensions	ProtocolExtensionContainer  { { Cell-InformationItem-AuditRsp-ExtIEs} }	OPTIONAL,
 	...
 }
 
@@ -2769,91 +2844,91 @@ Cell-InformationItem-AuditRsp-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 P-SCH-Information-AuditRsp ::= ProtocolIE-Single-Container {{ P-SCH-InformationIE-AuditRsp }}
 
 P-SCH-InformationIE-AuditRsp NBAP-PROTOCOL-IES ::= {
-	{ ID id-P-SCH-Information	CRITICALITY ignore	TYPE Common-PhysicalChannel-Status-Information 	PRESENCE	mandatory }
+	{ ID id-P-SCH-Information	CRITICALITY ignore	TYPE Common-PhysicalChannel-Status-Information	PRESENCE	mandatory }
 }
 
 S-SCH-Information-AuditRsp ::= ProtocolIE-Single-Container {{ S-SCH-InformationIE-AuditRsp }}
 
 S-SCH-InformationIE-AuditRsp NBAP-PROTOCOL-IES ::= {
-	{ ID id-S-SCH-Information	CRITICALITY ignore	TYPE Common-PhysicalChannel-Status-Information 	PRESENCE	mandatory }
+	{ ID id-S-SCH-Information	CRITICALITY ignore	TYPE Common-PhysicalChannel-Status-Information	PRESENCE	mandatory }
 }
 
 P-CPICH-Information-AuditRsp ::= ProtocolIE-Single-Container {{ P-CPICH-InformationIE-AuditRsp }}
 
 P-CPICH-InformationIE-AuditRsp NBAP-PROTOCOL-IES ::= {
-	{ ID id-P-CPICH-Information	CRITICALITY ignore	TYPE Common-PhysicalChannel-Status-Information 	PRESENCE	mandatory }
+	{ ID id-P-CPICH-Information	CRITICALITY ignore	TYPE Common-PhysicalChannel-Status-Information	PRESENCE	mandatory }
 }
 
 S-CPICH-InformationList-AuditRsp ::= SEQUENCE (SIZE (1..maxSCPICHCell)) OF ProtocolIE-Single-Container {{ S-CPICH-InformationItemIE-AuditRsp }}
 
 S-CPICH-InformationItemIE-AuditRsp NBAP-PROTOCOL-IES ::= {
-	{ ID id-S-CPICH-Information   CRITICALITY ignore	TYPE Common-PhysicalChannel-Status-Information		PRESENCE mandatory }
+	{ ID id-S-CPICH-Information	CRITICALITY ignore	TYPE Common-PhysicalChannel-Status-Information	PRESENCE mandatory }
 }
 
 P-CCPCH-Information-AuditRsp ::= ProtocolIE-Single-Container {{ P-CCPCH-InformationIE-AuditRsp }}
 
 P-CCPCH-InformationIE-AuditRsp NBAP-PROTOCOL-IES ::= {
-	{ ID id-P-CCPCH-Information   CRITICALITY ignore	TYPE Common-PhysicalChannel-Status-Information		PRESENCE mandatory }
+	{ ID id-P-CCPCH-Information	CRITICALITY ignore	TYPE Common-PhysicalChannel-Status-Information	PRESENCE mandatory }
 }
 
 BCH-Information-AuditRsp ::= ProtocolIE-Single-Container {{ BCH-InformationIE-AuditRsp }}
 
 BCH-InformationIE-AuditRsp NBAP-PROTOCOL-IES ::= {
-	{ ID id-BCH-Information   CRITICALITY ignore	TYPE Common-TransportChannel-Status-Information		PRESENCE mandatory }
+	{ ID id-BCH-Information	CRITICALITY ignore	TYPE Common-TransportChannel-Status-Information	PRESENCE mandatory }
 }
 
 S-CCPCH-InformationList-AuditRsp ::= SEQUENCE (SIZE (1..maxSCCPCHCell)) OF ProtocolIE-Single-Container {{ S-CCPCH-InformationItemIE-AuditRsp }}
 
 S-CCPCH-InformationItemIE-AuditRsp NBAP-PROTOCOL-IES ::= {
-	{ ID id-S-CCPCH-Information   CRITICALITY ignore	TYPE Common-PhysicalChannel-Status-Information		PRESENCE mandatory }
+	{ ID id-S-CCPCH-Information	CRITICALITY ignore	TYPE Common-PhysicalChannel-Status-Information	PRESENCE mandatory }
 }
 
 PCH-Information-AuditRsp ::= ProtocolIE-Single-Container {{ PCH-InformationIE-AuditRsp }}
 
 PCH-InformationIE-AuditRsp NBAP-PROTOCOL-IES ::= {
-	{ ID id-PCH-Information   CRITICALITY ignore	TYPE Common-TransportChannel-Status-Information		PRESENCE mandatory }
+	{ ID id-PCH-Information	CRITICALITY ignore	TYPE Common-TransportChannel-Status-Information	PRESENCE mandatory }
 }
 
 PICH-Information-AuditRsp ::= ProtocolIE-Single-Container {{ PICH-InformationIE-AuditRsp }}
 
 PICH-InformationIE-AuditRsp NBAP-PROTOCOL-IES ::= {
-	{ ID id-PICH-Information   CRITICALITY ignore	TYPE Common-PhysicalChannel-Status-Information		PRESENCE mandatory }
+	{ ID id-PICH-Information	CRITICALITY ignore	TYPE Common-PhysicalChannel-Status-Information	PRESENCE mandatory }
 }
 
 FACH-InformationList-AuditRsp ::= SEQUENCE (SIZE (1..maxFACHCell)) OF ProtocolIE-Single-Container {{ FACH-InformationItemIE-AuditRsp }}
 
 FACH-InformationItemIE-AuditRsp NBAP-PROTOCOL-IES ::= {
-	{ ID id-FACH-Information   CRITICALITY ignore	TYPE Common-TransportChannel-Status-Information		PRESENCE mandatory }
+	{ ID id-FACH-Information	CRITICALITY ignore	TYPE Common-TransportChannel-Status-Information	PRESENCE mandatory }
 }
 
 PRACH-InformationList-AuditRsp ::= SEQUENCE (SIZE (1..maxPRACHCell)) OF ProtocolIE-Single-Container {{ PRACH-InformationItemIE-AuditRsp }}
 
 PRACH-InformationItemIE-AuditRsp NBAP-PROTOCOL-IES ::= {
-	{ ID id-PRACH-Information   CRITICALITY ignore	TYPE Common-PhysicalChannel-Status-Information		PRESENCE mandatory }
+	{ ID id-PRACH-Information	CRITICALITY ignore	TYPE Common-PhysicalChannel-Status-Information	PRESENCE mandatory }
 }
 
 RACH-InformationList-AuditRsp ::= SEQUENCE (SIZE (1..maxRACHCell)) OF ProtocolIE-Single-Container {{ RACH-InformationItemIE-AuditRsp }}
 
 RACH-InformationItemIE-AuditRsp NBAP-PROTOCOL-IES ::= {
-	{ ID id-RACH-Information   CRITICALITY ignore	TYPE Common-TransportChannel-Status-Information		PRESENCE mandatory }
+	{ ID id-RACH-Information	CRITICALITY ignore	TYPE Common-TransportChannel-Status-Information	PRESENCE mandatory }
 }
 
 AICH-InformationList-AuditRsp ::= SEQUENCE (SIZE (1..maxPRACHCell)) OF ProtocolIE-Single-Container {{ AICH-InformationItemIE-AuditRsp }}
 
 AICH-InformationItemIE-AuditRsp NBAP-PROTOCOL-IES ::= {
-	{ ID id-AICH-Information   CRITICALITY ignore	TYPE Common-PhysicalChannel-Status-Information		PRESENCE mandatory }
+	{ ID id-AICH-Information	CRITICALITY ignore	TYPE Common-PhysicalChannel-Status-Information	PRESENCE mandatory }
 }
 
 SCH-Information-AuditRsp ::= ProtocolIE-Single-Container {{ SCH-InformationIE-AuditRsp }}
 
 SCH-InformationIE-AuditRsp NBAP-PROTOCOL-IES ::= {
-	{ ID id-SCH-Information   CRITICALITY ignore	TYPE Common-PhysicalChannel-Status-Information		PRESENCE mandatory }
+	{ ID id-SCH-Information	CRITICALITY ignore	TYPE Common-PhysicalChannel-Status-Information	PRESENCE mandatory }
 }
 
 FPACH-LCR-InformationList-AuditRsp ::= SEQUENCE (SIZE (1..maxFPACHCell)) OF ProtocolIE-Single-Container {{ FPACH-LCR-InformationItemIE-AuditRsp }}
 
 FPACH-LCR-InformationItemIE-AuditRsp NBAP-PROTOCOL-IES ::= {
-	{ ID id-FPACH-LCR-Information-AuditRsp   CRITICALITY ignore	TYPE Common-PhysicalChannel-Status-Information		PRESENCE mandatory }
+	{ ID id-FPACH-LCR-Information-AuditRsp	CRITICALITY ignore	TYPE Common-PhysicalChannel-Status-Information	PRESENCE mandatory }
 }
 
 HS-DSCH-Resources-Information-AuditRsp ::= SEQUENCE {
@@ -2960,7 +3035,6 @@ MultipleFreq-HS-DSCH-Resources-InformationItem-AuditRsp NBAP-PROTOCOL-IES ::= {
 	{ ID id-HSDSCH-Resources-Information-AuditRsp	CRITICALITY ignore	TYPE HS-DSCH-Resources-Information-AuditRsp		PRESENCE mandatory }
 }
 
-
 MultipleFreq-E-DCH-Resources-InformationList-AuditRsp ::= SEQUENCE (SIZE (1..maxFrequencyinCell-1)) OF ProtocolIE-Single-Container {{ MultipleFreq-E-DCH-Resources-InformationItem-AuditRsp}} 
 	-- Includes the 2nd through the max number of frequencies information repetitions.
 
@@ -3039,11 +3113,20 @@ Local-Cell-InformationItem-AuditRsp-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-E-AI-Capability					CRITICALITY ignore			EXTENSION E-AI-Capability			PRESENCE	optional }|
 	-- The IE shall be present if Common E-DCH Capability IE is present and set to ”Common E-DCH Capable”.
 	{ ID id-Enhanced-UE-DRX-Capability				CRITICALITY ignore			EXTENSION Enhanced-UE-DRX-Capability			PRESENCE	optional }|
-	-- The IE shall be present if Common E-DCH Capability IE is present and set to ”Common E-DCH Capable”.
 	{ ID id-Enhanced-UE-DRX-CapabilityLCR		CRITICALITY ignore			EXTENSION Enhanced-UE-DRX-Capability			PRESENCE	optional }|
 	{ ID id-E-DPCCH-Power-Boosting-Capability	CRITICALITY ignore			EXTENSION E-DPCCH-Power-Boosting-Capability	PRESENCE	optional }|
 	{ ID id-SixtyfourQAM-DL-MIMO-Combined-Capability	CRITICALITY ignore	EXTENSION SixtyfourQAM-DL-MIMO-Combined-Capability						PRESENCE	conditional }|
-	{ ID id-Multi-Cell-Capability-Info			CRITICALITY ignore			EXTENSION Multi-Cell-Capability-Info			PRESENCE	optional },
+	{ ID id-Multi-Cell-Capability-Info			CRITICALITY ignore			EXTENSION Multi-Cell-Capability-Info			PRESENCE	optional }|
+	{ ID id-Semi-PersistentScheduling-CapabilityLCR		CRITICALITY ignore			EXTENSION Semi-PersistentScheduling-CapabilityLCR			PRESENCE	optional }|
+	{ ID id-ContinuousPacketConnectivity-DRX-CapabilityLCR		CRITICALITY ignore			EXTENSION ContinuousPacketConnectivity-DRX-CapabilityLCR			PRESENCE	optional }|
+	{ ID id-Common-E-DCH-HSDPCCH-Capability		CRITICALITY ignore			EXTENSION Common-E-DCH-HSDPCCH-Capability			PRESENCE	optional }|
+	-- The IE shall be present if Common E-DCH Capability IE is present and set to ”Common E-DCH Capable”.
+	{ ID id-MIMO-Power-Offset-For-S-CPICH-Capability	CRITICALITY ignore		EXTENSION MIMO-PowerOffsetForS-CPICHCapability		PRESENCE	optional } |
+	{ ID id-TxDiversityOnDLControlChannelsByMIMOUECapability	CRITICALITY ignore	EXTENSION TxDiversityOnDLControlChannelsByMIMOUECapability 		PRESENCE	optional }|
+	{ ID id-Single-Stream-MIMO-Capability		CRITICALITY ignore			EXTENSION Single-Stream-MIMO-Capability			PRESENCE	optional }|
+	{ ID id-Dual-Band-Capability-Info			CRITICALITY ignore			EXTENSION Dual-Band-Capability-Info			PRESENCE	optional }|
+	{ ID id-CellPortion-CapabilityLCR			CRITICALITY ignore			EXTENSION CellPortion-CapabilityLCR			PRESENCE	optional }|
+	{ ID id-Cell-Capability-Container	CRITICALITY ignore	EXTENSION Cell-Capability-Container		PRESENCE	optional },
 	...
 }
 
@@ -3133,12 +3216,12 @@ CommonMeasurementInitiationRequest-IEs NBAP-PROTOCOL-IES ::= {
 }
 
 CommonMeasurementInitiationRequest-Extensions NBAP-PROTOCOL-EXTENSION ::= {
-	{ ID id-CommonMeasurementAccuracy						CRITICALITY reject		EXTENSION CommonMeasurementAccuracy		PRESENCE optional}|
-	{ ID id-MeasurementRecoveryBehavior						CRITICALITY ignore		EXTENSION MeasurementRecoveryBehavior		PRESENCE optional	}|
-	{ ID id-RTWP-ReportingIndicator							CRITICALITY reject		EXTENSION RTWP-ReportingIndicator										PRESENCE optional}|
-	{ ID id-RTWP-CellPortion-ReportingIndicator				CRITICALITY reject		EXTENSION RTWP-CellPortion-ReportingIndicator							PRESENCE optional}|
-	{ ID id-Reference-ReceivedTotalWideBandPowerReporting	CRITICALITY ignore		EXTENSION Reference-ReceivedTotalWideBandPowerReporting			PRESENCE optional}|
-	{ ID id-GANSS-Time-ID									CRITICALITY ignore		EXTENSION GANSS-Time-ID						PRESENCE optional},
+	{ ID id-CommonMeasurementAccuracy						CRITICALITY reject	EXTENSION CommonMeasurementAccuracy		PRESENCE optional}|
+	{ ID id-MeasurementRecoveryBehavior						CRITICALITY ignore	EXTENSION MeasurementRecoveryBehavior		PRESENCE optional	}|
+	{ ID id-RTWP-ReportingIndicator							CRITICALITY reject	EXTENSION RTWP-ReportingIndicator										PRESENCE optional}|
+	{ ID id-RTWP-CellPortion-ReportingIndicator				CRITICALITY reject	EXTENSION RTWP-CellPortion-ReportingIndicator							PRESENCE optional}|
+	{ ID id-Reference-ReceivedTotalWideBandPowerReporting	CRITICALITY ignore	EXTENSION Reference-ReceivedTotalWideBandPowerReporting			PRESENCE optional}|
+	{ ID id-GANSS-Time-ID									CRITICALITY ignore	EXTENSION GANSS-Time-ID						PRESENCE optional},
 	...
 }
 
@@ -3154,7 +3237,7 @@ Extension-CommonMeasurementObjectType-CM-Rqst	::= ProtocolIE-Single-Container {{
 
 Extension-CommonMeasurementObjectType-CM-RqstIE NBAP-PROTOCOL-IES ::= {
 	{ ID id-Power-Local-Cell-Group-choice-CM-Rqst	CRITICALITY reject	TYPE PowerLocalCellGroup-CM-Rqst	PRESENCE mandatory }|
-	{ ID id-ERACH-CM-Rqst							CRITICALITY ignore	TYPE ERACH-CM-Rqst			PRESENCE mandatory}
+	{ ID id-ERACH-CM-Rqst							CRITICALITY reject	TYPE ERACH-CM-Rqst			PRESENCE mandatory}
 		-- FDD only
 }
 
@@ -3272,7 +3355,10 @@ Cell-CM-Rsp ::= SEQUENCE {
 }
 
 CellItem-CM-Rsp-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
-	{ID id-AdditionalMeasurementValueList 		CRITICALITY ignore	EXTENSION AdditionalMeasurementValueList 	PRESENCE optional },
+	{ID id-AdditionalMeasurementValueList 		CRITICALITY ignore	EXTENSION AdditionalMeasurementValueList 	PRESENCE optional }|
+	-- Applicable to 1.28Mcps TDD only
+	{ID id-TimeSlotMeasurementValueListLCR	CRITICALITY ignore		EXTENSION TimeSlotMeasurementValueListLCR		PRESENCE optional },
+-- Applicable to 1.28Mcps TDD, this IE is for the measurement value from the Primary frequency
 	...
 }
 
@@ -3378,7 +3464,10 @@ Cell-CM-Rprt ::= SEQUENCE {
 
 CellItem-CM-Rprt-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 	{ID id-C-ID								CRITICALITY ignore		EXTENSION C-ID				PRESENCE optional}|
-	{ID id-AdditionalMeasurementValueList 	CRITICALITY ignore		EXTENSION AdditionalMeasurementValueList	PRESENCE optional },
+	{ID id-AdditionalMeasurementValueList 	CRITICALITY ignore		EXTENSION AdditionalMeasurementValueList	PRESENCE optional }|
+	-- Applicable to 1.28Mcps TDD only
+	{ID id-TimeSlotMeasurementValueListLCR	CRITICALITY ignore		EXTENSION TimeSlotMeasurementValueListLCR		PRESENCE optional },
+-- Applicable to 1.28Mcps TDD, this IE is for the measurement value from the Primary frequency
 	...
 }
 
@@ -3483,8 +3572,9 @@ CellSetupRequestFDD-IEs NBAP-PROTOCOL-IES ::= {
 CellSetupRequestFDD-Extensions NBAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-IPDLParameter-Information-Cell-SetupRqstFDD		CRITICALITY reject	EXTENSION IPDLParameter-Information-Cell-SetupRqstFDD				PRESENCE optional }|
 	{ ID id-CellPortion-InformationList-Cell-SetupRqstFDD	CRITICALITY reject	EXTENSION CellPortion-InformationList-Cell-SetupRqstFDD			PRESENCE optional }|
-	{ ID id-MIMO-PilotConfiguration							CRITICALITY reject	EXTENSION MIMO-PilotConfiguration			PRESENCE optional },
-	...
+	{ ID id-MIMO-PilotConfiguration							CRITICALITY reject	EXTENSION MIMO-PilotConfiguration			PRESENCE optional }|
+	{ ID id-MIMO-PilotConfigurationExtension				CRITICALITY reject	EXTENSION MIMO-PilotConfigurationExtension										PRESENCE optional },
+...
 }
 
 Synchronisation-Configuration-Cell-SetupRqst ::= SEQUENCE {
@@ -3919,7 +4009,9 @@ CellReconfigurationRequestFDD-IEs NBAP-PROTOCOL-IES ::= {
 CellReconfigurationRequestFDD-Extensions NBAP-PROTOCOL-EXTENSION ::= {
 	{ ID	id-IPDLParameter-Information-Cell-ReconfRqstFDD	CRITICALITY reject	EXTENSION IPDLParameter-Information-Cell-ReconfRqstFDD					PRESENCE optional }|
 	{ ID id-CellPortion-InformationList-Cell-ReconfRqstFDD	CRITICALITY reject	EXTENSION CellPortion-InformationList-Cell-ReconfRqstFDD			PRESENCE optional }|
-	{ ID id-MIMO-PilotConfiguration							CRITICALITY reject	EXTENSION MIMO-PilotConfiguration										PRESENCE optional },
+	{ ID id-MIMO-PilotConfiguration							CRITICALITY reject	EXTENSION MIMO-PilotConfiguration										PRESENCE optional }|
+	{ ID id-MIMO-PilotConfigurationExtension				CRITICALITY reject	EXTENSION MIMO-PilotConfigurationExtension										PRESENCE optional }|
+	{ ID id-DormantModeIndicator							CRITICALITY reject	EXTENSION DormantModeIndicator		PRESENCE optional },
 	...
 }
 
@@ -4074,8 +4166,9 @@ CellReconfigurationRequestTDD-Extensions NBAP-PROTOCOL-EXTENSION ::= {
 	{ ID	id-IPDLParameter-Information-LCR-Cell-ReconfRqstTDD	CRITICALITY reject	EXTENSION IPDLParameter-Information-LCR-Cell-ReconfRqstTDD	PRESENCE optional }|	-- Applicable to 1.28Mcps TDD only
 	{ ID id-SCH-768-Information-Cell-ReconfRqstTDD				CRITICALITY reject	EXTENSION SCH-768-Information-Cell-ReconfRqstTDD				PRESENCE optional }|	-- Applicable to 7.68Mcps TDD only
 	{ ID id-PCCPCH-768-Information-Cell-ReconfRqstTDD			CRITICALITY reject	EXTENSION PCCPCH-768-Information-Cell-ReconfRqstTDD			PRESENCE optional }|	-- Applicable to 7.68Mcps TDD only
-	{ ID id-UARFCN-Adjustment									CRITICALITY reject	EXTENSION UARFCN-Adjustment										PRESENCE optional },	-- Applicable to 1.28Mcps TDD when using multiple frequencies
-	...
+	{ ID id-UARFCN-Adjustment									CRITICALITY reject	EXTENSION UARFCN-Adjustment		PRESENCE optional }|	-- Applicable to 1.28Mcps TDD when using multiple frequencies
+	{ ID id-DormantModeIndicator							CRITICALITY reject	EXTENSION DormantModeIndicator		PRESENCE optional },	
+...
 }
 
 SCH-Information-Cell-ReconfRqstTDD ::= SEQUENCE {
@@ -4416,12 +4509,21 @@ Local-Cell-InformationItem-ResourceStatusInd-ExtIEs NBAP-PROTOCOL-EXTENSION ::=
 	{ ID 	id-E-AI-Capability				CRITICALITY ignore		EXTENSION E-AI-Capability		PRESENCE	optional }|
 	-- The IE shall be present if Common E-DCH Capability IE is present and set to ”Common E-DCH Capable”.
 	{ ID id-Enhanced-UE-DRX-Capability				CRITICALITY ignore		EXTENSION Enhanced-UE-DRX-Capability		PRESENCE	optional }|
-	-- The IE shall be present if Common E-DCH Capability IE is present and set to ”Common E-DCH”.
 	{ ID id-Enhanced-UE-DRX-CapabilityLCR			CRITICALITY ignore		EXTENSION Enhanced-UE-DRX-Capability		PRESENCE	optional }|
 	{ ID id-E-DPCCH-Power-Boosting-Capability		CRITICALITY ignore		EXTENSION E-DPCCH-Power-Boosting-Capability		PRESENCE	optional }|
 	{ ID	id-SixtyfourQAM-DL-MIMO-Combined-Capability		CRITICALITY ignore		EXTENSION SixtyfourQAM-DL-MIMO-Combined-Capability			PRESENCE	conditional }|
-	{ ID id-Multi-Cell-Capability-Info				CRITICALITY ignore		EXTENSION Multi-Cell-Capability-Info		PRESENCE	optional },
-	...
+	{ ID id-Multi-Cell-Capability-Info				CRITICALITY ignore		EXTENSION Multi-Cell-Capability-Info		PRESENCE	optional }|
+	{ ID id-Semi-PersistentScheduling-CapabilityLCR		CRITICALITY ignore			EXTENSION Semi-PersistentScheduling-CapabilityLCR			PRESENCE	optional }|
+	{ ID id-ContinuousPacketConnectivity-DRX-CapabilityLCR		CRITICALITY ignore			EXTENSION ContinuousPacketConnectivity-DRX-CapabilityLCR			PRESENCE	optional }|
+	{ ID id-Common-E-DCH-HSDPCCH-Capability					CRITICALITY ignore			EXTENSION Common-E-DCH-HSDPCCH-Capability			PRESENCE	optional }|
+	-- The IE shall be present if Common E-DCH Capability IE is present and set to ”Common E-DCH Capable”.
+	{ ID id-MIMO-Power-Offset-For-S-CPICH-Capability	CRITICALITY ignore		EXTENSION MIMO-PowerOffsetForS-CPICHCapability		PRESENCE	optional } |
+	{ ID id-TxDiversityOnDLControlChannelsByMIMOUECapability	CRITICALITY ignore	EXTENSION TxDiversityOnDLControlChannelsByMIMOUECapability 		PRESENCE	optional }|
+	{ ID id-Single-Stream-MIMO-Capability		CRITICALITY ignore		EXTENSION Single-Stream-MIMO-Capability		PRESENCE	optional }|
+	{ ID id-Dual-Band-Capability-Info			CRITICALITY ignore		EXTENSION Dual-Band-Capability-Info		PRESENCE	optional }|
+	{ ID id-CellPortion-CapabilityLCR			CRITICALITY ignore		EXTENSION CellPortion-CapabilityLCR		PRESENCE	optional }|
+	{ ID id-Cell-Capability-Container	CRITICALITY ignore	EXTENSION Cell-Capability-Container		PRESENCE	optional },
+...
 
 }
 
@@ -4529,12 +4631,21 @@ Local-Cell-InformationItem2-ResourceStatusInd-ExtIEs NBAP-PROTOCOL-EXTENSION ::=
 	{ ID 	id-E-AI-Capability				CRITICALITY ignore		EXTENSION E-AI-Capability			PRESENCE	optional }|
 	-- The IE shall be present if Common E-DCH Capability IE is present and set to ”Common E-DCH Capable”.
 	{ ID 	id-Enhanced-UE-DRX-Capability			CRITICALITY ignore		EXTENSION Enhanced-UE-DRX-Capability			PRESENCE	optional }|
-	-- The IE shall be present if Common E-DCH Capability IE is present and set to ”Common E-DCH Capable”.
 	{ ID 	id-Enhanced-UE-DRX-CapabilityLCR	CRITICALITY ignore		EXTENSION Enhanced-UE-DRX-Capability			PRESENCE	optional }|
 	{ ID 	id-E-DPCCH-Power-Boosting-Capability		CRITICALITY ignore	EXTENSION E-DPCCH-Power-Boosting-Capability							PRESENCE	optional }|
 	{ ID	id-SixtyfourQAM-DL-MIMO-Combined-Capability		CRITICALITY ignore		EXTENSION SixtyfourQAM-DL-MIMO-Combined-Capability			PRESENCE	conditional }|
-	{ ID 	id-Multi-Cell-Capability-Info			CRITICALITY ignore		EXTENSION Multi-Cell-Capability-Info			PRESENCE	optional },
-	...
+	{ ID 	id-Multi-Cell-Capability-Info			CRITICALITY ignore		EXTENSION Multi-Cell-Capability-Info			PRESENCE	optional }|
+	{ ID id-Semi-PersistentScheduling-CapabilityLCR		CRITICALITY ignore			EXTENSION Semi-PersistentScheduling-CapabilityLCR			PRESENCE	optional }|
+	{ ID id-ContinuousPacketConnectivity-DRX-CapabilityLCR		CRITICALITY ignore			EXTENSION ContinuousPacketConnectivity-DRX-CapabilityLCR			PRESENCE	optional }|
+	{ ID id-Common-E-DCH-HSDPCCH-Capability					CRITICALITY ignore			EXTENSION Common-E-DCH-HSDPCCH-Capability			PRESENCE	optional }|
+	-- The IE shall be present if Common E-DCH Capability IE is present and set to ”Common E-DCH Capable”.
+	{ ID id-MIMO-Power-Offset-For-S-CPICH-Capability	CRITICALITY ignore		EXTENSION MIMO-PowerOffsetForS-CPICHCapability		PRESENCE	optional } |
+	{ ID id-TxDiversityOnDLControlChannelsByMIMOUECapability	CRITICALITY ignore	EXTENSION TxDiversityOnDLControlChannelsByMIMOUECapability 		PRESENCE	optional }|
+	{ ID id-Single-Stream-MIMO-Capability		CRITICALITY ignore		EXTENSION Single-Stream-MIMO-Capability			PRESENCE	optional }|
+	{ ID id-Dual-Band-Capability-Info			CRITICALITY ignore		EXTENSION Dual-Band-Capability-Info			PRESENCE	optional }|
+	{ ID id-CellPortion-CapabilityLCR			CRITICALITY ignore		EXTENSION CellPortion-CapabilityLCR			PRESENCE	optional }|
+	{ ID id-Cell-Capability-Container	CRITICALITY ignore	EXTENSION Cell-Capability-Container		PRESENCE	optional },
+...
 }
 
 Local-Cell-Group-InformationList2-ResourceStatusInd ::= SEQUENCE(SIZE (1..maxLocalCellinNodeB)) OF ProtocolIE-Single-Container {{ Local-Cell-Group-InformationItemIE2-ResourceStatusInd }}
@@ -5025,7 +5136,9 @@ RadioLinkSetupRequestFDD-Extensions NBAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-Serving-Cell-Change-CFN 						CRITICALITY reject	EXTENSION CFN			PRESENCE optional }|
 	{ ID id-ContinuousPacketConnectivityDTX-DRX-Information			CRITICALITY reject		EXTENSION ContinuousPacketConnectivityDTX-DRX-Information			PRESENCE optional }|
 	{ ID id-ContinuousPacketConnectivityHS-SCCH-less-Information	CRITICALITY reject		EXTENSION ContinuousPacketConnectivityHS-SCCH-less-Information			PRESENCE optional }|
-	{ ID id-Additional-HS-Cell-Information-RL-Setup					CRITICALITY reject		EXTENSION Additional-HS-Cell-Information-RL-Setup-List			PRESENCE optional },
+	{ ID id-Additional-HS-Cell-Information-RL-Setup					CRITICALITY reject		EXTENSION Additional-HS-Cell-Information-RL-Setup-List			PRESENCE optional }|
+	{ ID id-UE-AggregateMaximumBitRate				CRITICALITY ignore	EXTENSION UE-AggregateMaximumBitRate				PRESENCE optional	}|
+	{ ID id-Additional-EDCH-Cell-Information-RL-Setup-Req			CRITICALITY reject		EXTENSION Additional-EDCH-Setup-Info			PRESENCE optional },
 	...
 }
 
@@ -5135,7 +5248,8 @@ RL-InformationItem-RL-SetupRqstFDD-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-SynchronisationIndicator					CRITICALITY ignore	EXTENSION SynchronisationIndicator	PRESENCE optional }|
 	{ ID id-ExtendedPropagationDelay					CRITICALITY ignore	EXTENSION ExtendedPropagationDelay	PRESENCE optional }|
 	{ ID id-F-DPCH-SlotFormat							CRITICALITY reject	EXTENSION F-DPCH-SlotFormat					PRESENCE optional }|
-	{ ID id-HSDSCH-PreconfigurationSetup				CRITICALITY ignore	EXTENSION HSDSCH-PreconfigurationSetup	PRESENCE optional},
+	{ ID id-HSDSCH-PreconfigurationSetup				CRITICALITY ignore	EXTENSION HSDSCH-PreconfigurationSetup	PRESENCE optional}|
+	{ ID id-E-RNTI										CRITICALITY ignore	EXTENSION E-RNTI		PRESENCE optional},
 	...
 }
 E-DPCH-Information-RL-SetupRqstFDD ::= SEQUENCE {
@@ -5216,8 +5330,13 @@ RadioLinkSetupRequestTDD-Extensions NBAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-E-DCH-Serving-RL-ID				CRITICALITY reject		EXTENSION RL-ID					PRESENCE optional	}|
 	{ ID id-E-DCH-768-Information			CRITICALITY reject		EXTENSION E-DCH-768-Information	PRESENCE optional	}|
 	{ ID id-E-DCH-LCR-Information			CRITICALITY reject		EXTENSION E-DCH-LCR-Information						PRESENCE optional	}|
-	{ ID id-PowerControlGAP					CRITICALITY ignore		EXTENSION ControlGAP									PRESENCE optional },
+	{ ID id-PowerControlGAP					CRITICALITY ignore		EXTENSION ControlGAP									PRESENCE optional }|
 	 -- Applicable to 1.28Mcps TDD only
+	{ ID id-ContinuousPacketConnectivity-DRX-InformationLCR				CRITICALITY reject		EXTENSION ContinuousPacketConnectivity-DRX-InformationLCR			PRESENCE optional }|
+	{ ID id-HS-DSCH-Semi-PersistentScheduling-Information-LCR			CRITICALITY reject		EXTENSION	HS-DSCH-Semi-PersistentScheduling-Information-LCR		PRESENCE optional }|
+	{ ID id-E-DCH-Semi-PersistentScheduling-Information-LCR				CRITICALITY reject		EXTENSION	E-DCH-Semi-PersistentScheduling-Information-LCR		PRESENCE optional }|
+	{ ID id-IdleIntervalInformation			CRITICALITY ignore		EXTENSION		IdleIntervalInformation									PRESENCE optional }|
+	{ ID id-UE-Selected-MBMS-Service-Information			CRITICALITY ignore		EXTENSION UE-Selected-MBMS-Service-Information						PRESENCE optional	},
 	...
 }
 
@@ -5427,7 +5546,8 @@ RadioLinkSetupResponseFDD-IEs NBAP-PROTOCOL-IES ::= {
 RadioLinkSetupResponseFDD-Extensions NBAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-HSDSCH-FDD-Information-Response				CRITICALITY ignore	EXTENSION HSDSCH-FDD-Information-Response				PRESENCE optional }|
 	{ ID id-ContinuousPacketConnectivityHS-SCCH-less-Information-Response		CRITICALITY ignore	EXTENSION	ContinuousPacketConnectivityHS-SCCH-less-Information-Response			PRESENCE optional }|
-	{ ID id-Additional-HS-Cell-Information-Response		CRITICALITY ignore	EXTENSION	Additional-HS-Cell-Information-Response-List			PRESENCE optional },
+	{ ID id-Additional-HS-Cell-Information-Response		CRITICALITY ignore	EXTENSION	Additional-HS-Cell-Information-Response-List			PRESENCE optional }|
+	{ ID id-Additional-EDCH-Cell-Information-Response		CRITICALITY ignore	EXTENSION	Additional-EDCH-Cell-Information-Response-List			PRESENCE optional },
 	...
 }
 Additional-HS-Cell-Information-Response-List	::= SEQUENCE (SIZE (1..maxNrOfHSDSCH-1)) OF Additional-HS-Cell-Information-Response-ItemIEs
@@ -5520,7 +5640,10 @@ RadioLinkSetupResponseTDD-IEs NBAP-PROTOCOL-IES ::= {
 RadioLinkSetupResponseTDD-Extensions NBAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-RL-InformationResponse-LCR-RL-SetupRspTDD	CRITICALITY ignore	EXTENSION RL-InformationResponse-LCR-RL-SetupRspTDD		PRESENCE 	optional	}|	-- Mandatory for 1.28Mcps TDD, Not Applicable to 3.84Mcps TDD or 7.68Mcps TDD
 	{ ID id-HSDSCH-TDD-Information-Response			CRITICALITY ignore		EXTENSION HSDSCH-TDD-Information-Response		PRESENCE optional	}|
-	{ ID id-E-DCH-Information-Response				CRITICALITY ignore		EXTENSION E-DCH-Information-Response			PRESENCE optional	},
+	{ ID id-E-DCH-Information-Response				CRITICALITY ignore		EXTENSION E-DCH-Information-Response			PRESENCE optional	}|
+	{ ID id-ContinuousPacketConnectivity-DRX-Information-ResponseLCR				CRITICALITY ignore		EXTENSION ContinuousPacketConnectivity-DRX-Information-ResponseLCR			PRESENCE optional	}|
+	{ ID id-HS-DSCH-Semi-PersistentScheduling-Information-ResponseLCR		CRITICALITY ignore		EXTENSION HS-DSCH-Semi-PersistentScheduling-Information-ResponseLCR			PRESENCE optional	}|
+	{ ID id-E-DCH-Semi-PersistentScheduling-Information-ResponseLCR			CRITICALITY ignore		EXTENSION E-DCH-Semi-PersistentScheduling-Information-ResponseLCR			PRESENCE optional},
 	...
 }
 
@@ -5624,7 +5747,8 @@ RLSpecificCauseList-RL-SetupFailureFDD ::= SEQUENCE {
 RLSpecificCauseItem-RL-SetupFailureFDD-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-HSDSCH-FDD-Information-Response		CRITICALITY ignore		EXTENSION HSDSCH-FDD-Information-Response			PRESENCE optional }|
 	{ ID id-ContinuousPacketConnectivityHS-SCCH-less-Information-Response		CRITICALITY ignore		EXTENSION	ContinuousPacketConnectivityHS-SCCH-less-Information-Response			PRESENCE optional }|
-	{ ID id-Additional-HS-Cell-Information-Response		CRITICALITY ignore	EXTENSION	Additional-HS-Cell-Information-Response-List			PRESENCE optional},
+	{ ID id-Additional-HS-Cell-Information-Response		CRITICALITY ignore	EXTENSION	Additional-HS-Cell-Information-Response-List			PRESENCE optional}|
+	{ ID id-Additional-EDCH-Cell-Information-Response		CRITICALITY ignore	EXTENSION	Additional-EDCH-Cell-Information-Response-List			PRESENCE optional},
 	...
 }
 
@@ -5791,16 +5915,34 @@ RadioLinkAdditionRequestFDD-Extensions NBAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-E-DPCH-Information-RL-AdditionReqFDD	CRITICALITY reject	EXTENSION E-DPCH-Information-RL-AdditionReqFDD		PRESENCE optional }|
 	{ ID id-E-DCH-FDD-Information					CRITICALITY reject	EXTENSION E-DCH-FDD-Information			PRESENCE conditional }|
 	-- This IE shall be present if E-DPCH Information is present
-	{ ID id-Additional-HS-Cell-Information-RL-Addition		CRITICALITY reject	EXTENSION Additional-HS-Cell-Information-RL-Addition-List			PRESENCE conditional },
+	{ ID id-Additional-HS-Cell-Information-RL-Addition		CRITICALITY reject	EXTENSION Additional-HS-Cell-Information-RL-Addition-List			PRESENCE optional }|
+	{ ID id-UE-AggregateMaximumBitRate				CRITICALITY ignore	EXTENSION UE-AggregateMaximumBitRate					PRESENCE optional	}|
+	{ ID id-Additional-EDCH-Cell-Information-RL-Add-Req		CRITICALITY reject	EXTENSION Additional-EDCH-Cell-Information-RL-Add-Req			PRESENCE optional },
 	...
 }
 
 Additional-HS-Cell-Information-RL-Addition-List	::= SEQUENCE (SIZE (1..maxNrOfHSDSCH-1)) OF Additional-HS-Cell-Information-RL-Addition-ItemIEs
 
+Additional-EDCH-Cell-Information-RL-Add-Req	::=SEQUENCE{
+	setup-Or-Addition-Of-EDCH-On-secondary-UL-Frequency							Setup-Or-Addition-Of-EDCH-On-secondary-UL-Frequency,
+	iE-Extensions					ProtocolExtensionContainer { { Additional-EDCH-Cell-Information-RL-Add-Req-ExtIEs} } OPTIONAL,
+	...
+}
+
+Additional-EDCH-Cell-Information-RL-Add-Req-ExtIEs	NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+Setup-Or-Addition-Of-EDCH-On-secondary-UL-Frequency::= CHOICE {
+	setup			Additional-EDCH-Setup-Info,
+	addition		Additional-EDCH-Cell-Information-To-Add-List,
+	...
+}
+
 Additional-HS-Cell-Information-RL-Addition-ItemIEs	::=SEQUENCE{
 	hSPDSCH-RL-ID								RL-ID,
-	c-ID										C-ID										OPTIONAL,
-	hS-DSCH-FDD-Secondary-Serving-Information	HS-DSCH-FDD-Secondary-Serving-Information	OPTIONAL,
+	c-ID										C-ID,
+	hS-DSCH-FDD-Secondary-Serving-Information	HS-DSCH-FDD-Secondary-Serving-Information,
 	iE-Extensions					ProtocolExtensionContainer { { Additional-HS-Cell-Information-RL-Addition-ItemIEs-ExtIEs} } OPTIONAL,
 	...
 }
@@ -5823,23 +5965,23 @@ RL-InformationItem-RL-AdditionRqstFDD ::= SEQUENCE {
 	diversityControlField						DiversityControlField,
 	dl-CodeInformation							FDD-DL-CodeInformation,
 	initialDL-TransmissionPower					DL-Power						OPTIONAL,
- 	maximumDL-Power								DL-Power						OPTIONAL,
- 	minimumDL-Power								DL-Power						OPTIONAL,
- 	not-Used-sSDT-CellIdentity					NULL							OPTIONAL,
+	maximumDL-Power								DL-Power						OPTIONAL,
+	minimumDL-Power								DL-Power						OPTIONAL,
+	not-Used-sSDT-CellIdentity					NULL							OPTIONAL,
 	transmitDiversityIndicator					TransmitDiversityIndicator		OPTIONAL,
 	iE-Extensions								ProtocolExtensionContainer { { RL-InformationItem-RL-AdditionRqstFDD-ExtIEs} }		OPTIONAL,
 	...
 }
 
 RL-InformationItem-RL-AdditionRqstFDD-ExtIEs NBAP-PROTOCOL-EXTENSION ::= {
-	{ ID id-DLReferencePower							CRITICALITY ignore	EXTENSION DL-Power							PRESENCE optional }|
-	{ ID id-RL-Specific-DCH-Info						CRITICALITY ignore	EXTENSION RL-Specific-DCH-Info						PRESENCE optional }|
-	{ ID id-DelayedActivation							CRITICALITY reject	EXTENSION DelayedActivation						PRESENCE optional }|
-	{ ID id-E-DCH-RL-Indication							CRITICALITY reject	EXTENSION E-DCH-RL-Indication						PRESENCE optional }|
-	{ ID id-RL-Specific-E-DCH-Info						CRITICALITY ignore	EXTENSION RL-Specific-E-DCH-Info						PRESENCE optional }|
-	{ ID id-SynchronisationIndicator					CRITICALITY ignore	EXTENSION SynchronisationIndicator						PRESENCE optional }|
-	{ ID id-F-DPCH-SlotFormat							CRITICALITY reject	EXTENSION F-DPCH-SlotFormat										PRESENCE optional }|
-	{ ID id-HSDSCH-PreconfigurationSetup				CRITICALITY ignore	EXTENSION HSDSCH-PreconfigurationSetup						PRESENCE optional },
+	{ ID id-DLReferencePower							CRITICALITY ignore	EXTENSION DL-Power					PRESENCE optional }|
+	{ ID id-RL-Specific-DCH-Info						CRITICALITY ignore	EXTENSION RL-Specific-DCH-Info				PRESENCE optional }|
+	{ ID id-DelayedActivation							CRITICALITY reject	EXTENSION DelayedActivation				PRESENCE optional }|
+	{ ID id-E-DCH-RL-Indication							CRITICALITY reject	EXTENSION E-DCH-RL-Indication				PRESENCE optional }|
+	{ ID id-RL-Specific-E-DCH-Info						CRITICALITY ignore	EXTENSION RL-Specific-E-DCH-Info				PRESENCE optional }|
+	{ ID id-SynchronisationIndicator					CRITICALITY ignore	EXTENSION SynchronisationIndicator				PRESENCE optional }|
+	{ ID id-F-DPCH-SlotFormat							CRITICALITY reject	EXTENSION F-DPCH-SlotFormat								PRESENCE optional }|
+	{ ID id-HSDSCH-PreconfigurationSetup				CRITICALITY ignore	EXTENSION HSDSCH-PreconfigurationSetup				PRESENCE optional },
 	...
 }
 
@@ -5893,8 +6035,13 @@ RadioLinkAdditionRequestTDD-Extensions NBAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-E-DCH-Serving-RL-ID				CRITICALITY reject		EXTENSION RL-ID					PRESENCE optional	}|
 	{ ID id-E-DCH-768-Information			CRITICALITY reject		EXTENSION E-DCH-768-Information	PRESENCE optional	}|
 	{ ID id-E-DCH-LCR-Information			CRITICALITY reject		EXTENSION E-DCH-LCR-Information						PRESENCE optional	}|
-	{ ID id-PowerControlGAP					CRITICALITY ignore		EXTENSION ControlGAP									PRESENCE optional },
+	{ ID id-PowerControlGAP					CRITICALITY ignore		EXTENSION ControlGAP									PRESENCE optional }|
 	 -- Applicable to 1.28Mcps TDD only
+	{ ID id-ContinuousPacketConnectivity-DRX-InformationLCR				CRITICALITY reject		EXTENSION ContinuousPacketConnectivity-DRX-InformationLCR			PRESENCE optional }|
+	{ ID id-HS-DSCH-Semi-PersistentScheduling-Information-LCR			CRITICALITY reject		EXTENSION	HS-DSCH-Semi-PersistentScheduling-Information-LCR		PRESENCE optional }|
+	{ ID id-E-DCH-Semi-PersistentScheduling-Information-LCR				CRITICALITY reject		EXTENSION	E-DCH-Semi-PersistentScheduling-Information-LCR		PRESENCE optional }|
+	{ ID id-IdleIntervalInformation			CRITICALITY ignore		EXTENSION		IdleIntervalInformation			PRESENCE optional }|
+	{ ID id-UE-Selected-MBMS-Service-Information			CRITICALITY ignore		EXTENSION UE-Selected-MBMS-Service-Information						PRESENCE optional	},
 	...
 }
 
@@ -6068,10 +6215,11 @@ RadioLinkAdditionResponseFDD-IEs NBAP-PROTOCOL-IES ::= {
 }
 
 RadioLinkAdditionResponseFDD-Extensions NBAP-PROTOCOL-EXTENSION ::= {
-{ ID id-HS-DSCH-Serving-Cell-Change-Info-Response			CRITICALITY ignore	EXTENSION HS-DSCH-Serving-Cell-Change-Info-Response				PRESENCE optional }|
-{ ID id-E-DCH-Serving-Cell-Change-Info-Response				CRITICALITY ignore	EXTENSION E-DCH-Serving-Cell-Change-Info-Response					PRESENCE optional }|
-{ ID id-MAChs-ResetIndicator								CRITICALITY ignore	EXTENSION MAChs-ResetIndicator												PRESENCE optional }|
-{ ID id-Additional-HS-Cell-Change-Information-Response		CRITICALITY ignore	EXTENSION Additional-HS-Cell-Change-Information-Response-List				PRESENCE optional },
+{ ID id-HS-DSCH-Serving-Cell-Change-Info-Response		CRITICALITY ignore	EXTENSION HS-DSCH-Serving-Cell-Change-Info-Response					PRESENCE optional }|
+{ ID id-E-DCH-Serving-Cell-Change-Info-Response			CRITICALITY ignore	EXTENSION E-DCH-Serving-Cell-Change-Info-Response					PRESENCE optional }|
+{ ID id-MAChs-ResetIndicator							CRITICALITY ignore	EXTENSION MAChs-ResetIndicator									PRESENCE optional }|
+{ ID id-Additional-HS-Cell-Change-Information-Response	CRITICALITY ignore	EXTENSION Additional-HS-Cell-Change-Information-Response-List	PRESENCE optional }|
+{ ID id-Additional-EDCH-Cell-Change-Information-Response	CRITICALITY ignore	EXTENSION Additional-EDCH-Cell-Change-Information-Response-List	PRESENCE optional },
 	...
 }
 
@@ -6088,6 +6236,19 @@ Additional-HS-Cell-Change-Information-Response-ItemIEs-ExtIEs	NBAP-PROTOCOL-EXTE
 	...
 }
 
+Additional-EDCH-Cell-Change-Information-Response-List	::= SEQUENCE (SIZE (1..maxNrOfEDCH-1)) OF Additional-EDCH-Cell-Change-Information-Response-ItemIEs
+
+Additional-EDCH-Cell-Change-Information-Response-ItemIEs	::=SEQUENCE{
+	additional-EDCH-FDD-Information-Response						Additional-EDCH-FDD-Information-Response-ItemIEs 			OPTIONAL,
+	additional-EDCH-Serving-Cell-Change-Information-Response		E-DCH-Serving-Cell-Change-Info-Response 			OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { { Additional-EDCH-Cell-Change-Information-Response-ItemIEs-ExtIEs} } OPTIONAL,
+	...
+}
+
+Additional-EDCH-Cell-Change-Information-Response-ItemIEs-ExtIEs	NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 RL-InformationResponseList-RL-AdditionRspFDD ::= SEQUENCE (SIZE (1..maxNrOfRLs-1)) OF ProtocolIE-Single-Container {{ RL-InformationResponseItemIE-RL-AdditionRspFDD }}
 
 RL-InformationResponseItemIE-RL-AdditionRspFDD NBAP-PROTOCOL-IES ::= {
@@ -6105,9 +6266,9 @@ RL-InformationResponseItem-RL-AdditionRspFDD ::= SEQUENCE {
 }
 
 RL-InformationResponseItem-RL-AdditionRspFDD-ExtIEs  NBAP-PROTOCOL-EXTENSION ::= {
-	{ ID id-DL-PowerBalancing-ActivationIndicator		CRITICALITY ignore	EXTENSION DL-PowerBalancing-ActivationIndicator			PRESENCE optional }|
-	{ ID id-E-DCH-RL-Set-ID								CRITICALITY ignore	EXTENSION RL-Set-ID							PRESENCE optional }|
-	{ ID id-E-DCH-FDD-DL-Control-Channel-Information	CRITICALITY ignore	EXTENSION E-DCH-FDD-DL-Control-Channel-Information		PRESENCE optional }|
+	{ ID id-DL-PowerBalancing-ActivationIndicator		CRITICALITY ignore	EXTENSION DL-PowerBalancing-ActivationIndicator		PRESENCE optional }|
+	{ ID id-E-DCH-RL-Set-ID								CRITICALITY ignore	EXTENSION RL-Set-ID						PRESENCE optional }|
+	{ ID id-E-DCH-FDD-DL-Control-Channel-Information	CRITICALITY ignore	EXTENSION E-DCH-FDD-DL-Control-Channel-Information	PRESENCE optional }|
 	{ ID id-Initial-DL-DPCH-TimingAdjustment			CRITICALITY ignore	EXTENSION DL-DPCH-TimingAdjustment						PRESENCE optional }|
 	{ ID id-HSDSCH-PreconfigurationInfo					CRITICALITY ignore	EXTENSION HSDSCH-PreconfigurationInfo					PRESENCE optional},
 	...
@@ -6153,16 +6314,19 @@ RadioLinkAdditionResponseTDD ::= SEQUENCE {
 }
 
 RadioLinkAdditionResponseTDD-IEs NBAP-PROTOCOL-IES ::= {
-	{ ID id-CRNC-CommunicationContextID					CRITICALITY ignore	TYPE CRNC-CommunicationContextID						PRESENCE mandatory	}|
-	{ ID id-RL-InformationResponse-RL-AdditionRspTDD	CRITICALITY ignore	TYPE RL-InformationResponse-RL-AdditionRspTDD				PRESENCE optional	}|		-- Mandatory for 3.84Mcps TDD and 7.68Mcps TDD, Not Applicable to 1.28Mcps TDD
-	{ ID id-CriticalityDiagnostics						CRITICALITY ignore	TYPE CriticalityDiagnostics						PRESENCE optional	},
+	{ ID id-CRNC-CommunicationContextID					CRITICALITY ignore	TYPE CRNC-CommunicationContextID				PRESENCE mandatory	}|
+	{ ID id-RL-InformationResponse-RL-AdditionRspTDD	CRITICALITY ignore	TYPE RL-InformationResponse-RL-AdditionRspTDD		PRESENCE optional	}|		-- Mandatory for 3.84Mcps TDD and 7.68Mcps TDD, Not Applicable to 1.28Mcps TDD
+	{ ID id-CriticalityDiagnostics						CRITICALITY ignore	TYPE CriticalityDiagnostics				PRESENCE optional	},
 	...
 }
 
 RadioLinkAdditionResponseTDD-Extensions NBAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-RL-InformationResponse-LCR-RL-AdditionRspTDD		CRITICALITY ignore			EXTENSION RL-InformationResponse-LCR-RL-AdditionRspTDD 	PRESENCE optional }|	-- Mandatory for 1.28Mcps TDD, Not Applicable to 3.84Mcps TDD or 7.68Mcps TDD
 	{ ID id-HSDSCH-TDD-Information-Response						CRITICALITY ignore			EXTENSION HSDSCH-TDD-Information-Response				PRESENCE optional}|
-	{ ID id-E-DCH-Information-Response							CRITICALITY ignore			EXTENSION E-DCH-Information-Response					PRESENCE optional	},
+	{ ID id-E-DCH-Information-Response							CRITICALITY ignore			EXTENSION E-DCH-Information-Response					PRESENCE optional	}|
+	{ ID id-ContinuousPacketConnectivity-DRX-Information-ResponseLCR				CRITICALITY ignore	EXTENSION ContinuousPacketConnectivity-DRX-Information-ResponseLCR			PRESENCE optional	}|
+	{ ID id-HS-DSCH-Semi-PersistentScheduling-Information-ResponseLCR		CRITICALITY ignore		EXTENSION HS-DSCH-Semi-PersistentScheduling-Information-ResponseLCR			PRESENCE optional	}|
+	{ ID id-E-DCH-Semi-PersistentScheduling-Information-ResponseLCR		CRITICALITY ignore			EXTENSION E-DCH-Semi-PersistentScheduling-Information-ResponseLCR			PRESENCE optional},
 	...
 }
 
@@ -6170,9 +6334,9 @@ RL-InformationResponse-RL-AdditionRspTDD ::= SEQUENCE {
 	rL-ID										RL-ID,
 	uL-TimeSlot-ISCP-Info						UL-TimeSlot-ISCP-Info,
 	ul-PhysCH-SF-Variation						UL-PhysCH-SF-Variation,
-	dCH-Information								DCH-Information-RL-AdditionRspTDD					OPTIONAL,
-	dSCH-InformationResponseList				DSCH-InformationResponseList-RL-AdditionRspTDD		OPTIONAL,
-	uSCH-InformationResponseList				USCH-InformationResponseList-RL-AdditionRspTDD		OPTIONAL,
+	dCH-Information								DCH-Information-RL-AdditionRspTDD											OPTIONAL,
+	dSCH-InformationResponseList				DSCH-InformationResponseList-RL-AdditionRspTDD								OPTIONAL,
+	uSCH-InformationResponseList				USCH-InformationResponseList-RL-AdditionRspTDD								OPTIONAL,
 	iE-Extensions								ProtocolExtensionContainer { { RL-InformationResponse-RL-AdditionRspTDD-ExtIEs} }		OPTIONAL,
 	...
 }
@@ -6232,10 +6396,10 @@ RL-InformationResponse-LCR-RL-AdditionRspTDD ::= SEQUENCE {
 	rL-ID										RL-ID,
 	uL-TimeSlot-ISCP-InfoLCR					UL-TimeSlot-ISCP-LCR-Info,
 	ul-PhysCH-SF-Variation						UL-PhysCH-SF-Variation,
-	dCH-Information								DCH-Information-RL-AdditionRspTDD					OPTIONAL,
-	dSCH-InformationResponseList				DSCH-InformationResponseList-RL-AdditionRspTDD		OPTIONAL,
-	uSCH-InformationResponseList				USCH-InformationResponseList-RL-AdditionRspTDD		OPTIONAL,
-	iE-Extensions								ProtocolExtensionContainer { { RL-InformationResponse-LCR-RL-AdditionRspTDD-ExtIEs} }		OPTIONAL,
+	dCH-Information								DCH-Information-RL-AdditionRspTDD	OPTIONAL,
+	dSCH-InformationResponseList				DSCH-InformationResponseList-RL-AdditionRspTDD	OPTIONAL,
+	uSCH-InformationResponseList				USCH-InformationResponseList-RL-AdditionRspTDD	OPTIONAL,
+	iE-Extensions								ProtocolExtensionContainer { { RL-InformationResponse-LCR-RL-AdditionRspTDD-ExtIEs} }	OPTIONAL,
 	...
 }
 
@@ -6263,9 +6427,11 @@ RadioLinkAdditionFailureFDD-IEs NBAP-PROTOCOL-IES ::= {
 }
 
 RadioLinkAdditionFailureFDD-Extensions NBAP-PROTOCOL-EXTENSION ::= {
-{ ID id-HS-DSCH-Serving-Cell-Change-Info-Response			CRITICALITY ignore	EXTENSION HS-DSCH-Serving-Cell-Change-Info-Response				PRESENCE optional }|
-{ ID id-E-DCH-Serving-Cell-Change-Info-Response				CRITICALITY ignore	EXTENSION E-DCH-Serving-Cell-Change-Info-Response					PRESENCE optional }|
-{ ID id-Additional-HS-Cell-Change-Information-Response			CRITICALITY ignore	EXTENSION Additional-HS-Cell-Change-Information-Response-List			PRESENCE optional },
+{ ID id-HS-DSCH-Serving-Cell-Change-Info-Response		CRITICALITY ignore	EXTENSION HS-DSCH-Serving-Cell-Change-Info-Response				PRESENCE optional }|
+{ ID id-E-DCH-Serving-Cell-Change-Info-Response			CRITICALITY ignore	EXTENSION E-DCH-Serving-Cell-Change-Info-Response					PRESENCE optional }|
+{ ID id-Additional-HS-Cell-Change-Information-Response	CRITICALITY ignore	EXTENSION Additional-HS-Cell-Change-Information-Response-List			PRESENCE optional }|
+{ ID id-MAChs-ResetIndicator							CRITICALITY ignore	EXTENSION MAChs-ResetIndicator												PRESENCE optional }|
+{ ID id-Additional-EDCH-Cell-Change-Information-Response	CRITICALITY ignore	EXTENSION Additional-EDCH-Cell-Change-Information-Response-List	PRESENCE optional },
 	...
 }
 
@@ -6330,9 +6496,9 @@ Successful-RL-InformationRespItem-RL-AdditionFailureFDD ::= SEQUENCE {
 }
 
 Successful-RL-InformationRespItem-RL-AdditionFailureFDD-ExtIEs  NBAP-PROTOCOL-EXTENSION ::= {
-	{ ID id-DL-PowerBalancing-ActivationIndicator		CRITICALITY ignore	EXTENSION DL-PowerBalancing-ActivationIndicator			PRESENCE optional }|
-	{ ID id-E-DCH-RL-Set-ID								CRITICALITY ignore	EXTENSION RL-Set-ID							PRESENCE optional }|
-	{ ID id-E-DCH-FDD-DL-Control-Channel-Information	CRITICALITY ignore	EXTENSION E-DCH-FDD-DL-Control-Channel-Information		PRESENCE optional }|
+	{ ID id-DL-PowerBalancing-ActivationIndicator		CRITICALITY ignore	EXTENSION DL-PowerBalancing-ActivationIndicator		PRESENCE optional }|
+	{ ID id-E-DCH-RL-Set-ID								CRITICALITY ignore	EXTENSION RL-Set-ID						PRESENCE optional }|
+	{ ID id-E-DCH-FDD-DL-Control-Channel-Information	CRITICALITY ignore	EXTENSION E-DCH-FDD-DL-Control-Channel-Information	PRESENCE optional }|
 	{ ID id-Initial-DL-DPCH-TimingAdjustment			CRITICALITY ignore	EXTENSION DL-DPCH-TimingAdjustment						PRESENCE optional }|
 	{ ID id-HSDSCH-PreconfigurationInfo					CRITICALITY ignore	EXTENSION HSDSCH-PreconfigurationInfo					PRESENCE optional },
 	...
@@ -6473,7 +6639,9 @@ RadioLinkReconfigurationPrepareFDD-Extensions NBAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-F-DPCH-Information-RL-ReconfPrepFDD		CRITICALITY reject	EXTENSION F-DPCH-Information-RL-ReconfPrepFDD			PRESENCE optional }|
 	{ ID id-Fast-Reconfiguration-Mode				CRITICALITY ignore	EXTENSION Fast-Reconfiguration-Mode				PRESENCE optional }|
 	{ ID id-CPC-Information							CRITICALITY reject	EXTENSION CPC-Information				PRESENCE optional }|
-	{ ID id-Additional-HS-Cell-Information-RL-Reconf-Prep	CRITICALITY reject	EXTENSION Additional-HS-Cell-Information-RL-Reconf-Prep			PRESENCE optional },
+	{ ID id-Additional-HS-Cell-Information-RL-Reconf-Prep	CRITICALITY reject	EXTENSION Additional-HS-Cell-Information-RL-Reconf-Prep			PRESENCE optional }|
+	{ ID id-UE-AggregateMaximumBitRate				CRITICALITY ignore	EXTENSION UE-AggregateMaximumBitRate						PRESENCE optional	}|
+	{ ID id-Additional-EDCH-Cell-Information-RL-Reconf-Prep	CRITICALITY reject	EXTENSION Additional-EDCH-Cell-Information-RL-Reconf-Prep			PRESENCE optional },
 	...
 }
 
@@ -6493,6 +6661,24 @@ Additional-HS-Cell-Information-RL-Reconf-Prep-ItemIEs-ExtIEs	NBAP-PROTOCOL-EXTEN
 	...
 }
 
+Additional-EDCH-Cell-Information-RL-Reconf-Prep	::=SEQUENCE{
+	setup-Or-ConfigurationChange-Or-Removal-Of-EDCH-On-secondary-UL-Frequency							Setup-Or-ConfigurationChange-Or-Removal-Of-EDCH-On-secondary-UL-Frequency,
+	iE-Extensions					ProtocolExtensionContainer { { Additional-EDCH-Cell-Information-RL-Reconf-Prep-ExtIEs} } OPTIONAL,
+	...
+}
+
+Additional-EDCH-Cell-Information-RL-Reconf-Prep-ExtIEs	NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+Setup-Or-ConfigurationChange-Or-Removal-Of-EDCH-On-secondary-UL-Frequency::= CHOICE {
+	setup					Additional-EDCH-Setup-Info,
+	configurationChange		Additional-EDCH-Cell-Information-ConfigurationChange-List, 
+	removal					Additional-EDCH-Cell-Information-Removal-List,
+	...
+}
+
+
 UL-DPCH-Information-RL-ReconfPrepFDD ::= SEQUENCE {
 	ul-ScramblingCode								UL-ScramblingCode					OPTIONAL,
 	ul-SIR-Target									UL-SIR								OPTIONAL,
@@ -6693,8 +6879,11 @@ RadioLinkReconfigurationPrepareTDD-Extensions NBAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-E-DCH-Serving-RL-ID						CRITICALITY reject	EXTENSION RL-ID							PRESENCE optional }|
 	{ ID id-E-DCH-768-Information-Reconfig			CRITICALITY reject	EXTENSION E-DCH-768-Information-Reconfig				PRESENCE optional }|
 	{ ID id-E-DCH-LCR-Information-Reconfig			CRITICALITY reject	EXTENSION E-DCH-LCR-Information-Reconfig					PRESENCE optional }|
-	{ ID id-PowerControlGAP								CRITICALITY ignore	EXTENSION ControlGAP									PRESENCE optional },
+	{ ID id-PowerControlGAP								CRITICALITY ignore	EXTENSION ControlGAP									PRESENCE optional }|
 	-- Applicable to 1.28Mcps TDD only
+	{ ID id-CPC-InformationLCR							CRITICALITY reject	EXTENSION CPC-InformationLCR					PRESENCE optional }|
+	{ ID id-IdleIntervalInformation			CRITICALITY ignore		EXTENSION		IdleIntervalInformation									PRESENCE optional }|
+	{ ID id-UE-Selected-MBMS-Service-Information			CRITICALITY ignore		EXTENSION UE-Selected-MBMS-Service-Information						PRESENCE optional	},
 	...
 }
 
@@ -7532,7 +7721,11 @@ RadioLinkReconfigurationReady-Extensions NBAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-MAChs-ResetIndicator				CRITICALITY ignore		EXTENSION MAChs-ResetIndicator						PRESENCE optional }|
 	{ ID id-Fast-Reconfiguration-Permission		CRITICALITY ignore		EXTENSION Fast-Reconfiguration-Permission		PRESENCE optional }|
 	{ ID id-ContinuousPacketConnectivityHS-SCCH-less-Information-Response		CRITICALITY ignore		EXTENSION	ContinuousPacketConnectivityHS-SCCH-less-Information-Response			PRESENCE optional }|
-	{ ID id-Additional-HS-Cell-Information-Response		CRITICALITY ignore		EXTENSION	Additional-HS-Cell-Information-Response-List			PRESENCE optional },
+	{ ID id-Additional-HS-Cell-Information-Response		CRITICALITY ignore		EXTENSION	Additional-HS-Cell-Information-Response-List			PRESENCE optional }|
+	{ ID id-ContinuousPacketConnectivity-DRX-Information-ResponseLCR				CRITICALITY ignore		EXTENSION ContinuousPacketConnectivity-DRX-Information-ResponseLCR			PRESENCE optional	}|
+	{ ID id-HS-DSCH-Semi-PersistentScheduling-Information-ResponseLCR		CRITICALITY ignore		EXTENSION HS-DSCH-Semi-PersistentScheduling-Information-ResponseLCR			PRESENCE optional	}|
+	{ ID id-E-DCH-Semi-PersistentScheduling-Information-ResponseLCR		CRITICALITY ignore		EXTENSION E-DCH-Semi-PersistentScheduling-Information-ResponseLCR			PRESENCE optional}|
+	{ ID id-Additional-EDCH-Cell-Information-Response		CRITICALITY ignore	EXTENSION	Additional-EDCH-Cell-Information-Response-List			PRESENCE optional },
 	...
 }
 
@@ -7731,8 +7924,10 @@ RadioLinkReconfigurationRequestFDD-Extensions NBAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-Serving-E-DCH-RL-ID							CRITICALITY reject	EXTENSION Serving-E-DCH-RL-ID				PRESENCE optional }|
 	{ ID id-CPC-Information								CRITICALITY reject	EXTENSION CPC-Information								PRESENCE optional }|
 	{ ID id-NoOfTargetCellHS-SCCH-Order					CRITICALITY	ignore		EXTENSION NoOfTargetCellHS-SCCH-Order			PRESENCE optional}|
-	{ ID id-Additional-HS-Cell-Information-RL-Reconf-Req	CRITICALITY reject	EXTENSION Additional-HS-Cell-Information-RL-Reconf-Req			PRESENCE optional },
-	...
+	{ ID id-Additional-HS-Cell-Information-RL-Reconf-Req	CRITICALITY reject	EXTENSION Additional-HS-Cell-Information-RL-Reconf-Req			PRESENCE optional }|
+	{ ID id-UE-AggregateMaximumBitRate					CRITICALITY ignore	EXTENSION UE-AggregateMaximumBitRate					PRESENCE optional	}|
+	{ ID id-Additional-EDCH-Cell-Information-RL-Reconf-Req	CRITICALITY reject	EXTENSION Additional-EDCH-Cell-Information-RL-Reconf-Req		PRESENCE optional },
+...
 }
 
 Additional-HS-Cell-Information-RL-Reconf-Req	::= SEQUENCE (SIZE (1..maxNrOfHSDSCH-1)) OF Additional-HS-Cell-Information-RL-Reconf-Req-ItemIEs
@@ -7751,6 +7946,16 @@ Additional-HS-Cell-Information-RL-Reconf-Req-ExtIEs	NBAP-PROTOCOL-EXTENSION ::=
 	...
 }
 
+Additional-EDCH-Cell-Information-RL-Reconf-Req	::=SEQUENCE{
+	setup-Or-ConfigurationChange-Or-Removal-Of-EDCH-On-secondary-UL-Frequency							Setup-Or-ConfigurationChange-Or-Removal-Of-EDCH-On-secondary-UL-Frequency,
+	iE-Extensions					ProtocolExtensionContainer { { Additional-EDCH-Cell-Information-RL-Reconf-Req-ExtIEs} } OPTIONAL,
+	...
+}
+
+Additional-EDCH-Cell-Information-RL-Reconf-Req-ExtIEs	NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 
 UL-DPCH-Information-RL-ReconfRqstFDD ::= SEQUENCE {
 	ul-TFCS											TFCS			OPTIONAL,
@@ -7873,8 +8078,11 @@ RadioLinkReconfigurationRequestTDD-Extensions NBAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-E-DCH-Serving-RL-ID							CRITICALITY reject	EXTENSION RL-ID					PRESENCE optional }|
 	{ ID id-E-DCH-768-Information-Reconfig				CRITICALITY reject	EXTENSION E-DCH-768-Information-Reconfig		PRESENCE optional }|
 	{ ID id-E-DCH-LCR-Information-Reconfig				CRITICALITY reject	EXTENSION E-DCH-LCR-Information-Reconfig		PRESENCE optional }|
-	{ ID id-PowerControlGAP								CRITICALITY ignore	EXTENSION ControlGAP									PRESENCE optional },
+	{ ID id-PowerControlGAP								CRITICALITY ignore	EXTENSION ControlGAP									PRESENCE optional }|
 	-- Applicable to 1.28Mcps TDD only
+	{ ID id-CPC-InformationLCR							CRITICALITY reject	EXTENSION CPC-InformationLCR					PRESENCE optional }|
+	{ ID id-IdleIntervalInformation			CRITICALITY ignore		EXTENSION		IdleIntervalInformation									PRESENCE optional }|
+	{ ID id-UE-Selected-MBMS-Service-Information			CRITICALITY ignore		EXTENSION UE-Selected-MBMS-Service-Information						PRESENCE optional	},
 	...
 }
 
@@ -8051,7 +8259,11 @@ RadioLinkReconfigurationResponse-Extensions NBAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-E-DCH-Information-Response			CRITICALITY ignore		EXTENSION E-DCH-Information-Response		PRESENCE optional	}|
 	{ ID id-MAChs-ResetIndicator				CRITICALITY ignore		EXTENSION MAChs-ResetIndicator		PRESENCE optional }|
 	{ ID id-ContinuousPacketConnectivityHS-SCCH-less-Information-Response		CRITICALITY ignore		EXTENSION	ContinuousPacketConnectivityHS-SCCH-less-Information-Response			PRESENCE optional }|
-	{ ID id-Additional-HS-Cell-Information-Response		CRITICALITY ignore		EXTENSION	Additional-HS-Cell-Information-Response-List			PRESENCE optional },
+	{ ID id-Additional-HS-Cell-Information-Response		CRITICALITY ignore		EXTENSION	Additional-HS-Cell-Information-Response-List			PRESENCE optional }|
+	{ ID id-ContinuousPacketConnectivity-DRX-Information-ResponseLCR				CRITICALITY ignore		EXTENSION ContinuousPacketConnectivity-DRX-Information-ResponseLCR			PRESENCE optional	}|
+	{ ID id-HS-DSCH-Semi-PersistentScheduling-Information-ResponseLCR		CRITICALITY ignore		EXTENSION HS-DSCH-Semi-PersistentScheduling-Information-ResponseLCR			PRESENCE optional	}|
+	{ ID id-E-DCH-Semi-PersistentScheduling-Information-ResponseLCR		CRITICALITY ignore		EXTENSION E-DCH-Semi-PersistentScheduling-Information-ResponseLCR			PRESENCE optional}|
+	{ ID id-Additional-EDCH-Cell-Information-Response		CRITICALITY ignore	EXTENSION	Additional-EDCH-Cell-Information-Response-List			PRESENCE optional },
 	...
 }
 
@@ -8249,7 +8461,9 @@ DedicatedMeasurementInitiationRequest-Extensions NBAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-NumberOfReportedCellPortions			CRITICALITY reject	EXTENSION NumberOfReportedCellPortions			PRESENCE conditional	}|
 	-- The IE shall be present if the Dedicated Measurement Type IE is set to ”Best Cell Portions”, FDD only.
 	{ ID id-MeasurementRecoveryBehavior				CRITICALITY ignore	EXTENSION MeasurementRecoveryBehavior					PRESENCE optional	}|
-	{ ID id-AlternativeFormatReportingIndicator		CRITICALITY ignore	EXTENSION AlternativeFormatReportingIndicator		PRESENCE optional	},
+	{ ID id-AlternativeFormatReportingIndicator		CRITICALITY ignore	EXTENSION AlternativeFormatReportingIndicator		PRESENCE optional	}|
+	{ ID id-NumberOfReportedCellPortionsLCR			CRITICALITY reject	EXTENSION NumberOfReportedCellPortionsLCR			PRESENCE conditional	},
+	-- The IE shall be present if the Dedicated Measurement Type IE is set to ”Best Cell Portions LCR”, 1.28Mcps only.
 	...
 }
 
@@ -9129,7 +9343,10 @@ PhysicalSharedChannelReconfigurationRequestTDD-Extensions NBAP-PROTOCOL-EXTENSIO
 	{ ID id-Common-EDCH-System-InformationLCR						CRITICALITY reject	EXTENSION Common-EDCH-System-InformationLCR							PRESENCE optional }|
 	{ ID id-Common-UL-MACFlows-to-DeleteLCR							CRITICALITY reject	EXTENSION Common-MACFlows-to-DeleteLCR									PRESENCE optional }|
 	{ ID id-Common-EDCH-MACdFlows-to-DeleteLCR						CRITICALITY reject	EXTENSION E-DCH-MACdFlows-to-DeleteLCR									PRESENCE optional }|
-	{ ID id-Enhanced-UE-DRX-InformationLCR							CRITICALITY reject	EXTENSION Enhanced-UE-DRX-InformationLCR								PRESENCE optional },
+	{ ID id-Enhanced-UE-DRX-InformationLCR							CRITICALITY reject	EXTENSION Enhanced-UE-DRX-InformationLCR								PRESENCE optional }|
+	{ ID id-Add-To-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst		CRITICALITY reject	EXTENSION Add-To-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst			PRESENCE optional }|
+	{ ID id-Modify-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst		CRITICALITY reject		EXTENSION Modify-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst		PRESENCE optional }|
+	{ ID	id-Delete-From-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst		CRITICALITY reject		EXTENSION Delete-From-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst		PRESENCE optional },
 	...
 }
 
@@ -9875,8 +10092,9 @@ HS-SCCH-InformationItem-LCR-PSCH-ReconfRqst	 ::= SEQUENCE {
 HS-SCCH-InformationItem-LCR-PSCH-ReconfRqst-ExtIEs  NBAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-Extended-HS-SCCH-ID							CRITICALITY ignore		EXTENSION Extended-HS-SCCH-ID	PRESENCE optional}|
 	-- used if the HS-SCCH identity has a value larger than 31
-	{ ID id-UARFCNforNt								 CRITICALITY ignore		EXTENSION UARFCN		PRESENCE optional},
+	{ ID id-UARFCNforNt								CRITICALITY ignore		EXTENSION UARFCN		PRESENCE optional}|
 	-- Mandatory for 1.28Mcps TDD when using multiple frequencies
+	{ ID id-HSSICH-ReferenceSignal-InformationLCR	CRITICALITY ignore		EXTENSION HSSICH-ReferenceSignal-InformationLCR		PRESENCE optional},
 	...
 }
 
@@ -9987,8 +10205,9 @@ HS-SCCH-InformationModifyItem-LCR-PSCH-ReconfRqst	 ::= SEQUENCE {
 HS-SCCH-InformationModifyItem-LCR-PSCH-ReconfRqst-ExtIEs  NBAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-Extended-HS-SCCH-ID							CRITICALITY ignore	EXTENSION Extended-HS-SCCH-ID	PRESENCE optional}|
 	-- used if the HS-SCCH identity has a value larger than 31
-	{ ID id-UARFCNforNt									CRITICALITY ignore	EXTENSION UARFCN		PRESENCE optional},
+	{ ID id-UARFCNforNt									CRITICALITY ignore	EXTENSION UARFCN		PRESENCE optional}|
 	-- Applicable to 1.28Mcps TDD when using multiple frequencies
+	{ ID id-HSSICH-ReferenceSignal-InformationModifyLCR		CRITICALITY reject		EXTENSION HSSICH-ReferenceSignal-InformationModifyLCR		PRESENCE optional},
 	...
 }
 
@@ -11593,6 +11812,27 @@ E-DCH-RearrangeItem-Bearer-RearrangeInd ::= SEQUENCE {
 }
 
 E-DCH-RearrangeItem-Bearer-RearrangeInd-ExtIEs  NBAP-PROTOCOL-EXTENSION ::= {
+	{ ID id-Additional-EDCH-Cell-Information-Bearer-Rearrangement		CRITICALITY ignore	EXTENSION	Additional-EDCH-Cell-Information-Bearer-Rearrangement-List			PRESENCE optional },
+	...
+}
+
+Additional-EDCH-Cell-Information-Bearer-Rearrangement-List	::= SEQUENCE (SIZE (1..maxNrOfEDCH-1)) OF Additional-EDCH-Cell-Information-Bearer-Rearrangement-ItemIEs
+
+Additional-EDCH-Cell-Information-Bearer-Rearrangement-ItemIEs ::= SEQUENCE {
+	transport-Bearer-Rearrangement-Indicator-for-Additional-EDCH-Separate-Mode								Transport-Bearer-Rearrangement-Indicator-for-Additional-EDCH-Separate-Mode,
+	iE-Extensions									ProtocolExtensionContainer { { Additional-EDCH-Cell-Information-Bearer-Rearrangement-ItemIEs-ExtIEs} }		OPTIONAL,
+	...
+}
+
+Additional-EDCH-Cell-Information-Bearer-Rearrangement-ItemIEs-ExtIEs  NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+Transport-Bearer-Rearrangement-Indicator-for-Additional-EDCH-Separate-Mode
+ ::= ENUMERATED {
+	bearer-for-primary-carrier,
+	bearer-for-secondary-carrier,
+	bearers-for-both-primary-and-secondary-carriers,
 	...
 }
 
@@ -11696,7 +11936,8 @@ RadioLinkParameterUpdateIndicationFDD-IEs NBAP-PROTOCOL-IES ::= {
 
 RadioLinkParameterUpdateIndicationFDD-Extensions NBAP-PROTOCOL-EXTENSION ::= {
 	{ ID id-E-DCH-FDD-Update-Information		CRITICALITY		ignore		EXTENSION	E-DCH-FDD-Update-Information			PRESENCE	optional	}|
-	{ ID id-Additional-HS-Cell-Information-RL-Param-Upd	CRITICALITY ignore		EXTENSION Additional-HS-Cell-Information-RL-Param-Upd		PRESENCE optional },
+	{ ID id-Additional-HS-Cell-Information-RL-Param-Upd	CRITICALITY ignore		EXTENSION Additional-HS-Cell-Information-RL-Param-Upd		PRESENCE optional }|
+	{ ID id-Additional-EDCH-Cell-Information-RL-Param-Upd	CRITICALITY ignore		EXTENSION Additional-EDCH-Cell-Information-RL-Param-Upd		PRESENCE optional },
 	...
 }
 
@@ -11712,6 +11953,17 @@ Additional-HS-Cell-Information-RL-Param-Upd-ItemIEs	::=SEQUENCE{
 Additional-HS-Cell-Information-RL-Setup-ExtIEs	NBAP-PROTOCOL-EXTENSION ::= {
 	...
 }
+Additional-EDCH-Cell-Information-RL-Param-Upd	::= SEQUENCE (SIZE (1..maxNrOfEDCH-1)) OF Additional-EDCH-Cell-Information-RL-Param-Upd-ItemIEs
+
+Additional-EDCH-Cell-Information-RL-Param-Upd-ItemIEs	::=SEQUENCE{
+	additional-EDCH-FDD-Update-Information										Additional-EDCH-FDD-Update-Information,
+	iE-Extensions					ProtocolExtensionContainer { { Additional-EDCH-Cell-Information-RL-Param-Upd-ItemIEs-ExtIEs} } OPTIONAL,
+	...
+}
+
+Additional-EDCH-Cell-Information-RL-Param-Upd-ItemIEs-ExtIEs	NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
 -- **************************************************************
 --
@@ -11763,7 +12015,7 @@ MBMSNotificationUpdateCommand-Extensions NBAP-PROTOCOL-EXTENSION ::= {
 
 -- **************************************************************
 --
--- UE STATUS UPDATE
+-- UE STATUS UPDATE COMMAND
 --
 -- **************************************************************
 
@@ -11782,5 +12034,49 @@ UEStatusUpdateCommand-Extensions NBAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-END
+-- **************************************************************
+--
+-- SECONDARY UL FREQUENCY REPORT
+--
+-- **************************************************************
+
+SecondaryULFrequencyReport ::= SEQUENCE {
+	protocolIEs				ProtocolIE-Container	{{SecondaryULFrequencyReport-IEs}},
+	protocolExtensions		ProtocolExtensionContainer	{{SecondaryULFrequencyReport-Extensions}}			OPTIONAL,
+	...
+}
+
+SecondaryULFrequencyReport-IEs NBAP-PROTOCOL-IES ::= {
+	{ ID	id-NodeB-CommunicationContextID				CRITICALITY	ignore	TYPE	NodeB-CommunicationContextID				PRESENCE	mandatory	}|
+	{ ID id-ActivationInformation 	CRITICALITY		ignore		TYPE ActivationInformation		PRESENCE mandatory },
+	...
+}
+
+SecondaryULFrequencyReport-Extensions NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
+-- **************************************************************
+--
+-- SECONDARY UL FREQUENCY UPDATE INDICATION
+--
+-- **************************************************************
+
+SecondaryULFrequencyUpdateIndication ::= SEQUENCE {
+	protocolIEs				ProtocolIE-Container	{{SecondaryULFrequencyUpdateIndication-IEs}},
+	protocolExtensions		ProtocolExtensionContainer	{{SecondaryULFrequencyUpdateIndication-Extensions}}		OPTIONAL,
+	...
+}
+
+
+SecondaryULFrequencyUpdateIndication-IEs NBAP-PROTOCOL-IES ::= {
+	{ ID id-CRNC-CommunicationContextID			CRITICALITY		ignore		TYPE	CRNC-CommunicationContextID			PRESENCE	mandatory	}|
+	{ ID id-ActivationInformation 	CRITICALITY		ignore		TYPE ActivationInformation		PRESENCE mandatory },
+	...
+}
+
+SecondaryULFrequencyUpdateIndication-Extensions NBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+END
diff --git a/asn1/nbap/NBAP-PDU-Descriptions.asn b/asn1/nbap/NBAP-PDU-Descriptions.asn
index 1776819fa5..d25c8ce371 100644
--- a/asn1/nbap/NBAP-PDU-Descriptions.asn
+++ b/asn1/nbap/NBAP-PDU-Descriptions.asn
@@ -1,6 +1,6 @@
 -- NBAP-PDU-Descriptions.asn
 --
--- Taken from 3GPP TS 25.433 V8.3.0 (2008-12)
+-- Taken from 3GPP TS 25.433 V9.1.0 (2009-12)
 -- http://www.3gpp.org/ftp/Specs/archive/25_series/25.433/
 --
 -- 9.3.2	Elementary Procedure Definitions
@@ -140,7 +140,9 @@ FROM NBAP-CommonDataTypes
 	CellSynchronisationTerminationRequestTDD,
 	CellSynchronisationFailureIndicationTDD,
 	MBMSNotificationUpdateCommand,
-	UEStatusUpdateCommand
+	UEStatusUpdateCommand,
+	SecondaryULFrequencyReport,
+	SecondaryULFrequencyUpdateIndication
 
 FROM NBAP-PDU-Contents
 
@@ -172,9 +174,9 @@ FROM NBAP-PDU-Contents
 	id-errorIndicationForDedicated,
 	id-errorIndicationForCommon,
 	id-informationExchangeFailure,
-    id-informationExchangeInitiation,
-    id-informationReporting,
-    id-informationExchangeTermination,
+	id-informationExchangeInitiation,
+	id-informationReporting,
+	id-informationExchangeTermination,
 	id-BearerRearrangement,
 	id-mBMSNotificationUpdate,
 	id-physicalSharedChannelReconfiguration,
@@ -197,7 +199,9 @@ FROM NBAP-PDU-Contents
 	id-systemInformationUpdate,
 	id-unblockResource,
 	id-unSynchronisedRadioLinkReconfiguration,
-	id-uEStatusUpdate
+	id-uEStatusUpdate,
+	id-secondaryULFrequencyReporting,
+	id-secondaryULFrequencyUpdate
 
 FROM NBAP-Constants;
 
@@ -355,7 +359,9 @@ NBAP-ELEMENTARY-PROCEDURES-CLASS-2 NBAP-ELEMENTARY-PROCEDURE ::= {
 	radioLinkParameterUpdateFDD							|
 	radioLinkParameterUpdateTDD							|
 	mBMSNotificationUpdate								|
-	uEStatusUpdate
+	uEStatusUpdate										|
+	secondaryULFrequencyReportingFDD					|
+	secondaryULFrequencyUpdateFDD
 
 }
 
@@ -619,8 +625,8 @@ physicalSharedChannelReconfigurationFDD NBAP-ELEMENTARY-PROCEDURE ::= {
 	SUCCESSFUL OUTCOME	PhysicalSharedChannelReconfigurationResponse
 	UNSUCCESSFUL OUTCOME	PhysicalSharedChannelReconfigurationFailure
 	MESSAGE DISCRIMINATOR	common
-	PROCEDURE ID 		{ procedureCode id-physicalSharedChannelReconfiguration, ddMode fdd } 
-	CRITICALITY 		reject
+	PROCEDURE ID 	{ procedureCode id-physicalSharedChannelReconfiguration, ddMode fdd } 
+	CRITICALITY 	reject
 }
 
 -- *** PhysicalSharedChannelReconfiguration (TDD) ***
@@ -629,8 +635,8 @@ physicalSharedChannelReconfigurationTDD NBAP-ELEMENTARY-PROCEDURE ::= {
 	SUCCESSFUL OUTCOME	PhysicalSharedChannelReconfigurationResponse
 	UNSUCCESSFUL OUTCOME	PhysicalSharedChannelReconfigurationFailure
 	MESSAGE DISCRIMINATOR	common
-	PROCEDURE ID 		{ procedureCode id-physicalSharedChannelReconfiguration, ddMode tdd } 
-	CRITICALITY 		reject
+	PROCEDURE ID 	{ procedureCode id-physicalSharedChannelReconfiguration, ddMode tdd } 
+	CRITICALITY 	reject
 }
 
 -- *** InformationExchangeInitiation ***
@@ -639,7 +645,7 @@ informationExchangeInitiation NBAP-ELEMENTARY-PROCEDURE ::= {
 	SUCCESSFUL OUTCOME		InformationExchangeInitiationResponse
 	UNSUCCESSFUL OUTCOME	InformationExchangeInitiationFailure
 	MESSAGE DISCRIMINATOR	common
-	PROCEDURE ID 			{ procedureCode id-informationExchangeInitiation,	ddMode common } 
+	PROCEDURE ID 			{ procedureCode id-informationExchangeInitiation, ddMode common } 
 	CRITICALITY 			reject
 }
 
@@ -649,8 +655,8 @@ cellSynchronisationInitiationTDD NBAP-ELEMENTARY-PROCEDURE ::= {
 	SUCCESSFUL OUTCOME	CellSynchronisationInitiationResponseTDD
 	UNSUCCESSFUL OUTCOME	CellSynchronisationInitiationFailureTDD
 	MESSAGE DISCRIMINATOR	common
-	PROCEDURE ID 		{ procedureCode id-cellSynchronisationInitiation, ddMode tdd } 
-	CRITICALITY 		reject
+	PROCEDURE ID 	{ procedureCode id-cellSynchronisationInitiation, ddMode tdd } 
+	CRITICALITY 	reject
 }
 
 -- *** CellSynchronisationReconfiguration (TDD only) ***
@@ -659,8 +665,8 @@ cellSynchronisationReconfigurationTDD NBAP-ELEMENTARY-PROCEDURE ::= {
 	SUCCESSFUL OUTCOME	CellSynchronisationReconfigurationResponseTDD
 	UNSUCCESSFUL OUTCOME	CellSynchronisationReconfigurationFailureTDD
 	MESSAGE DISCRIMINATOR	common
-	PROCEDURE ID 		{ procedureCode id-cellSynchronisationReconfiguration, ddMode tdd } 
-	CRITICALITY 		reject
+	PROCEDURE ID 	{ procedureCode id-cellSynchronisationReconfiguration, ddMode tdd } 
+	CRITICALITY 	reject
 }
 
 -- *** CellSynchronisationAdjustment (TDD only) ***
@@ -669,8 +675,8 @@ cellSynchronisationAdjustmentTDD NBAP-ELEMENTARY-PROCEDURE ::= {
 	SUCCESSFUL OUTCOME	CellSynchronisationAdjustmentResponseTDD
 	UNSUCCESSFUL OUTCOME	CellSynchronisationAdjustmentFailureTDD
 	MESSAGE DISCRIMINATOR	common
-	PROCEDURE ID 		{ procedureCode id-cellSynchronisationAdjustment, ddMode tdd } 
-	CRITICALITY 		reject
+	PROCEDURE ID 	{ procedureCode id-cellSynchronisationAdjustment, ddMode tdd } 
+	CRITICALITY 	reject
 }
 
 -- Class 2
@@ -743,8 +749,8 @@ radioLinkFailure NBAP-ELEMENTARY-PROCEDURE ::= {
 radioLinkPreemption NBAP-ELEMENTARY-PROCEDURE ::= {
 	INITIATING MESSAGE	RadioLinkPreemptionRequiredIndication
 	MESSAGE DISCRIMINATOR	dedicated
-	PROCEDURE ID		{ procedureCode id-radioLinkPreemption, ddMode common }
-	CRITICALITY		ignore
+	PROCEDURE ID	{ procedureCode id-radioLinkPreemption, ddMode common }
+	CRITICALITY	ignore
 }
 
 -- *** RadioLinkRestoration ***
@@ -943,10 +949,26 @@ mBMSNotificationUpdate NBAP-ELEMENTARY-PROCEDURE ::= {
 uEStatusUpdate NBAP-ELEMENTARY-PROCEDURE ::= {
 	INITIATING MESSAGE		UEStatusUpdateCommand
 	MESSAGE DISCRIMINATOR	common
-	PROCEDURE ID 			{ procedureCode id-uEStatusUpdate, ddMode fdd }
+	PROCEDURE ID 			{ procedureCode id-uEStatusUpdate, ddMode common }
 	CRITICALITY 			ignore
 }
 
+-- *** SecondaryULFrequencyReporting (FDD) ***
+secondaryULFrequencyReportingFDD NBAP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		SecondaryULFrequencyReport
+	MESSAGE DISCRIMINATOR	dedicated
+	PROCEDURE ID			{ procedureCode id-secondaryULFrequencyReporting, ddMode fdd }
+	CRITICALITY				ignore
+}
+
+-- ***secondaryULFrequencyUpdate (FDD)
+secondaryULFrequencyUpdateFDD NBAP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		SecondaryULFrequencyUpdateIndication
+	MESSAGE DISCRIMINATOR	dedicated
+	PROCEDURE ID 			{ procedureCode id-secondaryULFrequencyUpdate, ddMode fdd }
+	CRITICALITY 			ignore
+}
 
 END
 
+
diff --git a/asn1/nbap/nbap.cnf b/asn1/nbap/nbap.cnf
index 24b396e255..cf007fb0a3 100644
--- a/asn1/nbap/nbap.cnf
+++ b/asn1/nbap/nbap.cnf
@@ -510,33 +510,51 @@ ERACH-CM-Rprt															N nbap.ies id-ERACH-CM-Rprt
 EDCH-RACH-Report-Value													N nbap.ies id-EDCH-RACH-Report-Value
 EDCH-RACH-Report-IncrDecrThres											N nbap.ies id-EDCH-RACH-Report-IncrDecrThres
 EDCH-RACH-Report-ThresholdInformation									N nbap.ies id-EDCH-RACH-Report-ThresholdInformation
+GANSS-ALM-NAVKeplerianSet												N nbap.ies id-GANSS-alm-keplerianNAVAlmanac
+GANSS-ALM-ReducedKeplerianSet											N nbap.ies id-GANSS-alm-keplerianReducedAlmanac
+GANSS-ALM-MidiAlmanacSet												N nbap.ies id-GANSS-alm-keplerianMidiAlmanac
+GANSS-ALM-GlonassAlmanacSet												N nbap.ies id-GANSS-alm-keplerianGLONASS
+GANSS-ALM-ECEFsbasAlmanacSet											N nbap.ies id-GANSS-alm-ecefSBASAlmanac
+UL-TimeslotISCP-Value-IncrDecrThres										N nbap.ies id-ULTimeslotISCPValue-For-CellPortion
+UpPTSInterferenceValue													N nbap.ies id-UpPTSInterferenceValue-For-CellPortion
+Best-Cell-Portions-ValueLCR												N nbap.ies id-Best-Cell-Portions-ValueLCR
+Transmitted-Carrier-Power-For-CellPortion-ValueLCR						N nbap.ies id-Transmitted-Carrier-Power-For-CellPortion-ValueLCR
+Received-total-wide-band-power-For-CellPortion-ValueLCR					N nbap.ies id-Received-total-wide-band-power-For-CellPortion-ValueLCR
+UL-TimeslotISCP-For-CellPortion-Value									N nbap.ies id-UL-TimeslotISCP-For-CellPortion-Value
+HS-DSCHRequiredPowerValueInformation-For-CellPortionLCR					N nbap.ies id-HS-DSCHRequiredPowerValueInformation-For-CellPortionLCR
+HS-DSCHProvidedBitRateValueInformation-For-CellPortionLCR				N nbap.ies id-HS-DSCHProvidedBitRateValueInformation-For-CellPortionLCR
+E-DCHProvidedBitRateValueInformation-For-CellPortion					N nbap.ies id-E-DCHProvidedBitRateValueInformation-For-CellPortion
+UpPTSInterference-For-CellPortion-Value									N nbap.ies id-UpPTSInterference-For-CellPortion-Value
+TransmittedCarrierPowerOfAllCodesNotUsedForHS-PDSCH-HS-SCCH-E-AGCHOrE-HICHTransmissionCellPortionValue	N nbap.ies id-TransmittedCarrierPowerOfAllCodesNotUsedForHS-PDSCH-HS-SCCH-E-AGCHOrE-HICHTransmissionCellPortionValue
+TransmittedCarrierPowerOfAllCodesNotUsedForHSTransmissionValue			N nbap.ies id-TransmittedCarrierPowerOfAllCodesNotUsedForHS-PDSCH-HS-SCCH-E-AGCHOrE-HICHTransmissionCellPortion
+ActivationInformation													N nbap.ies id-ActivationInformation
 
 #NBAP-PROTOCOL-EXTENSION
-BroadcastCommonTransportBearerIndication				N nbap.extension id-BroadcastCommonTransportBearerIndication			
-MessageStructure										N nbap.extension id-MessageStructure
-TypeOfError												N nbap.extension id-TypeOfError
-TnlQos													N nbap.extension id-TnlQos
-Unidirectional-DCH-Indicator							N nbap.extension id-Unidirectional-DCH-Indicator
-ExtendedPropagationDelay								N nbap.extension id-ExtendedPropagationDelay
-DL-Power												N nbap.extension id-Initial-DL-Power-TimeslotLCR-InformationItem
-DL-Power												N nbap.extension id-Maximum-DL-Power-TimeslotLCR-InformationItem
-DL-Power												N nbap.extension id-Minimum-DL-Power-TimeslotLCR-InformationItem
-BindingID												N nbap.extension id-bindingID
-TransportLayerAddress									N nbap.extension id-transportlayeraddress
-E-DCH-PowerOffset-for-SchedulingInfo					N nbap.extension id-E-DCH-PowerOffset-for-SchedulingInfo
-SAT-Info-Almanac-ExtList								N nbap.extension id-SAT-Info-Almanac-ExtItem
-HARQ-Preamble-Mode										N nbap.extension id-HARQ-Preamble-Mode
-HSDSCH-MACdPDUSizeFormat								N nbap.extension id-HSDSCH-MACdPDUSizeFormat
-UL-SIR													N nbap.extension id-HSSICH-SIRTarget
-TDD-TPC-UplinkStepSize-LCR								N nbap.extension id-HSSICH-TPC-StepSize
-UE-Capability-Information								N nbap.extension id-ueCapability-Info
-HS-PDSCH-Code-Change-Grant								N nbap.extension id-HS-PDSCH-Code-Change-Grant
-HARQ-Preamble-Mode-Activation-Indicator					N nbap.extension id-HARQ-Preamble-Mode-Activation-Indicator
-HSSCCH-Specific-InformationRespListTDD768				N nbap.extension id-hsSCCH-Specific-Information-ResponseTDD768
-MAC-PDU-SizeExtended									N nbap.extension id-MaximumMACdPDU-SizeExtended
-HS-SICH-failed											N nbap.extension id-Additional-failed-HS-SICH
-HS-SICH-missed											N nbap.extension id-Additional-missed-HS-SICH
-HS-SICH-total											N nbap.extension id-Additional-total-HS-SICH
+BroadcastCommonTransportBearerIndication						N nbap.extension id-BroadcastCommonTransportBearerIndication			
+MessageStructure												N nbap.extension id-MessageStructure
+TypeOfError														N nbap.extension id-TypeOfError
+TnlQos															N nbap.extension id-TnlQos
+Unidirectional-DCH-Indicator									N nbap.extension id-Unidirectional-DCH-Indicator
+ExtendedPropagationDelay										N nbap.extension id-ExtendedPropagationDelay
+DL-Power														N nbap.extension id-Initial-DL-Power-TimeslotLCR-InformationItem
+DL-Power														N nbap.extension id-Maximum-DL-Power-TimeslotLCR-InformationItem
+DL-Power														N nbap.extension id-Minimum-DL-Power-TimeslotLCR-InformationItem
+BindingID														N nbap.extension id-bindingID
+TransportLayerAddress											N nbap.extension id-transportlayeraddress
+E-DCH-PowerOffset-for-SchedulingInfo							N nbap.extension id-E-DCH-PowerOffset-for-SchedulingInfo
+SAT-Info-Almanac-ExtList										N nbap.extension id-SAT-Info-Almanac-ExtItem
+HARQ-Preamble-Mode												N nbap.extension id-HARQ-Preamble-Mode
+HSDSCH-MACdPDUSizeFormat										N nbap.extension id-HSDSCH-MACdPDUSizeFormat
+UL-SIR															N nbap.extension id-HSSICH-SIRTarget
+TDD-TPC-UplinkStepSize-LCR										N nbap.extension id-HSSICH-TPC-StepSize
+UE-Capability-Information										N nbap.extension id-ueCapability-Info
+HS-PDSCH-Code-Change-Grant										N nbap.extension id-HS-PDSCH-Code-Change-Grant
+HARQ-Preamble-Mode-Activation-Indicator							N nbap.extension id-HARQ-Preamble-Mode-Activation-Indicator
+HSSCCH-Specific-InformationRespListTDD768						N nbap.extension id-hsSCCH-Specific-Information-ResponseTDD768
+MAC-PDU-SizeExtended											N nbap.extension id-MaximumMACdPDU-SizeExtended
+HS-SICH-failed													N nbap.extension id-Additional-failed-HS-SICH
+HS-SICH-missed													N nbap.extension id-Additional-missed-HS-SICH
+HS-SICH-total													N nbap.extension id-Additional-total-HS-SICH
 ContinuousPacketConnectivityHS-SCCH-less-Information			N nbap.extension id-ContinuousPacketConnectivityHS-SCCH-less-Information
 ContinuousPacketConnectivityHS-SCCH-less-Information-Response	N nbap.extension id-ContinuousPacketConnectivityHS-SCCH-less-Information-Response
 HS-PDSCH-Code-Change-Indicator									N nbap.extension id-HS-PDSCH-Code-Change-Indicator
@@ -933,7 +951,7 @@ HSDSCH-TBSizeTableIndicator											N nbap.extension id-HSDSCH-TBSizeTableIndi
 E-DCH-DL-Control-Channel-Change-Information							N nbap.extension id-E-DCH-DL-Control-Channel-Change-Information
 E-DCH-DL-Control-Channel-Grant-Information							N nbap.extension id-E-DCH-DL-Control-Channel-Grant-Information
 DGANSS-Corrections-Req												N nbap.extension id-DGANSS-Corrections-Req
-#NULL																N nbap.extension id-UE-without-HS-SCCH-constraint-indicator
+#NULL																N nbap.extension id-UE-with-enhanced-HS-SCCH-support-indicator
 AdditionalTimeSlotListLCR											N nbap.extension id-AdditionalTimeSlotListLCR
 AdditionalMeasurementValueList										N nbap.extension id-AdditionalMeasurementValueList
 E-AGCH-Table-Choice													N nbap.extension id-E-AGCH-Table-Choice
@@ -991,6 +1009,68 @@ Additional-HS-Cell-Information-RL-Reconf-Req						N nbap.extension id-Additional
 Additional-HS-Cell-Information-RL-Param-Upd							N nbap.extension id-Additional-HS-Cell-Information-RL-Param-Upd
 Multi-Cell-Capability-Info											N nbap.extension id-Multi-Cell-Capability-Info
 IMB-Parameters														N nbap.extension id-IMB-Parameters
+MACes-Maximum-Bitrate-LCR											N nbap.extension id-MACes-Maximum-Bitrate-LCR
+Semi-PersistentScheduling-CapabilityLCR								N nbap.extension id-Semi-PersistentScheduling-CapabilityLCR
+E-DCH-Semi-PersistentScheduling-Information-LCR						N nbap.extension id-E-DCH-Semi-PersistentScheduling-Information-LCR
+HS-DSCH-Semi-PersistentScheduling-Information-LCR					N nbap.extension id-HS-DSCH-Semi-PersistentScheduling-Information-LCR
+Add-To-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst			N nbap.extension id-Add-To-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst
+Modify-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst			N nbap.extension id-Modify-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst
+Delete-From-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst	N nbap.extension id-Delete-From-Non-HS-SCCH-Associated-HS-SICH-Resource-Pool-LCR-PSCH-ReconfRqst
+ContinuousPacketConnectivity-DRX-CapabilityLCR						N nbap.extension id-ContinuousPacketConnectivity-DRX-CapabilityLCR
+ContinuousPacketConnectivity-DRX-InformationLCR						N nbap.extension id-ContinuousPacketConnectivity-DRX-InformationLCR
+ContinuousPacketConnectivity-DRX-Information-ResponseLCR			N nbap.extension id-ContinuousPacketConnectivity-DRX-Information-ResponseLCR
+CPC-InformationLCR													N nbap.extension id-CPC-InformationLCR
+HS-DSCH-Semi-PersistentScheduling-Information-ResponseLCR			N nbap.extension id-HS-DSCH-Semi-PersistentScheduling-Information-ResponseLCR
+E-DCH-Semi-PersistentScheduling-Information-ResponseLCR				N nbap.extension id-E-DCH-Semi-PersistentScheduling-Information-ResponseLCR
+E-AGCH-UE-Inactivity-Monitor-Threshold								N nbap.extension id-E-AGCH-UE-Inactivity-Monitor-Threshold
+IdleIntervalInformation												N nbap.extension id-IdleIntervalInformation
+HSSICH-ReferenceSignal-InformationLCR								N nbap.extension id-HSSICH-ReferenceSignal-InformationLCR
+MIMO-ReferenceSignal-InformationListLCR								N nbap.extension id-MIMO-ReferenceSignal-InformationListLCR
+MIMO-SFMode-For-HSPDSCHDualStream									N nbap.extension id-MIMO-SFMode-For-HSPDSCHDualStream
+MIMO-SFMode-For-HSPDSCHDualStream									N nbap.extension id-MIMO-SFMode-Supported-For-HSPDSCHDualStream
+UE-Selected-MBMS-Service-Information								N nbap.extension id-UE-Selected-MBMS-Service-Information
+LCRTDD-HSDSCH-Physical-Layer-Category								N nbap.extension id-MultiCarrier-HSDSCH-Physical-Layer-Category
+Common-E-DCH-HSDPCCH-Capability										N nbap.extension id-Common-E-DCH-HSDPCCH-Capability
+DL-RLC-PDU-Size-Format												N nbap.extension id-DL-RLC-PDU-Size-Format
+HSSICH-ReferenceSignal-InformationModifyLCR							N nbap.extension id-HSSICH-ReferenceSignal-InformationModifyLCR
+SchedulingPriorityIndicator											N nbap.extension id-schedulingPriorityIndicator
+TimeSlotMeasurementValueListLCR										N nbap.extension id-TimeSlotMeasurementValueListLCR
+UE-SupportIndicatorExtension										N nbap.extension id-UE-SupportIndicatorExtension
+Single-Stream-MIMO-ActivationIndicator								N nbap.extension id-Single-Stream-MIMO-ActivationIndicator
+Single-Stream-MIMO-Capability										N nbap.extension id-Single-Stream-MIMO-Capability
+Single-Stream-MIMO-Mode-Indicator									N nbap.extension id-Single-Stream-MIMO-Mode-Indicator
+Dual-Band-Capability-Info											N nbap.extension id-Dual-Band-Capability-Info
+UE-AggregateMaximumBitRate											N nbap.extension id-UE-AggregateMaximumBitRate
+SRB-Indicator														N nbap.extension id-SRB-Indicator
+CellSpecificHARQMemoryPartitioning									N nbap.extension id-CellSpecificHARQMemoryPartitioning
+HARQ-MemoryPartitioning												N nbap.extension id-HARQ-MemoryPartitioning
+MIMO-PowerOffsetForS-CPICHCapability								N nbap.extension id-MIMO-Power-Offset-For-S-CPICH-Capability
+MIMO-PilotConfigurationExtension									N nbap.extension id-MIMO-PilotConfigurationExtension
+TxDiversityOnDLControlChannelsByMIMOUECapability					N nbap.extension id-TxDiversityOnDLControlChannelsByMIMOUECapability 
+NumberOfReportedCellPortionsLCR										N nbap.extension id-NumberOfReportedCellPortionsLCR
+CellPortion-CapabilityLCR											N nbap.extension id-CellPortion-CapabilityLCR
+Additional-EDCH-Setup-Info											N nbap.extension id-Additional-EDCH-Cell-Information-RL-Setup-Req
+Additional-EDCH-Cell-Information-Response-List						N nbap.extension id-Additional-EDCH-Cell-Information-Response
+Additional-EDCH-Cell-Information-RL-Add-Req							N nbap.extension id-Additional-EDCH-Cell-Information-RL-Add-Req
+Additional-EDCH-Cell-Change-Information-Response-List				N nbap.extension id-Additional-EDCH-Cell-Change-Information-Response
+Additional-EDCH-Cell-Information-RL-Reconf-Prep						N nbap.extension id-Additional-EDCH-Cell-Information-RL-Reconf-Prep
+Additional-EDCH-Cell-Information-RL-Reconf-Req						N nbap.extension id-Additional-EDCH-Cell-Information-RL-Reconf-Req
+Additional-EDCH-Cell-Information-Bearer-Rearrangement-List			N nbap.extension id-Additional-EDCH-Cell-Information-Bearer-Rearrangement
+Additional-EDCH-Cell-Information-RL-Param-Upd						N nbap.extension id-Additional-EDCH-Cell-Information-RL-Param-Upd
+Additional-EDCH-Preconfiguration-Information						N nbap.extension id-Additional-EDCH-Preconfiguration-Information
+NULL																N nbap.extension id-EDCH-Indicator
+SPS-Reservation-Indicato											N nbap.extension id-HS-DSCH-SPS-Reservation-Indicator
+SPS-Reservation-Indicator											N nbap.extension id-E-DCH-SPS-Reservation-Indicator
+MultipleFreq-HARQ-MemoryPartitioning-InformationList				N nbap.extension id-MultipleFreq-HARQ-MemoryPartitioning-InformationList
+Ul-common-E-DCH-MACflow-Specific-InfoResponseListLCR-Ext			N nbap.extension id-Ul-common-E-DCH-MACflow-Specific-InfoResponseListLCR-Ext
+RepetitionPeriodIndex												N nbap.extension id-RepetitionPeriodIndex
+MidambleShiftLCR													N nbap.extension id-MidambleShiftLCR
+MaxHSDSCH-HSSCCH-Power-per-CELLPORTION								N nbap.extension id-MaxHSDSCH-HSSCCH-Power-per-CELLPORTION
+DormantModeIndicator												N nbap.extension id-DormantModeIndicator
+DiversityMode														N nbap.extension id-DiversityMode
+TransmitDiversityIndicator											N nbap.extension id-TransmitDiversityIndicator
+NonCellSpecificTxDiversity											N nbap.extension id-NonCellSpecificTxDiversity
+Cell-Capability-Container											N nbap.extension id-Cell-Capability-Container
 
 #NBAP-ELEMENTARY-PROCEDURE
 CellSetupRequestFDD                    S nbap.proc.imsg "id-cellSetup/fdd"
@@ -1115,5 +1195,7 @@ RadioLinkActivationCommandTDD          S nbap.proc.imsg "id-radioLinkActivation/
 RadioLinkParameterUpdateIndicationFDD  S nbap.proc.imsg "id-radioLinkParameterUpdate/fdd"
 RadioLinkParameterUpdateIndicationTDD  S nbap.proc.imsg "id-radioLinkParameterUpdate/tdd"
 MBMSNotificationUpdateCommand          S nbap.proc.imsg "id-mBMSNotificationUpdate/common"
-UEStatusUpdateCommand					S nbap.proc.imsg "id-uEStatusUpdate/fdd"
+UEStatusUpdateCommand					S nbap.proc.imsg "id-uEStatusUpdate/common"
+SecondaryULFrequencyReport				S nbap.proc.imsg "id-secondaryULFrequencyReporting/fdd"
+SecondaryULFrequencyUpdateIndication	S nbap.proc.imsg "id-secondaryULFrequencyUpdate/fdd"
 #.END