Update to Jun spec. version.

(Dissector will be generated when we fix some "empty blurb issues".)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28789 f5534014-38df-0310-8fa8-9805f1628bb7

7 files changed, 575 insertions, 267 deletions

diff --git a/asn1/x2ap/X2AP-CommonDataTypes.asn b/asn1/x2ap/X2AP-CommonDataTypes.asn
index a5be5027e9..8f598e15a1 100644
--- a/asn1/x2ap/X2AP-CommonDataTypes.asn
+++ b/asn1/x2ap/X2AP-CommonDataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.423 V8.3.0 (2008-09)
+-- 3GPP TS 36.423 V8.6.0 (2009-06)
 -- 9.3.6	Common Definitions
 -- **************************************************************
 --
@@ -50,3 +50,4 @@ TriggeringMessage	::= ENUMERATED { initiating-message, successful-outcome, unsuc
 
 END
 
+
diff --git a/asn1/x2ap/X2AP-Constants.asn b/asn1/x2ap/X2AP-Constants.asn
index b2477c8dfb..1d424a8f70 100644
--- a/asn1/x2ap/X2AP-Constants.asn
+++ b/asn1/x2ap/X2AP-Constants.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.423 V8.3.0 (2008-09)
+-- 3GPP TS 36.423 V8.6.0 (2009-06)
 -- 9.3.7	Constant Definitions
 -- **************************************************************
 --
@@ -31,13 +31,13 @@ id-handoverCancel												ProcedureCode ::= 1
 id-loadIndication												ProcedureCode ::= 2
 id-errorIndication												ProcedureCode ::= 3
 id-snStatusTransfer												ProcedureCode ::= 4
-id-uEContextRelease									ProcedureCode ::= 5
+id-uEContextRelease												ProcedureCode ::= 5
 id-x2Setup														ProcedureCode ::= 6
 id-reset														ProcedureCode ::= 7
 id-eNBConfigurationUpdate										ProcedureCode ::= 8
-id-resourceStatusUpdateInitiation								ProcedureCode ::= 9
+id-resourceStatusReportingInitiation							ProcedureCode ::= 9
 id-resourceStatusReporting										ProcedureCode ::= 10
-
+id-privateMessage												ProcedureCode ::= 11
 
 
 
@@ -48,20 +48,21 @@ id-resourceStatusReporting										ProcedureCode ::= 10
 --
 -- **************************************************************
 
-maxEARFCN									INTEGER ::= 32767	-- FFS Value to be checked
-maxInterfaces								INTEGER ::= 16		-- FFS Value to be checked
+maxEARFCN									INTEGER ::= 65535	
+maxInterfaces								INTEGER ::= 16		
 maxCellineNB								INTEGER ::= 256		
-maxnoofCells								INTEGER ::= 16		-- FFS Value to be checked
 maxnoofBearers								INTEGER ::= 256		
-maxNrOfErrors								INTEGER ::= 256		-- FFS Value to be checked
+maxNrOfErrors								INTEGER ::= 256		
 maxnoofPDCP-SN								INTEGER ::= 16		-- FFS Value to be checked
 maxnoofEPLMNs								INTEGER ::= 15		
 maxnoofEPLMNsPlusOne						INTEGER ::= 16		
 maxnoofForbLACs								INTEGER ::= 4096		
 maxnoofForbTACs							    INTEGER ::= 4096	
 maxnoofBPLMNs								INTEGER ::= 6
-maxnoofPRBs									INTEGER ::= 110		-- FFS Value to be checked
+maxnoofNeighbours							INTEGER ::= 512
+maxnoofPRBs									INTEGER ::= 110		
 maxPools									INTEGER ::= 16		-- FFS Value to be checked
+maxnoofCells								INTEGER ::= 16
 
 
 
@@ -72,15 +73,14 @@ maxPools									INTEGER ::= 16		-- FFS Value to be checked
 --
 -- **************************************************************
 
-id-Bearers-Admitted-Item													ProtocolIE-ID ::= 0
-id-Bearers-Admitted-List													ProtocolIE-ID ::= 1
-id-Bearers-NotAdmitted-Item													ProtocolIE-ID ::= 2
-id-Bearers-NotAdmitted-List													ProtocolIE-ID ::= 3
-id-Bearers-ToBeSetup-Item													ProtocolIE-ID ::= 4
+id-E-RABs-Admitted-Item														ProtocolIE-ID ::= 0
+id-E-RABs-Admitted-List														ProtocolIE-ID ::= 1
+id-E-RAB-Item																ProtocolIE-ID ::= 2
+id-E-RABs-NotAdmitted-List													ProtocolIE-ID ::= 3
+id-E-RABs-ToBeSetup-Item													ProtocolIE-ID ::= 4
 id-Cause																	ProtocolIE-ID ::= 5
 id-CellInformation															ProtocolIE-ID ::= 6
 id-CellInformation-Item														ProtocolIE-ID ::= 7
-id-InterfacesToTrace-Item													ProtocolIE-ID ::= 8
 id-New-eNB-UE-X2AP-ID														ProtocolIE-ID ::= 9
 id-Old-eNB-UE-X2AP-ID														ProtocolIE-ID ::= 10
 id-TargetCell-ID															ProtocolIE-ID ::= 11
@@ -90,8 +90,8 @@ id-UE-ContextInformation													ProtocolIE-ID ::= 14
 id-UE-HistoryInformation													ProtocolIE-ID ::= 15
 id-UE-X2AP-ID																ProtocolIE-ID ::= 16
 id-CriticalityDiagnostics													ProtocolIE-ID ::= 17
-id-Bearers-SubjectToStatusTransfer-List										ProtocolIE-ID ::= 18
-id-Bearers-SubjectToStatusTransfer-Item										ProtocolIE-ID ::= 19
+id-E-RABs-SubjectToStatusTransfer-List										ProtocolIE-ID ::= 18
+id-E-RABs-SubjectToStatusTransfer-Item										ProtocolIE-ID ::= 19
 id-ServedCells																ProtocolIE-ID ::= 20
 id-GlobalENB-ID																ProtocolIE-ID ::= 21
 id-TimeToWait																ProtocolIE-ID ::= 22
@@ -106,8 +106,16 @@ id-ReportingPeriodicity														ProtocolIE-ID ::= 30
 id-CellToReport-Item														ProtocolIE-ID ::= 31
 id-CellMeasurementResult													ProtocolIE-ID ::= 32
 id-CellMeasurementResult-Item												ProtocolIE-ID ::= 33
-id-GUGroupIDListToAdd														ProtocolIE-ID ::= 34
-id-GUGroupIDListToDelete													ProtocolIE-ID ::= 35
+id-GUGroupIDToAddList														ProtocolIE-ID ::= 34
+id-GUGroupIDToDeleteList													ProtocolIE-ID ::= 35
+id-SRVCCOperationPossible													ProtocolIE-ID ::= 36
+id-Measurement-ID															ProtocolIE-ID ::= 37
+id-ReportCharacteristics													ProtocolIE-ID ::= 38
+id-ENB1-Measurement-ID														ProtocolIE-ID ::= 39
+id-ENB2-Measurement-ID														ProtocolIE-ID ::= 40
+id-Number-of-Antennaports													ProtocolIE-ID ::= 41
+
 
 
 END
+
diff --git a/asn1/x2ap/X2AP-Containers.asn b/asn1/x2ap/X2AP-Containers.asn
index e6b6661a9b..8d5f9f8a9b 100644
--- a/asn1/x2ap/X2AP-Containers.asn
+++ b/asn1/x2ap/X2AP-Containers.asn
@@ -1,12 +1,11 @@
 -- $Id$
--- 3GPP TS 36.423 V8.3.0 (2008-09)
+-- 3GPP TS 36.423 V8.6.0 (2009-06)
 -- 9.3.8	Container Definitions
 -- **************************************************************
 --
 -- Container definitions
 --
 -- **************************************************************
-
 X2AP-Containers {
 itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) 
 eps-Access (21) modules (3) x2ap (2) version1 (1) x2ap-Containers (5)  }
@@ -197,3 +196,4 @@ PrivateIE-Field {X2AP-PRIVATE-IES : IEsSetParam} ::= SEQUENCE {
 END
 
 
+
diff --git a/asn1/x2ap/X2AP-IEs.asn b/asn1/x2ap/X2AP-IEs.asn
index e03bfe1338..7a126f3f06 100644
--- a/asn1/x2ap/X2AP-IEs.asn
+++ b/asn1/x2ap/X2AP-IEs.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.423 V8.3.0 (2008-09
+-- 3GPP TS 36.423 V8.6.0 (2009-06)
 -- 9.3.5	Information Element Definitions
 -- **************************************************************
 --
@@ -16,19 +16,22 @@ DEFINITIONS AUTOMATIC TAGS ::=
 BEGIN
 
 IMPORTS
-	id-InterfacesToTrace-Item,
+	
+	id-E-RAB-Item,
+	id-Number-of-Antennaports,
+
 
-	maxCellineNB,
+	maxnoofBearers,	maxCellineNB,
 	maxEARFCN,
 	maxInterfaces,
 	
-	maxnoofCells,
 	maxnoofBPLMNs,
+	maxnoofCells,
 	maxnoofEPLMNs,
 	maxnoofEPLMNsPlusOne,
 	maxnoofForbLACs,
 	maxnoofForbTACs,
-	
+	maxnoofNeighbours,
 	maxnoofPRBs,
 	maxNrOfErrors,
 	maxPools
@@ -50,13 +53,33 @@ FROM X2AP-Containers;
 
 -- A
 
+AS-SecurityInformation ::= SEQUENCE {
+	key-eNodeB-star		Key-eNodeB-Star,
+	nextHopChainingCount			NextHopChainingCount,
+	iE-Extensions						ProtocolExtensionContainer { { AS-SecurityInformation-ExtIEs} } OPTIONAL,
+	...
+}
+
+AS-SecurityInformation-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
-AllocationAndRetentionPriority ::= INTEGER (0..15)
+
+AllocationAndRetentionPriority ::= SEQUENCE {
+	priorityLevel				PriorityLevel,
+	pre-emptionCapability		Pre-emptionCapability,
+	pre-emptionVulnerability	Pre-emptionVulnerability,
+	iE-Extensions				ProtocolExtensionContainer { {AllocationAndRetentionPriority-ExtIEs} } OPTIONAL,
+	...
+}
+
+AllocationAndRetentionPriority-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
 
 -- B
 
-Bearer-ID ::= INTEGER (0..15, ...)  
 
 BitRate ::= INTEGER (0..10000000000)
 BroadcastPLMNs-Item ::= SEQUENCE (SIZE(1..maxnoofBPLMNs)) OF PLMN-Identity
@@ -108,6 +131,12 @@ CauseRadioNetwork ::= ENUMERATED {
 	no-radio-resources-available-in-target-cell,
 	invalid-MME-GroupID,
 	unknown-MME-Code,
+	encryption-and-or-integrity-protection-algorithms-not-supported,
+	reportCharacteristicsEmpty,
+	noReportPeriodicity,
+	existingMeasurementID,
+	unknown-eNB-Measurement-ID,
+	measurement-temporarily-not-available,
 	unspecified,
 	...
 
@@ -119,25 +148,19 @@ CauseTransport ::= ENUMERATED {
 	...
 }
 
-CellType ::= ENUMERATED{ 
-	macro, 
-	micro, 
-	pico, 
-	femto,
-	...
-}
+Cell-Size ::= ENUMERATED {verysmall, small, medium, large, ... }
 
 
-Cell-Transmission-Bandwidth ::= ENUMERATED {
-		bw6,
-	 	bw15,
-		bw25,
-	 	bw50,
-		bw75,
-		bw100,
-		...
+
+CellType ::= SEQUENCE {
+	cell-Size						Cell-Size,
+	iE-Extensions					ProtocolExtensionContainer { { CellType-ExtIEs}}	OPTIONAL,
+	...
 }
 
+CellType-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
 
 COUNTvalue ::= SEQUENCE {
@@ -157,7 +180,7 @@ CriticalityDiagnostics ::= SEQUENCE {
 	triggeringMessage				TriggeringMessage				OPTIONAL,
 	procedureCriticality			Criticality						OPTIONAL,
 	iEsCriticalityDiagnostics		CriticalityDiagnostics-IE-List	OPTIONAL,
-	iE-Extensions					ProtocolExtensionContainer { {CriticalityDiagnostics-ExtIEs} } OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { {CriticalityDiagnostics-ExtIEs} }	OPTIONAL,
 	...
 }
 
@@ -179,6 +202,17 @@ CriticalityDiagnostics-IE-List-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+CyclicPrefixDL ::= ENUMERATED { 
+	normal,
+	extended,
+	...
+}
+
+CyclicPrefixUL ::= ENUMERATED { 
+	normal,
+	extended,
+	...
+}
 
 
 -- D
@@ -193,6 +227,37 @@ DL-Forwarding ::= ENUMERATED {
 
 EARFCN ::= INTEGER (0..maxEARFCN)
 
+FDD-Info ::= SEQUENCE {
+	uL-EARFCN						EARFCN,
+	dL-EARFCN						EARFCN,
+	uL-Transmission-Bandwidth		Transmission-Bandwidth,
+	dL-Transmission-Bandwidth		Transmission-Bandwidth,
+	iE-Extensions				ProtocolExtensionContainer { {FDD-Info-ExtIEs} } OPTIONAL,
+	...
+}
+
+FDD-Info-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+TDD-Info ::= SEQUENCE {
+	eARFCN							EARFCN,
+	transmission-Bandwidth			Transmission-Bandwidth,
+	subframeAssignment				SubframeAssignment,
+	specialSubframe-Info				SpecialSubframe-Info,
+	iE-Extensions				ProtocolExtensionContainer { {TDD-Info-ExtIEs} } OPTIONAL,
+	...
+}
+TDD-Info-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+EUTRA-Mode-Info ::= CHOICE {
+	fDD		FDD-Info,
+	tDD		TDD-Info,
+	...
+}
+
 ECGI ::= SEQUENCE {
 	pLMN-Identity				PLMN-Identity,
 	eUTRANcellIdentifier		EUTRANCellIdentifier,
@@ -210,14 +275,52 @@ ENB-ID ::= CHOICE {
 	...
 }
 
+EncryptionAlgorithms ::= BIT STRING (SIZE (16, ...))
+
 EPLMNs ::= SEQUENCE (SIZE(1..maxnoofEPLMNs)) OF PLMN-Identity
 
+E-RAB-ID ::= INTEGER (0..15, ...)  
+
+E-RAB-Level-QoS-Parameters ::= SEQUENCE {
+	qCI								QCI,
+	allocationAndRetentionPriority	AllocationAndRetentionPriority,
+	gbrQosInformation				GBR-QosInformation													OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { { E-RAB-Level-QoS-Parameters-ExtIEs} }	OPTIONAL,
+	...
+}
+
+E-RAB-Level-QoS-Parameters-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+E-RAB-List ::= SEQUENCE (SIZE(1.. maxnoofBearers)) OF ProtocolIE-Single-Container { {E-RAB-ItemIEs} }
+
+E-RAB-ItemIEs 	X2AP-PROTOCOL-IES ::= {
+	{ ID id-E-RAB-Item	 CRITICALITY ignore 	TYPE E-RAB-Item 	PRESENCE mandatory },
+	...
+}
+
+E-RAB-Item ::= SEQUENCE {
+	e-RAB-ID				E-RAB-ID,
+	cause						Cause,
+	iE-Extensions				ProtocolExtensionContainer { {E-RAB-Item-ExtIEs} } OPTIONAL,
+	...
+}
+
+E-RAB-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+EUTRANCellIdentifier ::= BIT STRING (SIZE (28))
+
+EUTRANTraceID		::= OCTET STRING (SIZE (8))
+
+
 EventType ::= ENUMERATED{
 	change-of-serving-cell,
 	...
 }
 
-EUTRANCellIdentifier ::= BIT STRING (SIZE (28))
 
 -- F
 
@@ -225,6 +328,7 @@ ForbiddenInterRATs ::= ENUMERATED {
 	all,
 	geran,
 	utran,
+	cdma2000,
 	...
 }
 
@@ -232,7 +336,13 @@ ForbiddenTAs ::= SEQUENCE (SIZE(1.. maxnoofEPLMNsPlusOne)) OF ForbiddenTAs-Item
 
 ForbiddenTAs-Item ::= SEQUENCE {
 	pLMN-Identity		PLMN-Identity,
-	forbiddenTACs		ForbiddenTACs
+	forbiddenTACs		ForbiddenTACs,
+	iE-Extensions		ProtocolExtensionContainer { {ForbiddenTAs-Item-ExtIEs} } OPTIONAL,
+	...
+}
+
+ForbiddenTAs-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
 }
 
 ForbiddenTACs ::= SEQUENCE (SIZE(1..maxnoofForbTACs)) OF TAC
@@ -241,7 +351,13 @@ ForbiddenLAs ::= SEQUENCE (SIZE(1..maxnoofEPLMNsPlusOne)) OF ForbiddenLAs-Item
 
 ForbiddenLAs-Item ::= SEQUENCE {	
 	pLMN-Identity		PLMN-Identity,
-	forbiddenLACs		ForbiddenLACs
+	forbiddenLACs		ForbiddenLACs,
+	iE-Extensions		ProtocolExtensionContainer { {ForbiddenLAs-Item-ExtIEs} } OPTIONAL,
+	...
+}
+
+ForbiddenLAs-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
 }
 
 ForbiddenLACs ::= SEQUENCE (SIZE(1..maxnoofForbLACs)) OF LAC
@@ -251,11 +367,11 @@ ForbiddenLACs ::= SEQUENCE (SIZE(1..maxnoofForbLACs)) OF LAC
 -- G
 
 GBR-QosInformation ::= SEQUENCE {
-	sAE-Bearer-MaximumBitrateDL			BitRate,
-	sAE-Bearer-MaximumBitrateUL			BitRate,
-	sAE-Bearer-GuaranteedBitrateDL		BitRate,
-	sAE-Bearer-GuaranteedBitrateUL		BitRate,
-	iE-Extensions						ProtocolExtensionContainer { { GBR-QosInformation-ExtIEs} } OPTIONAL,
+	e-RAB-MaximumBitrateDL			BitRate,
+	e-RAB-MaximumBitrateUL			BitRate,
+	e-RAB-GuaranteedBitrateDL		BitRate,
+	e-RAB-GuaranteedBitrateUL		BitRate,
+	iE-Extensions					ProtocolExtensionContainer { { GBR-QosInformation-ExtIEs} } OPTIONAL,
 	...
 }
 
@@ -322,8 +438,8 @@ HandoverRestrictionList ::= SEQUENCE {
 	equivalentPLMNs				EPLMNs					OPTIONAL,
 	forbiddenTAs				ForbiddenTAs			OPTIONAL,
 	forbiddenLAs				ForbiddenLAs			OPTIONAL,
-	forbiddenInterRATs			ForbiddenInterRATs		OPTIONAL, 
-	iE-Extensions				ProtocolExtensionContainer { {HandoverRestrictionList-ExtIEs} } OPTIONAL,
+	forbiddenInterRATs			ForbiddenInterRATs		OPTIONAL,
+	iE-Extensions				ProtocolExtensionContainer { {HandoverRestrictionList-ExtIEs} }	OPTIONAL,
 	...
 }
 
@@ -333,48 +449,71 @@ HandoverRestrictionList-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 
 HFN ::= INTEGER (0..1048575)
 
-
-
--- I
-
-
-InterfacesToTrace ::= SEQUENCE (SIZE(1..maxInterfaces)) OF ProtocolIE-Single-Container {{InterfacesToTrace-ItemIEs} }
-
-InterfacesToTrace-ItemIEs X2AP-PROTOCOL-IES ::= {
-	{ ID id-InterfacesToTrace-Item	CRITICALITY ignore	TYPE InterfacesToTrace-Item 	PRESENCE mandatory	}
-}
-
-InterfacesToTrace-Item ::= SEQUENCE {
-	traceInterface					TraceInterface,
-	traceDepth						TraceDepth,
-	iE-Extensions					ProtocolExtensionContainer { {InterfacesToTrace-Item-ExtIEs} } OPTIONAL,
+HWLoadIndicator ::= SEQUENCE {
+	dLHWLoadIndicator			LoadIndicator,
+	uLHWLoadIndicator			LoadIndicator,
+	iE-Extensions				ProtocolExtensionContainer { { HWLoadIndicator-ExtIEs} } OPTIONAL,
 	...
 }
 
-InterfacesToTrace-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+HWLoadIndicator-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
 
+-- I
+
+IntegrityProtectionAlgorithms ::= BIT STRING (SIZE (16, ...))
+
+InterfacesToTrace ::= BIT STRING (SIZE (8)) 
 -- J
 -- K
+
+
+Key-eNodeB-Star  ::= BIT STRING (SIZE(256))
+
 -- L
 
 
 LAC					::= OCTET STRING (SIZE (2)) --(EXCEPT ('0000'H|'FFFE'H))
 
-LastVisitedCell-Item ::= SEQUENCE {
+LastVisitedCell-Item ::= CHOICE {
+	e-UTRAN-Cell					LastVisitedEUTRANCellInformation,
+	uTRAN-Cell						LastVisitedUTRANCellInformation,
+	gERAN-Cell						LastVisitedGERANCellInformation,
+	...
+}
+
+LastVisitedEUTRANCellInformation ::= SEQUENCE {
 	global-Cell-ID					ECGI,
 	cellType						CellType,
-	time-UE-StayedInCell			Time-UE-StayedInCell	OPTIONAL,
-	iE-Extensions					ProtocolExtensionContainer { {LastVisitedCell-Item-ExtIEs} } OPTIONAL,
+	time-UE-StayedInCell			Time-UE-StayedInCell,
+	iE-Extensions					ProtocolExtensionContainer { { LastVisitedEUTRANCellInformation-ExtIEs} } OPTIONAL,
 	...
 }
 
-LastVisitedCell-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+LastVisitedEUTRANCellInformation-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+LastVisitedUTRANCellInformation	::= OCTET STRING
+
+LastVisitedGERANCellInformation ::= CHOICE {
+	undefined						NULL,
+	...
+}
+
+
+LoadIndicator ::= ENUMERATED {
+	lowLoad,
+	mediumLoad, 
+	highLoad,
+	overLoad,
+	...
+}
+
+
+
 LocationReportingInformation ::= SEQUENCE {
 	eventType		EventType,
 	reportArea		ReportArea,
@@ -393,22 +532,56 @@ MME-Group-ID	::= OCTET STRING (SIZE (2))
 
 MME-Code		::= OCTET STRING (SIZE (1))
 
+Measurement-ID	::= INTEGER (1..4095, ...)
+
 -- N
 
+Neighbour-Information ::= SEQUENCE (SIZE (0..maxnoofNeighbours)) OF SEQUENCE {
+	eCGI						ECGI,
+	pCI					 	PCI,
+	eARFCN						EARFCN,
+	iE-Extensions		 ProtocolExtensionContainer { {Neighbour-Information-ExtIEs} } OPTIONAL,
+	...
+}
+
+Neighbour-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+NextHopChainingCount ::= INTEGER (0..7)
+
+Number-of-Antennaports ::= ENUMERATED {
+		an1,
+	 	an2,
+		an4,
+		...
+}
 
 -- O
 -- P
 
 PDCP-SN ::= INTEGER (0..4095)  
 
-PhyCID ::= INTEGER (1..504, ...)
+PCI ::= INTEGER (0..503, ...)
 
 
 PLMN-Identity ::= OCTET STRING (SIZE(3))
 
+Pre-emptionCapability ::= ENUMERATED {
+	shall-not-trigger-pre-emption,
+	may-trigger-pre-emption
+}
+
+Pre-emptionVulnerability ::= ENUMERATED {
+	not-pre-emptable,
+	pre-emptable
+}
+
+PriorityLevel				::= INTEGER { spare (0), highest (1), lowest (14), no-priority (15) } (0..15)
+
 -- Q
 
-QCI ::= INTEGER (1..256)
+QCI ::= INTEGER (0..255)
 
 -- R
 
@@ -441,6 +614,8 @@ ReportArea ::= ENUMERATED{
 	...
 }
 
+ReportCharacteristics	::= BIT STRING (SIZE (32))
+
 RNTP-Threshold ::= ENUMERATED {
 	minusInfinity,
 	minusEleven,
@@ -463,45 +638,116 @@ RNTP-Threshold ::= ENUMERATED {
 
 RRC-Context ::= OCTET STRING
 
-ResourceStatus			::= INTEGER
 
+RadioResourceStatus	::= SEQUENCE {
+	dL-GBR-PRB-usage							DL-GBR-PRB-usage,
+	uL-GBR-PRB-usage							UL-GBR-PRB-usage,
+	dL-non-GBR-PRB-usage						DL-non-GBR-PRB-usage,
+	uL-non-GBR-PRB-usage						UL-non-GBR-PRB-usage,
+	dL-Total-PRB-usage							DL-Total-PRB-usage,
+	uL-Total-PRB-usage							UL-Total-PRB-usage,
+	iE-Extensions								ProtocolExtensionContainer { {RadioResourceStatus-ExtIEs} } OPTIONAL,
+	...
+}
 
--- S
+RadioResourceStatus-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
+DL-GBR-PRB-usage::= INTEGER (0..100)
 
-SAE-BearerLevel-QoS-Parameters ::= SEQUENCE {
-	qCI				QCI,
-	allocationAndRetentionPriority	AllocationAndRetentionPriority,
-	
-	gbrQosInformation				GBR-QosInformation			OPTIONAL,
-	iE-Extensions					ProtocolExtensionContainer { { SAE-BearerLevel-QoS-Parameters-ExtIEs} } OPTIONAL,
+UL-GBR-PRB-usage::= INTEGER (0..100)
+
+DL-non-GBR-PRB-usage::= INTEGER (0..100)
+
+UL-non-GBR-PRB-usage::= INTEGER (0..100)
+
+DL-Total-PRB-usage::= INTEGER (0..100)
+
+UL-Total-PRB-usage::= INTEGER (0..100)
+
+
+-- S
+
+S1TNLLoadIndicator ::= SEQUENCE {
+	dLS1TNLLoadIndicator			LoadIndicator,
+	uLS1TNLLoadIndicator			LoadIndicator,
+	iE-Extensions					ProtocolExtensionContainer { { S1TNLLoadIndicator-ExtIEs} } OPTIONAL,
 	...
 }
 
-SAE-BearerLevel-QoS-Parameters-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+S1TNLLoadIndicator-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
 
 
 
+ServedCells ::= SEQUENCE (SIZE (1.. maxCellineNB)) OF SEQUENCE {
+	servedCellInfo					ServedCell-Information,
+	neighbour-Info					Neighbour-Information			OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { {ServedCell-ExtIEs} } OPTIONAL,
+	...
+}
 
-ServedCells		::= SEQUENCE (SIZE (1..maxCellineNB)) OF ServedCell-Information
-
+ServedCell-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
 ServedCell-Information ::= SEQUENCE {
-	phyCID				PhyCID,
+	pCI					PCI,
 	cellId				ECGI,
 	tAC					TAC,
 	broadcastPLMNs		BroadcastPLMNs-Item,
-	uL-EARFCN			EARFCN,
-	dL-EARFCN			EARFCN,
-	cell-Transmission-Bandwidth		Cell-Transmission-Bandwidth,
+	eUTRA-Mode-Info		EUTRA-Mode-Info,
 	iE-Extensions		ProtocolExtensionContainer { {ServedCell-Information-ExtIEs} } OPTIONAL,
 	...
 }
 
 ServedCell-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	{ ID id-Number-of-Antennaports			CRITICALITY ignore	EXTENSION Number-of-Antennaports				PRESENCE optional },
+	...
+}
+
+SRVCCOperationPossible ::= ENUMERATED {
+	possible,
+	...
+}
+
+SubframeAssignment ::= ENUMERATED { 
+	sa0,
+	sa1, 
+	sa2,
+	sa3,
+	sa4,
+	sa5,
+	sa6,
+	...
+}
+
+SpecialSubframe-Info ::=    	SEQUENCE {
+	specialSubframePatterns		SpecialSubframePatterns,
+	cyclicPrefixDL				CyclicPrefixDL,
+	cyclicPrefixUL				CyclicPrefixUL,
+	iE-Extensions				ProtocolExtensionContainer { { SpecialSubframe-Info-ExtIEs} } OPTIONAL,
+	...
+}
+
+SpecialSubframe-Info-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
+SpecialSubframePatterns ::= ENUMERATED { 
+	ssp0,
+	ssp1, 
+	ssp2,
+	ssp3,
+	ssp4,
+	ssp5,
+	ssp6,
+	ssp7,
+	ssp8,
 	...
 }
 
@@ -510,18 +756,29 @@ SubscriberProfileIDforRFP ::= INTEGER (1..256)
 
 -- T
 
-TAC ::= OCTET STRING 	-- FFS
+TAC ::= OCTET STRING (SIZE (2)) 
 
 TargeteNBtoSource-eNBTransparentContainer	::= OCTET STRING
 
-Time-UE-StayedInCell ::= INTEGER
 
-TimeToWait ::= OCTET STRING
+TimeToWait ::= ENUMERATED {
+	v1s, 
+	v2s, 
+	v5s, 
+	v10s, 
+	v20s, 
+	v60s, 
+	...
+}
+
+Time-UE-StayedInCell ::= INTEGER (0..4095)
 
 
 TraceActivation ::= SEQUENCE {
-	traceReference					TraceReference,
+	eUTRANTraceID					EUTRANTraceID,
 	interfacesToTrace				InterfacesToTrace,
+traceDepth						TraceDepth,
+traceCollectionEntityIPAddress	TraceCollectionEntityIPAddress,
 	iE-Extensions					ProtocolExtensionContainer { {TraceActivation-ExtIEs} } OPTIONAL,
 	...
 }
@@ -530,28 +787,31 @@ TraceActivation-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-
+TraceCollectionEntityIPAddress ::= BIT STRING (SIZE(1..160, ...))
 
 TraceDepth 		::= ENUMERATED { 
 	minimum,
 	medium,
 	maximum,
-	vendorMinimum,
-	vendorMedium,
-	vendorMaximum,
+	minimumWithoutVendorSpecificExtension,
+	mediumWithoutVendorSpecificExtension,
+	maximumWithoutVendorSpecificExtension,
 	...
 }
 
-TraceInterface		::= ENUMERATED { 
-	s1,
-	x2, 
-	uu,
-	...
-}
 
-TraceReference					::= OCTET STRING (SIZE (8))
 
 
+Transmission-Bandwidth ::= ENUMERATED {
+		bw6,
+	 	bw15,
+		bw25,
+	 	bw50,
+		bw75,
+		bw100,
+		...
+}
+
 TransportLayerAddress			::= BIT STRING (SIZE(1..160, ...))
 
 TypeOfError ::= ENUMERATED {
@@ -581,6 +841,17 @@ UEAggregate-MaximumBitrate-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+UESecurityCapabilities ::= SEQUENCE {
+	encryptionAlgorithms				EncryptionAlgorithms,
+	integrityProtectionAlgorithms		IntegrityProtectionAlgorithms,
+	iE-Extensions						ProtocolExtensionContainer { { UESecurityCapabilities-ExtIEs} }		OPTIONAL,
+...
+}
+
+UESecurityCapabilities-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 UL-InterferenceOverloadIndication ::= SEQUENCE (SIZE(1..maxnoofPRBs)) OF UL-InterferenceOverloadIndication-Item
 
 UL-InterferenceOverloadIndication-Item ::= ENUMERATED {
@@ -593,8 +864,8 @@ UL-InterferenceOverloadIndication-Item ::= ENUMERATED {
 UL-HighInterferenceIndicationInfo ::= SEQUENCE (SIZE(1..maxCellineNB)) OF UL-HighInterferenceIndicationInfo-Item
 
 UL-HighInterferenceIndicationInfo-Item ::= SEQUENCE {
-	ul-interferenceindication		UL-HighInterferenceIndication,
 	target-Cell-ID					ECGI,
+	ul-interferenceindication		UL-HighInterferenceIndication,
 	iE-Extensions					ProtocolExtensionContainer { { UL-HighInterferenceIndicationInfo-Item-ExtIEs} } OPTIONAL,
 	...
 }
@@ -614,3 +885,4 @@ UL-HighInterferenceIndication ::= BIT STRING (SIZE(1..110, ...))
 -- Z
 
 END
+
diff --git a/asn1/x2ap/X2AP-PDU-Contents.asn b/asn1/x2ap/X2AP-PDU-Contents.asn
index 7fde73aaf7..bdb28cff7b 100644
--- a/asn1/x2ap/X2AP-PDU-Contents.asn
+++ b/asn1/x2ap/X2AP-PDU-Contents.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.423 V8.3.0 (2008-09
+-- 3GPP TS 36.423 V8.6.0 (2009-06)
 -- 9.3.4	PDU Definitions
 -- **************************************************************
 --
@@ -23,47 +23,53 @@ BEGIN
 
 IMPORTS
 	
-	Bearer-ID,
+	AS-SecurityInformation,	
+	
 	Cause,
 	
 	COUNTvalue,
 	CriticalityDiagnostics,
 	DL-Forwarding,
 	ECGI,
+	E-RAB-ID,
+	E-RAB-Level-QoS-Parameters,
+	E-RAB-List,
+	EUTRANTraceID,
 	GlobalENB-ID,
 	GTPtunnelEndpoint,
 	GUGroupIDList,
 	GUMMEI,
 	HandoverRestrictionList,
-	
-	
 	LocationReportingInformation,
+	Neighbour-Information,
 	PDCP-SN,
 	PLMN-Identity,
-	
 	ReceiveStatusofULPDCPSDUs,
 	Registration-Request,
 	RelativeNarrowbandTxPower,
-	ResourceStatus,
+	RadioResourceStatus,
 	RRC-Context,
-	SAE-BearerLevel-QoS-Parameters,
 	ServedCell-Information,
 	ServedCells,
+	SRVCCOperationPossible,
 	SubscriberProfileIDforRFP,
 	TargeteNBtoSource-eNBTransparentContainer,
 	TimeToWait,
 	TraceActivation,
-	
 	TraceDepth,
-	TraceReference,
+	
 	TransportLayerAddress,
 	UEAggregateMaximumBitRate,
 	UE-HistoryInformation,
 	UE-S1AP-ID,
+	UESecurityCapabilities,
 	UE-X2AP-ID,
-	
 	UL-HighInterferenceIndicationInfo,
-	UL-InterferenceOverloadIndication
+	UL-InterferenceOverloadIndication,
+	HWLoadIndicator,
+	S1TNLLoadIndicator,
+	Measurement-ID,
+	ReportCharacteristics
 	
 	
 	
@@ -75,7 +81,6 @@ FROM X2AP-IEs
 	ProtocolIE-ContainerList{},
 	ProtocolIE-ContainerPair{},
 	ProtocolIE-ContainerPairList{},
-	
 	ProtocolIE-Single-Container{},
 	X2AP-PRIVATE-IES,
 	X2AP-PROTOCOL-EXTENSION,
@@ -83,27 +88,27 @@ FROM X2AP-IEs
 	X2AP-PROTOCOL-IES-PAIR
 FROM X2AP-Containers
 
-	id-Bearers-Admitted-Item,
-	id-Bearers-Admitted-List,
-	id-Bearers-NotAdmitted-Item,
-	id-Bearers-NotAdmitted-List,
-	id-Bearers-SubjectToStatusTransfer-List,
-	id-Bearers-SubjectToStatusTransfer-Item,
-	id-Bearers-ToBeSetup-Item,	id-Cause,
+	
+	id-Cause,
 	id-CellInformation,
 	id-CellInformation-Item,	
 	id-CellMeasurementResult,
 	id-CellMeasurementResult-Item,
 	id-CellToReport,
 	id-CellToReport-Item,
-	
 	id-CriticalityDiagnostics,
+	id-E-RABs-Admitted-Item,
+	id-E-RABs-Admitted-List,
+	id-E-RABs-NotAdmitted-List,
+	id-E-RABs-SubjectToStatusTransfer-List,
+	id-E-RABs-SubjectToStatusTransfer-Item,
+	id-E-RABs-ToBeSetup-Item,
 	id-GlobalENB-ID,
 	id-GUGroupIDList,
-	id-GUGroupIDListToAdd,
-	id-GUGroupIDListToDelete,
+	id-GUGroupIDToAddList,
+	id-GUGroupIDToDeleteList,
 	id-GUMMEI-ID,
-			id-New-eNB-UE-X2AP-ID,
+	id-New-eNB-UE-X2AP-ID,
 	id-Old-eNB-UE-X2AP-ID,
 	id-Registration-Request,
 	id-ReportingPeriodicity,
@@ -111,6 +116,7 @@ FROM X2AP-Containers
 	id-ServedCellsToAdd,
 	id-ServedCellsToModify,
 	id-ServedCellsToDelete,
+	id-SRVCCOperationPossible,
 	id-TargetCell-ID,
 	id-TargeteNBtoSource-eNBTransparentContainer,
 	id-TimeToWait,
@@ -118,6 +124,10 @@ FROM X2AP-Containers
 	id-UE-ContextInformation,
 	id-UE-HistoryInformation,
 	id-UE-X2AP-ID,
+	id-Measurement-ID,
+	id-ReportCharacteristics,
+	id-ENB1-Measurement-ID,
+	id-ENB2-Measurement-ID,
 	
 
 
@@ -144,18 +154,21 @@ HandoverRequest-IEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-TargetCell-ID					CRITICALITY reject	TYPE ECGI 						PRESENCE mandatory } |
 	{ ID id-GUMMEI-ID						CRITICALITY reject	TYPE GUMMEI  					PRESENCE mandatory } |
 	{ ID id-UE-ContextInformation			CRITICALITY reject	TYPE UE-ContextInformation 		PRESENCE mandatory } |
-	{ ID id-UE-HistoryInformation			CRITICALITY ignore	TYPE UE-HistoryInformation 		PRESENCE optional } |
-	{ ID id-TraceActivation					CRITICALITY ignore	TYPE TraceActivation 			PRESENCE optional } ,
+	{ ID id-UE-HistoryInformation			CRITICALITY ignore	TYPE UE-HistoryInformation 		PRESENCE mandatory } |
+	{ ID id-TraceActivation					CRITICALITY ignore	TYPE TraceActivation 			PRESENCE optional } |
+	{ ID id-SRVCCOperationPossible			CRITICALITY ignore	TYPE SRVCCOperationPossible		PRESENCE optional },
 	...
 }
 
 UE-ContextInformation ::= SEQUENCE {
 	mME-UE-S1AP-ID						UE-S1AP-ID,
+	uESecurityCapabilities				UESecurityCapabilities,
+	aS-SecurityInformation				AS-SecurityInformation,
 	uEaggregateMaximumBitRate			UEAggregateMaximumBitRate,
 	subscriberProfileIDforRFP			SubscriberProfileIDforRFP		OPTIONAL,
-bearers-ToBeSetup-List				Bearers-ToBeSetup-List,
+	e-RABs-ToBeSetup-List				E-RABs-ToBeSetup-List,
 	rRC-Context							RRC-Context, 
-		handoverRestrictionList				HandoverRestrictionList		OPTIONAL,
+	handoverRestrictionList				HandoverRestrictionList		OPTIONAL,
 	locationReportingInformation		LocationReportingInformation	OPTIONAL,
 	iE-Extensions						ProtocolExtensionContainer { {UE-ContextInformation-ExtIEs} } OPTIONAL,
 	...
@@ -165,23 +178,23 @@ UE-ContextInformation-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-Bearers-ToBeSetup-List ::= SEQUENCE (SIZE(1..maxnoofBearers)) OF ProtocolIE-Single-Container { {Bearers-ToBeSetup-ItemIEs} }
+E-RABs-ToBeSetup-List ::= SEQUENCE (SIZE(1..maxnoofBearers)) OF ProtocolIE-Single-Container { {E-RABs-ToBeSetup-ItemIEs} }
 
-Bearers-ToBeSetup-ItemIEs 	X2AP-PROTOCOL-IES ::= {
-	{ ID id-Bearers-ToBeSetup-Item	 CRITICALITY ignore 	TYPE Bearers-ToBeSetup-Item 	PRESENCE mandatory },
+E-RABs-ToBeSetup-ItemIEs 	X2AP-PROTOCOL-IES ::= {
+	{ ID id-E-RABs-ToBeSetup-Item	 CRITICALITY ignore 	TYPE E-RABs-ToBeSetup-Item 	PRESENCE mandatory },
 	...
 }
 
-Bearers-ToBeSetup-Item ::= SEQUENCE {
-	sAE-Bearer-ID					Bearer-ID,
-	sAE-BearerLevel-QoS-Parameters		SAE-BearerLevel-QoS-Parameters,
+E-RABs-ToBeSetup-Item ::= SEQUENCE {
+	e-RAB-ID					E-RAB-ID,
+	e-RAB-Level-QoS-Parameters		E-RAB-Level-QoS-Parameters,
 	dL-Forwarding					DL-Forwarding													OPTIONAL,
 	uL-GTPtunnelEndpoint			GTPtunnelEndpoint,
-	iE-Extensions					ProtocolExtensionContainer { {Bearers-ToBeSetup-ItemExtIEs} } OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { {E-RABs-ToBeSetup-ItemExtIEs} } OPTIONAL,
 	...
 }
 
-Bearers-ToBeSetup-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+E-RABs-ToBeSetup-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -199,50 +212,33 @@ HandoverRequestAcknowledge ::= SEQUENCE {
 }
 
 HandoverRequestAcknowledge-IEs X2AP-PROTOCOL-IES ::= {
-	{ ID id-Old-eNB-UE-X2AP-ID							CRITICALITY reject	TYPE UE-X2AP-ID													PRESENCE mandatory} |
-	{ ID id-New-eNB-UE-X2AP-ID							CRITICALITY reject	TYPE UE-X2AP-ID													PRESENCE mandatory} |
-	{ ID id-Bearers-Admitted-List						CRITICALITY ignore	TYPE Bearers-Admitted-List									PRESENCE optional	} |
-	{ ID id-Bearers-NotAdmitted-List					CRITICALITY ignore	TYPE Bearers-NotAdmitted-List								PRESENCE optional	} |
-	{ ID id-TargeteNBtoSource-eNBTransparentContainer	CRITICALITY ignore	TYPE TargeteNBtoSource-eNBTransparentContainer		PRESENCE mandatory }|
-	{ ID id-CriticalityDiagnostics						CRITICALITY ignore	TYPE CriticalityDiagnostics									PRESENCE optional },
-
+	{ ID id-Old-eNB-UE-X2AP-ID							CRITICALITY ignore	TYPE UE-X2AP-ID		PRESENCE mandatory} |
+	{ ID id-New-eNB-UE-X2AP-ID							CRITICALITY ignore	TYPE UE-X2AP-ID		PRESENCE mandatory} |
+	{ ID id-E-RABs-Admitted-List						CRITICALITY ignore	TYPE E-RABs-Admitted-List	PRESENCE mandatory} |
+	{ ID id-E-RABs-NotAdmitted-List						CRITICALITY ignore	TYPE E-RAB-List		PRESENCE optional} |
+	{ ID id-TargeteNBtoSource-eNBTransparentContainer	CRITICALITY ignore	TYPE TargeteNBtoSource-eNBTransparentContainer	PRESENCE mandatory }|
+	{ ID id-CriticalityDiagnostics						CRITICALITY ignore	TYPE CriticalityDiagnostics	PRESENCE optional },
 	...
 }
 
-Bearers-Admitted-List 		::= SEQUENCE (SIZE (1..maxnoofBearers)) OF ProtocolIE-Single-Container { {Bearers-Admitted-ItemIEs} }
+E-RABs-Admitted-List 		::= SEQUENCE (SIZE (1..maxnoofBearers)) OF ProtocolIE-Single-Container { {E-RABs-Admitted-ItemIEs} }
 
-Bearers-Admitted-ItemIEs X2AP-PROTOCOL-IES ::= {
-	{ ID id-Bearers-Admitted-Item	CRITICALITY ignore	TYPE Bearers-Admitted-Item 	PRESENCE mandatory	}
+E-RABs-Admitted-ItemIEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-E-RABs-Admitted-Item	CRITICALITY ignore	TYPE E-RABs-Admitted-Item 	PRESENCE mandatory	}
 }
 
-Bearers-Admitted-Item ::= SEQUENCE {
-	bearer-ID						Bearer-ID,
+E-RABs-Admitted-Item ::= SEQUENCE {
+	e-RAB-ID					E-RAB-ID,
 	uL-GTP-TunnelEndpoint			GTPtunnelEndpoint	OPTIONAL,
 	dL-GTP-TunnelEndpoint			GTPtunnelEndpoint	OPTIONAL,
-	iE-Extensions					ProtocolExtensionContainer { {Bearers-Admitted-Item-ExtIEs} } OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { {E-RABs-Admitted-Item-ExtIEs} }	OPTIONAL,
 	...
 }
 
-Bearers-Admitted-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+E-RABs-Admitted-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-Bearers-NotAdmitted-List 		::= SEQUENCE (SIZE (1..maxnoofBearers)) OF ProtocolIE-Single-Container { {Bearers-NotAdmitted-ItemIEs} }
-
-Bearers-NotAdmitted-ItemIEs X2AP-PROTOCOL-IES ::= {
-	{ ID id-Bearers-NotAdmitted-Item	CRITICALITY ignore	TYPE Bearers-NotAdmitted-Item 	PRESENCE mandatory	}
-}
-
-Bearers-NotAdmitted-Item ::= SEQUENCE {
-	bearer-ID						Bearer-ID,
-	cause							Cause,
-	iE-Extensions					ProtocolExtensionContainer { {Bearers-NotAdmitted-Item-ExtIEs} } OPTIONAL,
-	...
-}
-
-Bearers-NotAdmitted-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
-	...
-}
 
 
 -- **************************************************************
@@ -257,9 +253,9 @@ HandoverPreparationFailure ::= SEQUENCE {
 }
 
 HandoverPreparationFailure-IEs X2AP-PROTOCOL-IES ::= {
-	{ ID id-Old-eNB-UE-X2AP-ID			CRITICALITY reject	TYPE UE-X2AP-ID				PRESENCE mandatory} |
+	{ ID id-Old-eNB-UE-X2AP-ID			CRITICALITY ignore	TYPE UE-X2AP-ID				PRESENCE mandatory} |
 	{ ID id-Cause						CRITICALITY ignore	TYPE Cause					PRESENCE mandatory} |
-	{ ID id-CriticalityDiagnostics	    CRITICALITY ignore	TYPE CriticalityDiagnostics	PRESENCE optional },
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics	PRESENCE optional },
 
 	...
 }
@@ -276,29 +272,29 @@ SNStatusTransfer ::= SEQUENCE {
 }
 
 SNStatusTransfer-IEs X2AP-PROTOCOL-IES ::= {
-	{ ID id-Old-eNB-UE-X2AP-ID						CRITICALITY reject	TYPE UE-X2AP-ID											PRESENCE mandatory} |
-	{ ID id-New-eNB-UE-X2AP-ID						CRITICALITY reject	TYPE UE-X2AP-ID											PRESENCE mandatory} |
-	{ ID id-Bearers-SubjectToStatusTransfer-List	CRITICALITY ignore	TYPE Bearers-SubjectToStatusTransfer-List		PRESENCE mandatory} ,
+	{ ID id-Old-eNB-UE-X2AP-ID						CRITICALITY reject	TYPE UE-X2AP-ID						PRESENCE mandatory} |
+	{ ID id-New-eNB-UE-X2AP-ID						CRITICALITY reject	TYPE UE-X2AP-ID						PRESENCE mandatory} |
+	{ ID id-E-RABs-SubjectToStatusTransfer-List	CRITICALITY ignore	TYPE E-RABs-SubjectToStatusTransfer-List	PRESENCE mandatory} ,
 	...
 }
 
-Bearers-SubjectToStatusTransfer-List	::= SEQUENCE (SIZE (1..maxnoofBearers)) OF ProtocolIE-Single-Container { { Bearers-SubjectToStatusTransfer-ItemIEs} }
+E-RABs-SubjectToStatusTransfer-List	::= SEQUENCE (SIZE (1..maxnoofBearers)) OF ProtocolIE-Single-Container { { E-RABs-SubjectToStatusTransfer-ItemIEs} }
 
-Bearers-SubjectToStatusTransfer-ItemIEs X2AP-PROTOCOL-IES ::= {
-	{ ID id-Bearers-SubjectToStatusTransfer-Item	CRITICALITY ignore	TYPE Bearers-SubjectToStatusTransfer-Item 	PRESENCE mandatory	}
+E-RABs-SubjectToStatusTransfer-ItemIEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-E-RABs-SubjectToStatusTransfer-Item	CRITICALITY ignore	TYPE E-RABs-SubjectToStatusTransfer-Item 	PRESENCE mandatory	}
 }
 
-Bearers-SubjectToStatusTransfer-Item ::= SEQUENCE {
-	bearer-ID								Bearer-ID,
+E-RABs-SubjectToStatusTransfer-Item ::= SEQUENCE {
+	e-RAB-ID								E-RAB-ID,
 	
 	receiveStatusofULPDCPSDUs				ReceiveStatusofULPDCPSDUs			OPTIONAL,
 	uL-COUNTvalue					COUNTvalue,
 	dL-COUNTvalue					COUNTvalue,
-	iE-Extensions							ProtocolExtensionContainer { {Bearers-SubjectToStatusTransfer-ItemExtIEs} } OPTIONAL,
+	iE-Extensions							ProtocolExtensionContainer { {E-RABs-SubjectToStatusTransfer-ItemExtIEs} } OPTIONAL,
 	...
 }
 
-Bearers-SubjectToStatusTransfer-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= {
+E-RABs-SubjectToStatusTransfer-ItemExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -337,7 +333,7 @@ HandoverCancel ::= SEQUENCE {
 
 HandoverCancel-IEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-Old-eNB-UE-X2AP-ID			CRITICALITY reject	TYPE UE-X2AP-ID				PRESENCE mandatory} |
-	{ ID id-New-eNB-UE-X2AP-ID			CRITICALITY reject	TYPE UE-X2AP-ID				PRESENCE mandatory} |
+	{ ID id-New-eNB-UE-X2AP-ID			CRITICALITY ignore	TYPE UE-X2AP-ID				PRESENCE optional} |
 	{ ID id-Cause						CRITICALITY ignore	TYPE Cause					PRESENCE mandatory} ,
 	...
 }
@@ -406,8 +402,8 @@ X2SetupRequest ::= SEQUENCE {
 
 X2SetupRequest-IEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-GlobalENB-ID				CRITICALITY reject	TYPE GlobalENB-ID				PRESENCE mandatory} |
-	{ ID id-ServedCells						CRITICALITY reject	TYPE ServedCells						PRESENCE mandatory} |
-	{ ID id-GUGroupIDList					CRITICALITY reject  TYPE GUGroupIDList						PRESENCE optional},
+	{ ID id-ServedCells						CRITICALITY reject	TYPE ServedCells			PRESENCE mandatory} |
+	{ ID id-GUGroupIDList					CRITICALITY reject  TYPE GUGroupIDList			PRESENCE optional},
 ...
 }
 
@@ -425,11 +421,10 @@ X2SetupResponse ::= SEQUENCE {
 }
 
 X2SetupResponse-IEs X2AP-PROTOCOL-IES ::= {
-	{ ID id-GlobalENB-ID				CRITICALITY reject	TYPE GlobalENB-ID				 PRESENCE mandatory} |
-	{ ID id-ServedCells						CRITICALITY reject	TYPE ServedCells				   	PRESENCE mandatory} |
-	{ ID id-GUGroupIDList					CRITICALITY reject  TYPE GUGroupIDList				    	PRESENCE optional}|
-	{ ID id-CriticalityDiagnostics	    	CRITICALITY ignore	TYPE CriticalityDiagnostics				PRESENCE optional },
-
+	{ ID id-GlobalENB-ID					CRITICALITY reject	TYPE GlobalENB-ID			PRESENCE mandatory} |
+	{ ID id-ServedCells						CRITICALITY reject	TYPE ServedCells			PRESENCE mandatory} |
+	{ ID id-GUGroupIDList					CRITICALITY reject  TYPE GUGroupIDList			PRESENCE optional}|
+	{ ID id-CriticalityDiagnostics			CRITICALITY ignore	TYPE CriticalityDiagnostics	PRESENCE optional },
 	...
 }
 
@@ -483,7 +478,7 @@ CellInformation-Item ::= SEQUENCE {
 	ul-InterferenceOverloadIndication		UL-InterferenceOverloadIndication		OPTIONAL,
 	ul-HighInterferenceIndicationInfo		UL-HighInterferenceIndicationInfo		OPTIONAL,
 	relativeNarrowbandTxPower				RelativeNarrowbandTxPower				OPTIONAL,
-	iE-Extensions							ProtocolExtensionContainer { {CellInformation-Item-ExtIEs} } OPTIONAL,
+	iE-Extensions							ProtocolExtensionContainer { {CellInformation-Item-ExtIEs} }	OPTIONAL,
 	...
 }
 
@@ -506,8 +501,8 @@ ENBConfigurationUpdate-IEs X2AP-PROTOCOL-IES ::= {
 	{ ID id-ServedCellsToAdd    	CRITICALITY reject	TYPE ServedCells				PRESENCE optional} |
 	{ ID id-ServedCellsToModify 	CRITICALITY reject	TYPE ServedCellsToModify		PRESENCE optional} |
 	{ ID id-ServedCellsToDelete 	CRITICALITY reject	TYPE Old-ECGIs					PRESENCE optional} |
-	{ ID id-GUGroupIDListToAdd 		CRITICALITY reject	TYPE GUGroupIDList			    PRESENCE optional} |
-	{ ID id-GUGroupIDListToDelete 	CRITICALITY reject	TYPE GUGroupIDList		        PRESENCE optional},
+	{ ID id-GUGroupIDToAddList 		CRITICALITY reject	TYPE GUGroupIDList				PRESENCE optional} |
+	{ ID id-GUGroupIDToDeleteList 	CRITICALITY reject	TYPE GUGroupIDList				PRESENCE optional},
 	...
 }
 
@@ -515,7 +510,8 @@ ServedCellsToModify::= SEQUENCE (SIZE (1..maxCellineNB)) OF ServedCellsToModify-
  
 ServedCellsToModify-Item::= SEQUENCE {
 	old-ecgi						ECGI,
-	served-cells                    ServedCell-Information,
+	servedCellInfo					ServedCell-Information,
+	neighbour-Info					Neighbour-Information			OPTIONAL,
 	iE-Extensions					ProtocolExtensionContainer { { ServedCellsToModify-Item-ExtIEs} } OPTIONAL,
 	...
 }
@@ -575,9 +571,12 @@ ResourceStatusRequest ::= SEQUENCE {
 }
 
 ResourceStatusRequest-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-ENB1-Measurement-ID		CRITICALITY reject	TYPE Measurement-ID					PRESENCE mandatory}|
+	{ ID id-ENB2-Measurement-ID		CRITICALITY ignore	TYPE Measurement-ID					PRESENCE conditional}|-- The IE shall be present if the Registration Request IE is set to “Stop”--
 	{ ID id-Registration-Request	CRITICALITY reject	TYPE Registration-Request			PRESENCE mandatory} |
-	{ ID id-CellToReport			CRITICALITY ignore	TYPE CellToReport-List				PRESENCE optional} |
-	{ ID id-ReportingPeriodicity	CRITICALITY ignore	TYPE ReportingPeriod				PRESENCE optional} ,
+	{ ID id-ReportCharacteristics	CRITICALITY reject	TYPE ReportCharacteristics			PRESENCE optional} |
+	{ ID id-CellToReport			CRITICALITY ignore	TYPE CellToReport-List				PRESENCE mandatory} |
+	{ ID id-ReportingPeriodicity	CRITICALITY ignore	TYPE ReportingPeriodicity			PRESENCE optional} ,
 	...
 }
 
@@ -599,10 +598,14 @@ CellToReport-Item-ExtIEs X2AP-PROTOCOL-EXTENSION ::= {
 }
 
 
-ReportingPeriod ::= ENUMERATED {ffs,...}
--- The Report Period gives the reporting periodicity in number of ffs ms periods.
--- E.g. value ffs means ffs ms 
--- Unit ms, Step ffs ms
+ReportingPeriodicity ::= ENUMERATED {
+	one-thousand-ms,
+	two-thousand-ms,
+	five-thousand-ms,
+	ten-thousand-ms,
+...
+}
+
 
 -- **************************************************************
 --
@@ -616,6 +619,8 @@ ResourceStatusResponse ::= SEQUENCE {
 }
 
 ResourceStatusResponse-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-ENB1-Measurement-ID		CRITICALITY reject	TYPE Measurement-ID					PRESENCE mandatory}|
+	{ ID id-ENB2-Measurement-ID		CRITICALITY reject	TYPE Measurement-ID					PRESENCE mandatory}|
 	{ ID id-CriticalityDiagnostics	CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional },
 	...
 }
@@ -633,7 +638,9 @@ ResourceStatusFailure ::= SEQUENCE {
 }
 
 ResourceStatusFailure-IEs X2AP-PROTOCOL-IES ::= {
-	{ ID id-Cause				CRITICALITY ignore	TYPE Cause			PRESENCE mandatory} |
+	{ ID id-ENB1-Measurement-ID		CRITICALITY reject	TYPE Measurement-ID					PRESENCE mandatory}|
+	{ ID id-ENB2-Measurement-ID		CRITICALITY reject	TYPE Measurement-ID					PRESENCE mandatory}|
+	{ ID id-Cause					CRITICALITY ignore	TYPE Cause							PRESENCE mandatory} |
 	{ ID id-CriticalityDiagnostics	CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional },
 	...
 }
@@ -651,6 +658,8 @@ ResourceStatusUpdate ::= SEQUENCE {
 }
 
 ResourceStatusUpdate-IEs X2AP-PROTOCOL-IES ::= {
+	{ ID id-ENB1-Measurement-ID		CRITICALITY reject	TYPE Measurement-ID					PRESENCE mandatory}|
+	{ ID id-ENB2-Measurement-ID		CRITICALITY reject	TYPE Measurement-ID					PRESENCE mandatory}|
 	{ ID id-CellMeasurementResult	CRITICALITY ignore	TYPE CellMeasurementResult-List		PRESENCE mandatory},
 	...
 }
@@ -663,8 +672,10 @@ CellMeasurementResult-ItemIEs X2AP-PROTOCOL-IES ::= {
 
 CellMeasurementResult-Item ::= SEQUENCE {
 	cell-ID							ECGI,
-	resoureStatus					ResourceStatus			OPTIONAL,
-	iE-Extensions					ProtocolExtensionContainer { {CellMeasurementResult-Item-ExtIEs} } OPTIONAL,
+	hWOverLoadIndicator				HWLoadIndicator		OPTIONAL,
+	s1TNLOverLoadIndicator			S1TNLLoadIndicator	OPTIONAL,
+	radioresourceStatus				RadioResourceStatus	OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { {CellMeasurementResult-Item-ExtIEs} }	OPTIONAL,
 	...
 }
 
@@ -689,3 +700,4 @@ PrivateMessage-IEs X2AP-PRIVATE-IES ::= {
 }
 
 END
+
diff --git a/asn1/x2ap/X2AP-PDU-Descriptions.asn b/asn1/x2ap/X2AP-PDU-Descriptions.asn
index 5a461320c2..f1c122d828 100644
--- a/asn1/x2ap/X2AP-PDU-Descriptions.asn
+++ b/asn1/x2ap/X2AP-PDU-Descriptions.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.423 V8.3.0 (2008-09)
+-- 3GPP TS 36.423 V8.6.0 (2009-06)
 -- 9.3.3	Elementary Procedure Definitions
 -- **************************************************************
 --
@@ -32,11 +32,11 @@ FROM X2AP-CommonDataTypes
 	ENBConfigurationUpdateFailure,
 	ErrorIndication,
 	HandoverCancel,
-	HandoverPreparationFailure,	HandoverRequest,
+	HandoverPreparationFailure,	
+	HandoverRequest,
 	HandoverRequestAcknowledge,
-	
-	
-		LoadInformation,
+	LoadInformation,
+	PrivateMessage,
 	ResetRequest,
 	ResetResponse,
 	ResourceStatusFailure,
@@ -59,10 +59,11 @@ FROM X2AP-PDU-Contents
 	id-handoverPreparation,
 	
 	id-loadIndication,
+	id-privateMessage,
 	id-reset,
 	
 	id-resourceStatusReporting,
-	id-resourceStatusUpdateInitiation,
+	id-resourceStatusReportingInitiation,
 	id-snStatusTransfer,
 	id-uEContextRelease,
 	id-x2Setup
@@ -141,8 +142,8 @@ X2AP-ELEMENTARY-PROCEDURES-CLASS-1 X2AP-ELEMENTARY-PROCEDURE ::= {
 	handoverPreparation										|
 	reset													|
 	x2Setup													|
-	resourceStatusUpdateInitiation							|
-	eNBConfigurationUpdate								    ,
+	resourceStatusReportingInitiation						|
+	eNBConfigurationUpdate									,
 	...
 }
 
@@ -151,8 +152,9 @@ X2AP-ELEMENTARY-PROCEDURES-CLASS-2 X2AP-ELEMENTARY-PROCEDURE ::= {
 	uEContextRelease						|
 	handoverCancel							|
 	errorIndication							|
-	resourceStatusReporting					|	
-	loadIndication							,
+	resourceStatusReporting					|
+	loadIndication							|
+	privateMessage							,
 	...
 
 }
@@ -227,12 +229,12 @@ eNBConfigurationUpdate		X2AP-ELEMENTARY-PROCEDURE ::= {
 	CRITICALITY				reject
 }
 
-resourceStatusUpdateInitiation	X2AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE		ResourceStatusRequest
-	SUCCESSFUL OUTCOME		ResourceStatusResponse
-	UNSUCCESSFUL OUTCOME	ResourceStatusFailure
-	PROCEDURE CODE			id-resourceStatusUpdateInitiation
-	CRITICALITY				reject
+resourceStatusReportingInitiation	X2AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE				ResourceStatusRequest
+	SUCCESSFUL OUTCOME				ResourceStatusResponse
+	UNSUCCESSFUL OUTCOME			ResourceStatusFailure
+	PROCEDURE CODE					id-resourceStatusReportingInitiation
+	CRITICALITY						reject
 }
 
 resourceStatusReporting X2AP-ELEMENTARY-PROCEDURE ::= {
@@ -241,4 +243,11 @@ resourceStatusReporting X2AP-ELEMENTARY-PROCEDURE ::= {
 	CRITICALITY				ignore
 }
 
+privateMessage			X2AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		PrivateMessage
+	PROCEDURE CODE			id-privateMessage
+	CRITICALITY				ignore
+}
+
 END
+
diff --git a/asn1/x2ap/x2ap.cnf b/asn1/x2ap/x2ap.cnf
index 566e9432ab..6e43fffb2e 100644
--- a/asn1/x2ap/x2ap.cnf
+++ b/asn1/x2ap/x2ap.cnf
@@ -10,10 +10,6 @@ ALIGNED
 
 #.OMIT_ASSIGNMENT
 # Get rid of unused code warnings
-PrivateMessage
-PrivateIE-Container
-PrivateIE-Field
-PrivateIE-ID 
 #.END
 
 #.PDU
@@ -28,7 +24,7 @@ ProtocolIE-ID
 #.TYPE_RENAME
 
 ProtocolIE-Field/value     ProtocolIE_Field_value
-#PrivateIE-Field/value      PrivateIE_Field_value
+PrivateIE-Field/value      PrivateIE_Field_value
 InitiatingMessage/value    InitiatingMessage_value
 SuccessfulOutcome/value    SuccessfulOutcome_value
 UnsuccessfulOutcome/value  UnsuccessfulOutcome_value
@@ -36,12 +32,12 @@ UnsuccessfulOutcome/value  UnsuccessfulOutcome_value
 
 #.FIELD_RENAME
 ProtocolExtensionField/id extension_id
-#PrivateIE-Field/id private_id
+PrivateIE-Field/id private_id
 InitiatingMessage/value initiatingMessage_value 
 
 ProtocolIE-Field/value protocolIE_Field_value 
 SuccessfulOutcome/value successfulOutcome_value 
-#PrivateIE-Field/value privateIE_Field_value 
+PrivateIE-Field/value privateIE_Field_value 
 
 #.OMIT_ASSIGNMENT
 Presence
@@ -87,30 +83,29 @@ ProtocolIE-ContainerPairList
 #.ASSIGN_VALUE_TO_TYPE  # X2AP does not have constants assigned to types, they are pure INTEGER
 # ProcedureCode
 
-id-handoverPreparation				ProcedureCode
-id-handoverCancel					ProcedureCode
-id-loadIndication					ProcedureCode
-id-errorIndication					ProcedureCode
-id-snStatusTransfer					ProcedureCode
-id-uEContextRelease					ProcedureCode
-id-x2Setup							ProcedureCode
-id-reset							ProcedureCode
-id-eNBConfigurationUpdate			ProcedureCode
-id-resourceStatusUpdateInitiation	ProcedureCode
-id-resourceStatusReporting			ProcedureCode
-
+id-handoverPreparation					ProcedureCode
+id-handoverCancel						ProcedureCode
+id-loadIndication						ProcedureCode
+id-errorIndication						ProcedureCode
+id-snStatusTransfer						ProcedureCode
+id-uEContextRelease						ProcedureCode
+id-x2Setup								ProcedureCode
+id-reset								ProcedureCode
+id-eNBConfigurationUpdate				ProcedureCode
+id-resourceStatusReportingInitiation	ProcedureCode
+id-resourceStatusReporting				ProcedureCode
+id-privateMessage						ProcedureCode
 
 # ProtocolIE-ID
 
-id-Bearers-Admitted-Item													ProtocolIE-ID
-id-Bearers-Admitted-List													ProtocolIE-ID
-id-Bearers-NotAdmitted-Item													ProtocolIE-ID
-id-Bearers-NotAdmitted-List													ProtocolIE-ID
-id-Bearers-ToBeSetup-Item													ProtocolIE-ID
+id-E-RABs-Admitted-Item														ProtocolIE-ID
+id-E-RABs-Admitted-List														ProtocolIE-ID
+id-E-RAB-Item																ProtocolIE-ID
+id-E-RABs-NotAdmitted-List													ProtocolIE-ID
+id-E-RABs-ToBeSetup-Item													ProtocolIE-ID
 id-Cause																	ProtocolIE-ID
 id-CellInformation															ProtocolIE-ID
 id-CellInformation-Item														ProtocolIE-ID
-id-InterfacesToTrace-Item													ProtocolIE-ID
 id-New-eNB-UE-X2AP-ID														ProtocolIE-ID
 id-Old-eNB-UE-X2AP-ID														ProtocolIE-ID
 id-TargetCell-ID															ProtocolIE-ID
@@ -120,8 +115,8 @@ id-UE-ContextInformation													ProtocolIE-ID
 id-UE-HistoryInformation													ProtocolIE-ID
 id-UE-X2AP-ID																ProtocolIE-ID
 id-CriticalityDiagnostics													ProtocolIE-ID
-id-Bearers-SubjectToStatusTransfer-List										ProtocolIE-ID
-id-Bearers-SubjectToStatusTransfer-Item										ProtocolIE-ID
+id-E-RABs-SubjectToStatusTransfer-List										ProtocolIE-ID
+id-E-RABs-SubjectToStatusTransfer-Item										ProtocolIE-ID
 id-ServedCells																ProtocolIE-ID
 id-GlobalENB-ID																ProtocolIE-ID
 id-TimeToWait																ProtocolIE-ID
@@ -136,21 +131,25 @@ id-ReportingPeriodicity														ProtocolIE-ID
 id-CellToReport-Item														ProtocolIE-ID
 id-CellMeasurementResult													ProtocolIE-ID
 id-CellMeasurementResult-Item												ProtocolIE-ID
-id-GUGroupIDListToAdd														ProtocolIE-ID
-id-GUGroupIDListToDelete													ProtocolIE-ID
-
+id-GUGroupIDToAddList														ProtocolIE-ID
+id-GUGroupIDToDeleteList													ProtocolIE-ID
+id-SRVCCOperationPossible													ProtocolIE-ID
+id-Measurement-ID															ProtocolIE-ID
+id-ReportCharacteristics													ProtocolIE-ID
+id-ENB1-Measurement-ID														ProtocolIE-ID
+id-ENB2-Measurement-ID														ProtocolIE-ID
+id-Number-of-Antennaports													ProtocolIE-ID
 #.REGISTER_NEW
 
 #X2AP-PROTOCOL-IES
-Bearers-Admitted-Item						N x2ap.ies id-Bearers-Admitted-Item
-Bearers-Admitted-List						N x2ap.ies id-Bearers-Admitted-List
-Bearers-NotAdmitted-Item					N x2ap.ies id-Bearers-NotAdmitted-Item
-Bearers-NotAdmitted-List					N x2ap.ies id-Bearers-NotAdmitted-List
-Bearers-ToBeSetup-Item						N x2ap.ies id-Bearers-ToBeSetup-Item
+E-RABs-Admitted-Item						N x2ap.ies id-E-RABs-Admitted-Item
+E-RABs-Admitted-List						N x2ap.ies id-E-RABs-Admitted-List
+E-RAB-Item									N x2ap.ies id-E-RAB-Item
+E-RAB-List									N x2ap.ies id-E-RABs-NotAdmitted-List
+E-RABs-ToBeSetup-Item						N x2ap.ies id-E-RABs-ToBeSetup-Item
 Cause										N x2ap.ies id-Cause		
 CellInformation-List						N x2ap.ies id-CellInformation	
 CellInformation-Item						N x2ap.ies id-CellInformation-Item
-InterfacesToTrace-Item						N x2ap.ies id-InterfacesToTrace-Item
 UE-X2AP-ID									N x2ap.ies id-New-eNB-UE-X2AP-ID
 UE-X2AP-ID									N x2ap.ies id-Old-eNB-UE-X2AP-ID
 ECGI										N x2ap.ies id-TargetCell-ID
@@ -160,8 +159,8 @@ UE-ContextInformation						N x2ap.ies id-UE-ContextInformation
 UE-HistoryInformation						N x2ap.ies id-UE-HistoryInformation
 UE-X2AP-ID									N x2ap.ies id-UE-X2AP-ID
 CriticalityDiagnostics						N x2ap.ies id-CriticalityDiagnostics
-Bearers-SubjectToStatusTransfer-List		N x2ap.ies id-Bearers-SubjectToStatusTransfer-List
-Bearers-SubjectToStatusTransfer-Item		N x2ap.ies id-Bearers-SubjectToStatusTransfer-Item
+E-RABs-SubjectToStatusTransfer-List			N x2ap.ies id-E-RABs-SubjectToStatusTransfer-List
+E-RABs-SubjectToStatusTransfer-Item			N x2ap.ies id-E-RABs-SubjectToStatusTransfer-Item
 ServedCells									N x2ap.ies id-ServedCells
 GlobalENB-ID								N x2ap.ies id-GlobalENB-ID
 TimeToWait									N x2ap.ies id-TimeToWait
@@ -172,15 +171,20 @@ ServedCellsToModify							N x2ap.ies id-ServedCellsToModify
 Old-ECGIs									N x2ap.ies id-ServedCellsToDelete
 Registration-Request						N x2ap.ies id-Registration-Request
 CellToReport-List							N x2ap.ies id-CellToReport
-ReportingPeriod								N x2ap.ies id-ReportingPeriodicity
+ReportingPeriodicity						N x2ap.ies id-ReportingPeriodicity
 CellToReport-Item							N x2ap.ies id-CellToReport-Item
 CellMeasurementResult-List					N x2ap.ies id-CellMeasurementResult
 CellMeasurementResult-Item					N x2ap.ies id-CellMeasurementResult-Item
-GUGroupIDList								N x2ap.ies id-GUGroupIDListToAdd
-GUGroupIDList								N x2ap.ies id-GUGroupIDListToDelete
+GUGroupIDList								N x2ap.ies id-GUGroupIDToAddList
+GUGroupIDList								N x2ap.ies id-GUGroupIDToDeleteList
+SRVCCOperationPossible						N x2ap.ies id-SRVCCOperationPossible
+# N x2ap.ies id-Measurement-ID
+ReportCharacteristics						N x2ap.ies id-ReportCharacteristics
+Measurement-ID								N x2ap.ies id-ENB1-Measurement-ID
+Measurement-ID								N x2ap.ies id-ENB2-Measurement-ID
 
 #X2AP-PROTOCOL-EXTENSION
-# this is from rnsap MessageStructure                   N x2ap.extension id-MessageStructure
+Number-of-Antennaports						N x2ap.extension id-Number-of-Antennaports
 
 # X2AP-PDU-Descriptions.asn  Interface Elementary Procedures
 #X2AP-ELEMENTARY-PROCEDURE
@@ -209,9 +213,11 @@ ENBConfigurationUpdate				S x2ap.proc.imsg "id-eNBConfigurationUpdate"
 ENBConfigurationUpdateAcknowledge	S x2ap.proc.sout "id-eNBConfigurationUpdate"
 ENBConfigurationUpdateFailure		S x2ap.proc.uout "id-eNBConfigurationUpdate"
 
-ResourceStatusRequest				S x2ap.proc.imsg "id-resourceStatusUpdateInitiation"
-ResourceStatusResponse				S x2ap.proc.sout "id-resourceStatusUpdateInitiation"
-ResourceStatusFailure				S x2ap.proc.uout "id-resourceStatusUpdateInitiation"
+ResourceStatusRequest				S x2ap.proc.imsg "id-resourceStatusReportingInitiation"
+ResourceStatusResponse				S x2ap.proc.sout "id-resourceStatusReportingInitiation"
+ResourceStatusFailure				S x2ap.proc.uout "id-resourceStatusReportingInitiation"
 
 ResourceStatusUpdate				S x2ap.proc.imsg "id-resourceStatusReporting"
+
+PrivateMessage				S x2ap.proc.imsg "id-privateMessage"
 #.END