Update to the 200903 release.

svn path=/trunk/; revision=27832

8 files changed, 626 insertions, 223 deletions

diff --git a/asn1/s1ap/S1AP-CommonDataTypes.asn b/asn1/s1ap/S1AP-CommonDataTypes.asn
index 72ddceea17..ce9b6d7cce 100644
--- a/asn1/s1ap/S1AP-CommonDataTypes.asn
+++ b/asn1/s1ap/S1AP-CommonDataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V8.3.0 (2008-09
+-- 3GPP TS 36.413 V8.5.0 (2009-03)
 -- 9.3.5	Common Definitions
 -- **************************************************************
 --
@@ -33,3 +33,4 @@ ProtocolIE-ID		::= INTEGER (0..65535)
 TriggeringMessage	::= ENUMERATED { initiating-message, successful-outcome, unsuccessfull-outcome }
 
 END
+
diff --git a/asn1/s1ap/S1AP-Constants.asn b/asn1/s1ap/S1AP-Constants.asn
index e6df898143..0866cbd19b 100644
--- a/asn1/s1ap/S1AP-Constants.asn
+++ b/asn1/s1ap/S1AP-Constants.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V8.4.0 (2008-12)
+-- 3GPP TS 36.413 V8.5.0 (2009-03)
 -- 9.3.6	Constant Definitions
 -- **************************************************************
 --
@@ -74,7 +74,9 @@ id-WriteReplaceWarning				ProcedureCode ::= 36
 id-eNBDirectInformationTransfer			ProcedureCode ::= 37
 id-MMEDirectInformationTransfer			ProcedureCode ::= 38
 id-PrivateMessage					ProcedureCode ::= 39
-
+id-eNBConfigurationTransfer			ProcedureCode ::= 40
+id-MMEConfigurationTransfer			ProcedureCode ::= 41
+id-CellTrafficTrace					ProcedureCode ::= 42
 
 -- **************************************************************
 --
@@ -94,7 +96,7 @@ maxProtocolIEs						INTEGER ::= 65535
 maxNrOfCSGs								INTEGER ::= 256
 maxNrOfE-RABs							INTEGER ::= 256
 maxNrOfInterfaces						INTEGER ::= 3   --FFS
-maxnoofTAI								INTEGER ::= 256
+maxnoofTAIs								INTEGER ::= 256
 maxnoofTACs								INTEGER ::= 256
 maxNrOfErrors							INTEGER ::= 256
 maxnoofBPLMNs							INTEGER ::= 6
@@ -106,12 +108,16 @@ maxnoofForbTACs							INTEGER ::= 4096
 maxNrOfIndividualS1ConnectionsToReset	INTEGER ::= 256
 maxnoofGUMMEIs							INTEGER ::= 256 -- FFS
 maxnoofCells							INTEGER ::= 16		
-maxnoofTAIforWarning					INTEGER ::= 65535 -- FFS
-maxnoofCellID							INTEGER ::= 65535 -- FFS
-maxnoofEmergencyAreaID					INTEGER ::= 65535 -- FFS
-maxnoofCellinTAI						INTEGER ::= 65535 -- FFS
-maxnoofCellinEAI						INTEGER ::= 65535 -- FFS
+maxnoofTAIforWarning					INTEGER ::= 65535 
+maxnoofCellID							INTEGER ::= 65535 
+maxnoofEmergencyAreaID					INTEGER ::= 65535 
+maxnoofCellinTAI						INTEGER ::= 65535 
+maxnoofCellinEAI						INTEGER ::= 65535 
 maxnoofeNBX2TLAs						INTEGER ::= 2
+maxnoofRATs								INTEGER ::= 8
+maxnoofGroupIDs								INTEGER ::= 65535
+maxnoofMMECs								INTEGER ::= 256
+
 
 
 
@@ -190,7 +196,7 @@ id-Direct-Forwarding-Path-Availability			ProtocolIE-ID ::= 79
 id-UEIdentityIndexValue							ProtocolIE-ID ::= 80
 id-cdma2000HOStatus								ProtocolIE-ID ::= 83
 id-cdma2000HORequiredIndication					ProtocolIE-ID ::= 84
-id-TraceReference								ProtocolIE-ID ::= 86
+id-E-UTRAN-Trace-ID								ProtocolIE-ID ::= 86
 id-RelativeMMECapacity							ProtocolIE-ID ::= 87
 id-SourceMME-UE-S1AP-ID							ProtocolIE-ID ::= 88
 id-Bearers-SubjectToStatusTransfer-Item			ProtocolIE-ID ::= 89
@@ -233,5 +239,14 @@ id-SRVCCHOIndication							ProtocolIE-ID ::= 125
 id-NAS-DownlinkCount							ProtocolIE-ID ::= 126
 id-CSG-Id										ProtocolIE-ID ::= 127
 id-CSG-IdList									ProtocolIE-ID ::= 128
-
+id-SONConfigurationTransferECT					ProtocolIE-ID ::= 129
+id-SONConfigurationTransferMCT					ProtocolIE-ID ::= 130
+id-TraceCollectionEntityIPAddress				ProtocolIE-ID ::= 131
+id-MSClassmark2									ProtocolIE-ID ::= 132
+id-MSClassmark3									ProtocolIE-ID ::= 133
+id-RRC-Establishment-Cause						ProtocolIE-ID ::= 134
+id-NASSecurityParametersfromE-UTRAN				ProtocolIE-ID ::= 135
+id-NASSecurityParameterstoE-UTRAN				ProtocolIE-ID ::= 136
+id-DefaultPagingDRX								ProtocolIE-ID ::= 137
 END
+
diff --git a/asn1/s1ap/S1AP-Containers.asn b/asn1/s1ap/S1AP-Containers.asn
index b6ebf173b9..40b57d079b 100644
--- a/asn1/s1ap/S1AP-Containers.asn
+++ b/asn1/s1ap/S1AP-Containers.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V8.4.0 (2008-12)
+-- 3GPP TS 36.413 V8.5.0 (2009-03)
 -- 9.3.7	Container Definitions
 -- **************************************************************
 --
@@ -202,3 +202,4 @@ END
 
 
 
+
diff --git a/asn1/s1ap/S1AP-IEs.asn b/asn1/s1ap/S1AP-IEs.asn
index 8411e45722..d6a5b9b11c 100644
--- a/asn1/s1ap/S1AP-IEs.asn
+++ b/asn1/s1ap/S1AP-IEs.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V8.4.0 (2008-12)
+-- 3GPP TS 36.413 V8.5.0 (2009-03)
 -- 9.3.4	Information Element Definitions
 -- **************************************************************
 --
@@ -37,7 +37,11 @@ IMPORTS
 	maxnoofEmergencyAreaID,
 	maxnoofTAIforWarning,
 	maxnoofCellinTAI,
-	maxnoofCellinEAI
+	maxnoofCellinEAI,
+	maxnoofeNBX2TLAs,
+	maxnoofRATs,
+	maxnoofGroupIDs,
+	maxnoofMMECs
 
 
 
@@ -102,9 +106,15 @@ BroadcastCompletedAreaList ::= SEQUENCE {
 	cellID-Broadcast				CellID-Broadcast,
 	tAI-Broadcast					TAI-Broadcast,
 	emergencyAreaID-Broadcast		EmergencyAreaID-Broadcast,
+	iE-Extensions					ProtocolExtensionContainer { {BroadcastCompletedAreaList-ExtIEs} } OPTIONAL,
 	...
 }
 
+BroadcastCompletedAreaList-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
 -- C
 
 Cause ::= CHOICE {
@@ -139,7 +149,6 @@ CauseProtocol ::= ENUMERATED {
 
 CauseRadioNetwork ::= ENUMERATED {
 	unspecified,
-	handover-triggered,
 	tx2relocoverall-expiry,
 	successful-handover,
 	release-due-to-eutran-generated-reason,
@@ -166,6 +175,15 @@ CauseRadioNetwork ::= ENUMERATED {
 	ue-not-available-for-ps-service,
 	radio-resources-not-available,
 	failure-in-radio-interface-procedure,
+	invalid-qos-combination,
+	interrat-redirection,
+	interaction-with-other-procedure,
+	unknown-E-RAB-ID,
+	multiple-E-RAB-ID-instances,
+	encryption-and-or-integrity-protection-algorithms-not-supported,
+	s1-intra-system-handover-triggered,
+	s1-inter-system-handover-triggered,
+	x2-handover-triggered,
 	...
 
 }
@@ -190,9 +208,15 @@ CellID-Broadcast ::= SEQUENCE (SIZE(1..maxnoofCellID)) OF CellID-Broadcast-Item
 
 CellID-Broadcast-Item ::= SEQUENCE {
 	eCGI				EUTRAN-CGI,
+	iE-Extensions		ProtocolExtensionContainer { {CellID-Broadcast-Item-ExtIEs} } OPTIONAL,
 	...
 }
 
+CellID-Broadcast-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
 Cdma2000PDU	::= OCTET STRING
 
 Cdma2000RATType ::= ENUMERATED {
@@ -234,21 +258,37 @@ Cdma2000OneXPilot ::= OCTET STRING
 
 Cdma2000OneXRAND ::= OCTET STRING
 
-CellType ::= ENUMERATED {ffs,...} -- FFS: The definition of CellType
+
+Cell-Size ::= ENUMERATED {verysmall, small, medium, large, ...}
+
+CellType ::= SEQUENCE {
+	cell-Size				Cell-Size,
+	iE-Extensions			ProtocolExtensionContainer { { CellType-ExtIEs}}	OPTIONAL,
+	...
+}
+
+CellType-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
 CGI ::= SEQUENCE {
 	pLMNidentity				PLMNidentity,
 	lAC				LAC,
 	cI				CI,
-	rAC				RAC						OPTIONAL
+	rAC				RAC						OPTIONAL,
+	iE-Extensions	ProtocolExtensionContainer { {CGI-ExtIEs} } OPTIONAL,
+	...
 	}
 
+CGI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
 CI					::= OCTET STRING (SIZE (2))
 
 CNDomain ::= ENUMERATED {
-	cs, 
-	ps 
+	ps, 
+	cs 
 }
 
 CSFallbackIndicator ::= ENUMERATED { 
@@ -256,21 +296,28 @@ CSFallbackIndicator ::= ENUMERATED {
 	... 
 }
 
-CSG-Id		::= BIT STRING (SIZE (28))
+CSG-Id		::= BIT STRING (SIZE (27))
 
 
 CSG-IdList ::= SEQUENCE (SIZE (1..maxNrOfCSGs)) OF CSG-IdList-Item
 
 CSG-IdList-Item ::= SEQUENCE {
 	cSG-Id			CSG-Id,
+	iE-Extensions	ProtocolExtensionContainer { {CSG-IdList-Item-ExtIEs} } OPTIONAL,
 	...
 }
 
-
+CSG-IdList-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
 COUNTvalue ::= SEQUENCE {
 	pDCP-SN			PDCP-SN,
 	hFN				HFN,
+	iE-Extensions	ProtocolExtensionContainer { {COUNTvalue-ExtIEs} } OPTIONAL,
+	...
+}
+COUNTvalue-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -322,19 +369,31 @@ ECGIList ::= SEQUENCE (SIZE(1..maxnoofCellID)) OF EUTRAN-CGI
 
 EmergencyAreaIDList ::= SEQUENCE (SIZE(1..maxnoofEmergencyAreaID)) OF EmergencyAreaID
 
-EmergencyAreaID ::= OCTET STRING (SIZE (2))
+EmergencyAreaID ::= OCTET STRING (SIZE (3))
 
 EmergencyAreaID-Broadcast ::= SEQUENCE (SIZE(1..maxnoofEmergencyAreaID)) OF EmergencyAreaID-Broadcast-Item
 
 EmergencyAreaID-Broadcast-Item ::= SEQUENCE {
 	emergencyAreaID			EmergencyAreaID,
-	completedCellinEAI		CompletedCellinEAI
+	completedCellinEAI		CompletedCellinEAI,
+	iE-Extensions			ProtocolExtensionContainer { {EmergencyAreaID-Broadcast-Item-ExtIEs} } OPTIONAL,
+	...
 }
 
+EmergencyAreaID-Broadcast-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
 CompletedCellinEAI ::= SEQUENCE (SIZE(1..maxnoofCellinEAI)) OF CompletedCellinEAI-Item
 
 CompletedCellinEAI-Item ::= SEQUENCE {
 	eCGI					EUTRAN-CGI,
+	iE-Extensions			ProtocolExtensionContainer { {CompletedCellinEAI-Item-ExtIEs} } OPTIONAL,
+	...
+}
+
+CompletedCellinEAI-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -369,7 +428,7 @@ GlobalENB-ID-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 
 
 ENB-StatusTransfer-TransparentContainer		::= SEQUENCE {
-	bearers-SubjectToStatusTransferList		Bearers-SubjectToStatusTransferList		OPTIONAL,
+	bearers-SubjectToStatusTransferList		Bearers-SubjectToStatusTransferList,
 	iE-Extensions			ProtocolExtensionContainer { {ENB-StatusTransfer-TransparentContainer-ExtIEs} } OPTIONAL,
 	...
 }
@@ -380,8 +439,9 @@ ENB-StatusTransfer-TransparentContainer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 
 ENB-UE-S1AP-ID				::= INTEGER (0..16777215)
 
-ENBname ::= OCTET STRING
+ENBname ::= PrintableString (SIZE (1..150,...))
 
+ENBX2TLAs ::= SEQUENCE (SIZE(1.. maxnoofeNBX2TLAs)) OF TransportLayerAddress
 
 EncryptionAlgorithms ::= BIT STRING (SIZE (16,...))
 
@@ -412,6 +472,7 @@ ForbiddenInterRATs ::= ENUMERATED {
 	all,
 	geran,
 	utran,
+	cdma2000,
 	...
 }
 
@@ -419,7 +480,13 @@ ForbiddenTAs ::= SEQUENCE (SIZE(1.. maxnoofEPLMNsPlusOne)) OF ForbiddenTAs-Item
 
 ForbiddenTAs-Item ::= SEQUENCE {
 	pLMN-Identity		PLMNidentity,
-	forbiddenTACs		ForbiddenTACs
+	forbiddenTACs		ForbiddenTACs,
+	iE-Extensions		ProtocolExtensionContainer { {ForbiddenTAs-Item-ExtIEs} } OPTIONAL,
+	...
+}
+
+ForbiddenTAs-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
 }
 
 ForbiddenTACs ::= SEQUENCE (SIZE(1..maxnoofForbTACs)) OF TAC
@@ -428,7 +495,13 @@ ForbiddenLAs ::= SEQUENCE (SIZE(1..maxnoofEPLMNsPlusOne)) OF ForbiddenLAs-Item
 
 ForbiddenLAs-Item ::= SEQUENCE {
 	pLMN-Identity		PLMNidentity,
-	forbiddenLACs		ForbiddenLACs
+	forbiddenLACs		ForbiddenLACs,
+	iE-Extensions		ProtocolExtensionContainer { {ForbiddenLAs-Item-ExtIEs} } OPTIONAL,
+	...
+}
+
+ForbiddenLAs-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
 }
 
 ForbiddenLACs ::= SEQUENCE (SIZE(1..maxnoofForbLACs)) OF LAC
@@ -471,7 +544,7 @@ HandoverRestrictionList ::= SEQUENCE {
 	forbiddenTAs				ForbiddenTAs			OPTIONAL,
 	forbiddenLAs				ForbiddenLAs			OPTIONAL,
 	forbiddenInterRATs				ForbiddenInterRATs			OPTIONAL, 
-	iE-Extensions				ProtocolExtensionContainer { {HandoverRestrictionList-ExtIEs} } OPTIONAL,
+	iE-Extensions				ProtocolExtensionContainer { {HandoverRestrictionList-ExtIEs} }	OPTIONAL,
 	...
 }
 
@@ -496,25 +569,9 @@ IMSI	::=	OCTET STRING (SIZE (3..8))
 
 IntegrityProtectionAlgorithms ::= BIT STRING (SIZE (16,...))
 
-InterfacesToTraceList ::= SEQUENCE (SIZE (1..maxNrOfInterfaces)) OF InterfacesToTraceItem
+InterfacesToTrace ::= BIT STRING (SIZE (8))
 
-InterfacesToTraceItem ::= SEQUENCE {
-	interfaceType			InterfaceType,
-	traceDepth				TraceDepth,
-	iE-Extensions			ProtocolExtensionContainer { {InterfacesToTraceItem-ExtIEs} }	OPTIONAL,
-	...
-}
-
-InterfacesToTraceItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-	...
-}
 
-InterfaceType ::= ENUMERATED {
-	s1,
-	x2,
-	uu,
-...
-}
 
 -- J
 -- K
@@ -526,7 +583,8 @@ LAC	::= OCTET STRING (SIZE (2))
 LAI ::= SEQUENCE {
 	pLMNidentity				PLMNidentity,
 	lAC				LAC,
-	iE-Extensions			ProtocolExtensionContainer { {LAI-ExtIEs} } OPTIONAL
+	iE-Extensions			ProtocolExtensionContainer { {LAI-ExtIEs} } OPTIONAL,
+	...
 }
 
 LAI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
@@ -536,6 +594,7 @@ LAI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 LastVisitedCell-Item ::= CHOICE {
 	e-UTRAN-Cell					LastVisitedEUTRANCellInformation,
 	uTRAN-Cell						LastVisitedUTRANCellInformation,
+	gERAN-Cell						LastVisitedGERANCellInformation,
 	...
 }
 LastVisitedEUTRANCellInformation ::= SEQUENCE {
@@ -550,13 +609,19 @@ LastVisitedEUTRANCellInformation-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 }
 LastVisitedUTRANCellInformation	::= OCTET STRING
 
+LastVisitedGERANCellInformation ::= CHOICE {
+	undefined						NULL,
+	...
+}
+
+L3-Information				::= OCTET STRING
 
 
 -- M
 
-MessageIdentifier	::= OCTET STRING (SIZE (16))
+MessageIdentifier	::= BIT STRING (SIZE (16))
 
-MMEname ::= OCTET STRING
+MMEname ::= PrintableString (SIZE (1..150,...))
 
 MME-Group-ID	::= OCTET STRING (SIZE (2))
 
@@ -565,16 +630,24 @@ MME-Code		::= OCTET STRING (SIZE (1))
 MME-UE-S1AP-ID				::= INTEGER (0..4294967295)
 M-TMSI			::= OCTET STRING (SIZE (4))
 
+MSClassmark2	::= OCTET STRING
+MSClassmark3	::= OCTET STRING
 
 -- N
 
 NAS-PDU ::=  OCTET STRING
 
+NASSecurityParametersfromE-UTRAN ::= OCTET STRING
+
+NASSecurityParameterstoE-UTRAN ::= OCTET STRING
+
 NumberofBroadcastRequest ::= INTEGER (0..65535)
 
 NumberofBroadcast ::= INTEGER (0..65535)
 
 -- O
+OldBSS-ToNewBSS-Information		::= OCTET STRING
+
 OverloadAction ::= ENUMERATED {
 reject-non-emergency-mo-dt,
 reject-all-rrc-cr-signalling,
@@ -617,7 +690,7 @@ PriorityLevel				::= INTEGER { spare (0), highest (1), lowest (14), no-priority
 
 -- Q
 
-QCI						::= INTEGER (1..256)
+QCI						::= INTEGER (0..255)
 
 -- R
 
@@ -658,7 +731,10 @@ RIMRoutingAddress ::= CHOICE {
 	...
 }
 
-ReportArea	::= OCTET STRING
+ReportArea	::= ENUMERATED {
+	ecgi,
+	...
+}
 
 RepetitionPeriod ::= INTEGER (1..4096)
 
@@ -667,6 +743,15 @@ RNC-ID					::= INTEGER (0..4095)
 
 RRC-Container	::= OCTET STRING
 
+RRC-Establishment-Cause ::= ENUMERATED {
+	emergency,
+	highPriorityAccess,
+	mt-Access,
+	mo-Signalling,
+	mo-Data,
+	...
+}
+
 -- S
 
 E-RAB-ID		::= INTEGER (0..15, ...)
@@ -731,8 +816,8 @@ SecurityKey	::= BIT STRING (SIZE(256))
 
 
 SecurityContext ::= SEQUENCE {
-	nexthopchainingcount		SecurityKey,
-	nexthopparameter							BIT STRING (SIZE(3)),
+	nextHopParameter		INTEGER (0..7),
+	nextHopChainingCount							 SecurityKey,
 	iE-Extensions			ProtocolExtensionContainer { { SecurityContext-ExtIEs} } OPTIONAL,
 	...
 }
@@ -744,9 +829,54 @@ SecurityContext-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 
 SerialNumber ::= BIT STRING (SIZE (16))
 
+SONInformation ::= CHOICE{
+	sONInformationRequest		SONInformationRequest,
+	sONInformationReply			SONInformationReply,
+	...
+}
+
+SONInformationRequest ::= ENUMERATED { 
+	x2TNL-Configuration-Info,
+	...
+}
+
+SONInformationReply ::= SEQUENCE {
+	x2TNLConfigurationInfo			X2TNLConfigurationInfo			OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer {{SONInformationReply-ExtIEs}} OPTIONAL,
+	...
+}
+
+SONInformationReply-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
+SONConfigurationTransfer ::= SEQUENCE {
+	targeteNB-ID					TargeteNB-ID,
+	sourceeNB-ID					SourceeNB-ID,
+	sONInformation					SONInformation,
+	iE-Extensions			ProtocolExtensionContainer { { SONConfigurationTransfer-ExtIEs} }			OPTIONAL,
+...
+}
+
+SONConfigurationTransfer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
+
 Source-ToTarget-TransparentContainer ::= OCTET STRING
 
 SourceBSS-ToTargetBSS-TransparentContainer		::= OCTET STRING
+SourceeNB-ID ::= SEQUENCE {
+	global-ENB-ID	Global-ENB-ID,
+	selected-TAI	TAI,
+	iE-Extensions	ProtocolExtensionContainer { {SourceeNB-ID-ExtIEs} } OPTIONAL
+}
+
+SourceeNB-ID-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
 SRVCCOperationPossible ::= ENUMERATED {
 	possible,
@@ -759,24 +889,40 @@ SRVCCHOIndication ::= ENUMERATED {
 	...
 }
 
-SourceeNodeB-ToTargeteNodeB-TransparentContainer		::= SEQUENCE {
+SourceeNB-ToTargeteNB-TransparentContainer		::= SEQUENCE {
 	rRC-Container					RRC-Container,
 	e-RABInformationList		E-RABInformationList		OPTIONAL,
 	targetCell-ID					EUTRAN-CGI,
 	subscriberProfileIDforRFP				SubscriberProfileIDforRFP		OPTIONAL,
 	uE-HistoryInformation			UE-HistoryInformation,
-	iE-Extensions			ProtocolExtensionContainer { {SourceeNodeB-ToTargeteNodeB-TransparentContainer-ExtIEs} } OPTIONAL,
+	iE-Extensions			ProtocolExtensionContainer { {SourceeNB-ToTargeteNB-TransparentContainer-ExtIEs} } OPTIONAL,
 	...
 }
 
-SourceeNodeB-ToTargeteNodeB-TransparentContainer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+SourceeNB-ToTargeteNB-TransparentContainer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
 
 SourceRNC-ToTargetRNC-TransparentContainer		::= OCTET STRING
 
-ServedGUMMEIs ::= SEQUENCE (SIZE(1.. maxnoofGUMMEIs)) OF GUMMEI
+
+ServedGUMMEIs ::= SEQUENCE (SIZE (1.. maxnoofRATs)) OF ServedGUMMEIsItem
+
+ServedGUMMEIsItem ::= SEQUENCE {
+	servedPLMNs				ServedPLMNs,
+	servedGroupIDs			ServedGroupIDs,
+	servedMMECs				ServedMMECs,
+	iE-Extensions			ProtocolExtensionContainer { {ServedGUMMEIsItem-ExtIEs} }	OPTIONAL,
+	...
+}
+
+ServedGUMMEIsItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+ServedGroupIDs ::= SEQUENCE (SIZE(1.. maxnoofGroupIDs)) OF MME-Group-ID
+ServedMMECs ::= SEQUENCE (SIZE(1.. maxnoofMMECs)) OF MME-Code
 
 ServedPLMNs ::= SEQUENCE (SIZE(1.. maxnoofPLMNsPerMME)) OF PLMNidentity
 
@@ -787,15 +933,23 @@ SupportedTAs ::= SEQUENCE (SIZE(1.. maxnoofTACs)) OF SupportedTAs-Item
 SupportedTAs-Item ::=	SEQUENCE  {
 	tAC					TAC,
 	broadcastPLMNs		BPLMNs,
+	iE-Extensions		ProtocolExtensionContainer { {SupportedTAs-Item-ExtIEs} } OPTIONAL,
+	...
+}
+
+SupportedTAs-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
 S-TMSI ::= SEQUENCE {
 	mMEC	MME-Code,
-	m-TMSI	M-TMSI,
+	iE-Extensions		ProtocolExtensionContainer { {S-TMSI-ExtIEs} } OPTIONAL,
 	...
 }
 
+S-TMSI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
 -- T
 
@@ -806,7 +960,8 @@ TAIListforWarning ::= SEQUENCE (SIZE(1..maxnoofTAIforWarning)) OF TAI
 TAI ::= SEQUENCE {
 	pLMNidentity			PLMNidentity,
 	tAC						TAC,
-	iE-Extensions			ProtocolExtensionContainer { {TAI-ExtIEs} } OPTIONAL
+	iE-Extensions			ProtocolExtensionContainer { {TAI-ExtIEs} } OPTIONAL,
+	...
 }
 
 TAI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
@@ -817,13 +972,24 @@ TAI-Broadcast ::= SEQUENCE (SIZE(1..maxnoofTAIforWarning)) OF TAI-Broadcast-Item
 
 TAI-Broadcast-Item ::= SEQUENCE {
 	tAI					TAI,
-	completedCellinTAI	CompletedCellinTAI
+	completedCellinTAI	CompletedCellinTAI,
+	iE-Extensions			ProtocolExtensionContainer { {TAI-Broadcast-Item-ExtIEs} } OPTIONAL,
+	...
+}
+
+TAI-Broadcast-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
 }
 
-CompletedCellinTAI ::= SEQUENCE (SIZE(0..maxnoofCellinTAI)) OF CompletedCellinTAI-Item
+CompletedCellinTAI ::= SEQUENCE (SIZE(1..maxnoofCellinTAI)) OF CompletedCellinTAI-Item
 
 CompletedCellinTAI-Item ::= SEQUENCE{
 	eCGI				EUTRAN-CGI,
+	iE-Extensions		ProtocolExtensionContainer { {CompletedCellinTAI-Item-ExtIEs} } OPTIONAL,
+	...
+}
+
+CompletedCellinTAI-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -839,7 +1005,8 @@ TargetID ::= CHOICE {
 TargeteNB-ID ::= SEQUENCE {
 	global-ENB-ID	Global-ENB-ID,
 	selected-TAI	TAI,
-	iE-Extensions	ProtocolExtensionContainer { {TargeteNB-ID-ExtIEs} } OPTIONAL
+	iE-Extensions	ProtocolExtensionContainer { {TargeteNB-ID-ExtIEs} } OPTIONAL,
+	...
 }
 
 TargeteNB-ID-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
@@ -850,17 +1017,24 @@ TargetRNC-ID ::= SEQUENCE {
 	lAI					LAI,
 	rAC					RAC 		OPTIONAL,
 	rNC-ID				RNC-ID,
-	extendedRNC-ID		ExtendedRNC-ID		OPTIONAL
+	extendedRNC-ID		ExtendedRNC-ID		OPTIONAL,
+	iE-Extensions	ProtocolExtensionContainer { {TargetRNC-ID-ExtIEs} } OPTIONAL,
+	...
 	}
 
 
-TargeteNodeB-ToSourceeNodeB-TransparentContainer		::= SEQUENCE {
+TargetRNC-ID-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
+TargeteNB-ToSourceeNB-TransparentContainer		::= SEQUENCE {
 	rRC-Container					RRC-Container,
-	iE-Extensions			ProtocolExtensionContainer { {TargeteNodeB-ToSourceeNodeB-TransparentContainer-ExtIEs} } OPTIONAL,
+	iE-Extensions			ProtocolExtensionContainer { {TargeteNB-ToSourceeNB-TransparentContainer-ExtIEs} } OPTIONAL,
 	...
 }
 
-TargeteNodeB-ToSourceeNodeB-TransparentContainer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+TargeteNB-ToSourceeNB-TransparentContainer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -875,9 +1049,12 @@ Time-UE-StayedInCell ::= INTEGER (0..4095)
 TransportLayerAddress		::= BIT STRING (SIZE(1..160, ...))
 
 TraceActivation ::= SEQUENCE {
-	traceReference					TraceReference,
-	interfacesToTraceList			InterfacesToTraceList,
-	iE-Extensions					ProtocolExtensionContainer { { TraceActivation-ExtIEs} }		OPTIONAL
+	e-UTRAN-Trace-ID					E-UTRAN-Trace-ID,
+	interfacesToTrace			InterfacesToTrace,
+traceDepth						TraceDepth,
+traceCollectionEntityIPAddress	TransportLayerAddress,
+	iE-Extensions					ProtocolExtensionContainer { { TraceActivation-ExtIEs} }		OPTIONAL,
+	...
 }
 
 TraceActivation-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
@@ -888,13 +1065,13 @@ TraceDepth ::= ENUMERATED {
 	minimum,
 	medium,
 	maximum,
-	vendorMinimum,
-	vendorMedium,
-	vendorMaximum,
+	minimumWithoutVendorSpecificExtension,
+	mediumWithoutVendorSpecificExtension,
+	maximumWithoutVendorSpecificExtension,
 	...
 }
 
-TraceReference ::=  OCTET STRING (SIZE (8))
+E-UTRAN-Trace-ID ::=  OCTET STRING (SIZE (8))
 
 TypeOfError ::= ENUMERATED {
 	not-understood,
@@ -925,9 +1102,15 @@ UE-S1AP-IDs ::= CHOICE{
 
 UE-S1AP-ID-pair ::= SEQUENCE{
 	mME-UE-S1AP-ID		MME-UE-S1AP-ID,
-	eNB-UE-S1AP-ID		ENB-UE-S1AP-ID
+	eNB-UE-S1AP-ID		ENB-UE-S1AP-ID,
+	iE-Extensions		ProtocolExtensionContainer { {UE-S1AP-ID-pair-ExtIEs} } OPTIONAL,
+	...
+}
+UE-S1AP-ID-pair-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
 }
 
+
 UE-associatedLogicalS1-ConnectionItem ::= SEQUENCE {
 	mME-UE-S1AP-ID					MME-UE-S1AP-ID OPTIONAL,
 	eNB-UE-S1AP-ID					ENB-UE-S1AP-ID OPTIONAL,
@@ -979,14 +1162,25 @@ WarningType ::= OCTET STRING (SIZE (2))
 WarningSecurityInfo ::= OCTET STRING (SIZE (50))
 
 
-WarningMessageContents ::= OCTET STRING
+WarningMessageContents ::= OCTET STRING (SIZE(1..9600))
 
 
 -- X
 
 
+X2TNLConfigurationInfo ::= SEQUENCE {
+	eNBX2TransportLayerAddresses	ENBX2TLAs,
+	iE-Extensions					ProtocolExtensionContainer { { X2TNLConfigurationInfo-ExtIEs} } OPTIONAL,
+	...
+}
+
+X2TNLConfigurationInfo-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 -- Y
 -- Z
 
 END
 
+
diff --git a/asn1/s1ap/S1AP-PDU-Contents.asn b/asn1/s1ap/S1AP-PDU-Contents.asn
index 82a929f225..dc38a382c3 100644
--- a/asn1/s1ap/S1AP-PDU-Contents.asn
+++ b/asn1/s1ap/S1AP-PDU-Contents.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V8.4.0 (2008-12)
+-- 3GPP TS 36.413 V8.5.0 (2009-03)
 -- 9.3.3	PDU Definitions
 -- **************************************************************
 --
@@ -49,7 +49,11 @@ IMPORTS
 	HandoverType,
 	MMEname,
 	MME-UE-S1AP-ID,
+	MSClassmark2,
+	MSClassmark3,
 	NAS-PDU,
+	NASSecurityParametersfromE-UTRAN,
+	NASSecurityParameterstoE-UTRAN,
 	OverloadResponse,
 	PagingDRX,
 	PLMNidentity,
@@ -62,10 +66,10 @@ IMPORTS
 	SecurityKey,
 	SecurityContext,
 	ServedGUMMEIs,
-	ServedPLMNs,
+	SONConfigurationTransfer,
 	Source-ToTarget-TransparentContainer,
 	SourceBSS-ToTargetBSS-TransparentContainer,
-	SourceeNodeB-ToTargeteNodeB-TransparentContainer,
+	SourceeNB-ToTargeteNB-TransparentContainer,
 	SourceRNC-ToTargetRNC-TransparentContainer,
 	SubscriberProfileIDforRFP,
 	SRVCCOperationPossible,
@@ -74,12 +78,12 @@ IMPORTS
 	TAI,
 	Target-ToSource-TransparentContainer,
 	TargetBSS-ToSourceBSS-TransparentContainer,	
-	TargeteNodeB-ToSourceeNodeB-TransparentContainer,
+	TargeteNB-ToSourceeNB-TransparentContainer,
 	TargetID,
 	TargetRNC-ToSourceRNC-TransparentContainer,
 	TimeToWait,
 	TraceActivation,
-	TraceReference,
+	E-UTRAN-Trace-ID,
 	TransportLayerAddress,
 	UEIdentityIndexValue,
 	UEPagingID,
@@ -97,7 +101,8 @@ IMPORTS
 	WarningSecurityInfo,
 	DataCodingScheme,
 	WarningMessageContents,
-	BroadcastCompletedAreaList
+	BroadcastCompletedAreaList,
+	RRC-Establishment-Cause
 
 FROM S1AP-IEs
 
@@ -129,6 +134,7 @@ FROM S1AP-Containers
 	id-CSFallbackIndicator,
 	id-CSG-Id,
 	id-CSG-IdList,
+	id-DefaultPagingDRX,
 	id-Direct-Forwarding-Path-Availability,
 	id-Global-ENB-ID,
 	id-EUTRAN-CGI,
@@ -144,7 +150,11 @@ FROM S1AP-Containers
 	id-NAS-DownlinkCount,
 	id-MMEname,
 	id-MME-UE-S1AP-ID,
+id-MSClassmark2,
+id-MSClassmark3,
 	id-NAS-PDU,
+	id-NASSecurityParametersfromE-UTRAN,
+	id-NASSecurityParameterstoE-UTRAN,
 	id-OverloadResponse,
 	id-pagingDRX,
 	id-RelativeMMECapacity,
@@ -191,7 +201,8 @@ FROM S1AP-Containers
 	id-SecurityKey,
 	id-SecurityContext,
 	id-ServedGUMMEIs,
-	id-ServedPLMNs,
+	id-SONConfigurationTransferECT,
+	id-SONConfigurationTransferMCT,
 	id-Source-ToTarget-TransparentContainer,
 	id-SourceMME-UE-S1AP-ID,
 	id-SRVCCOperationPossible,
@@ -206,7 +217,7 @@ FROM S1AP-Containers
 	id-TargetID,
 	id-TimeToWait,
 	id-TraceActivation,
-	id-TraceReference,
+	id-E-UTRAN-Trace-ID,
 	id-UEIdentityIndexValue,
 	id-UEPagingID,
 	id-UERadioCapability,
@@ -226,7 +237,9 @@ FROM S1AP-Containers
 	id-DataCodingScheme,
 	id-WarningMessageContents,
 	id-BroadcastCompletedAreaList,
-	maxnoofTAI,
+	id-RRC-Establishment-Cause,
+	id-TraceCollectionEntityIPAddress,
+	maxnoofTAIs,
 	maxNrOfErrors,
 	maxNrOfE-RABs,
 	maxNrOfIndividualS1ConnectionsToReset,
@@ -245,13 +258,13 @@ FROM S1AP-Constants;
 --
 -- **************************************************************
 
-E-RAB-IE-ContainerList                  { S1AP-PROTOCOL-IES      : IEsSetParam }	::= ProtocolIE-ContainerList     { 1, maxNrOfE-RABs,   {IEsSetParam} }
-E-RAB-IE-ContainerPairList              { S1AP-PROTOCOL-IES-PAIR : IEsSetParam }	::= ProtocolIE-ContainerPairList { 1, maxNrOfE-RABs,   {IEsSetParam} }
-ProtocolError-IE-ContainerList        { S1AP-PROTOCOL-IES      : IEsSetParam }	::= ProtocolIE-ContainerList     { 1, maxNrOfE-RABs,   {IEsSetParam} }
+E-RAB-IE-ContainerList			{ S1AP-PROTOCOL-IES      : IEsSetParam }	::= ProtocolIE-ContainerList     { 1, maxNrOfE-RABs,   {IEsSetParam} }
+E-RAB-IE-ContainerPairList		{ S1AP-PROTOCOL-IES-PAIR : IEsSetParam }	::= ProtocolIE-ContainerPairList { 1, maxNrOfE-RABs,   {IEsSetParam} }
+ProtocolError-IE-ContainerList	{ S1AP-PROTOCOL-IES      : IEsSetParam }	::= ProtocolIE-ContainerList     { 1, maxNrOfE-RABs,   {IEsSetParam} }
 
 -- **************************************************************
 --
--- HANDOVER PREPARATION ELEMTARY PROCEDURE
+-- HANDOVER PREPARATION ELEMENTARY PROCEDURE
 --
 -- **************************************************************
 
@@ -267,14 +280,17 @@ HandoverRequired ::= SEQUENCE {
 }
 
 HandoverRequiredIEs S1AP-PROTOCOL-IES ::= {	
-	{ ID id-MME-UE-S1AP-ID					CRITICALITY reject	TYPE MME-UE-S1AP-ID		 			PRESENCE mandatory	} |
-	{ ID id-eNB-UE-S1AP-ID					CRITICALITY reject	TYPE ENB-UE-S1AP-ID		 			PRESENCE mandatory	} |
-	{ ID id-HandoverType					CRITICALITY reject	TYPE HandoverType		 			PRESENCE mandatory	} |
-	{ ID id-Cause					CRITICALITY ignore	TYPE Cause		 			PRESENCE mandatory	} |
-	{ ID id-TargetID				CRITICALITY reject	TYPE TargetID	 				PRESENCE mandatory	} |
-	{ ID id-Direct-Forwarding-Path-Availability	CRITICALITY ignore	TYPE Direct-Forwarding-Path-Availability	PRESENCE optional } |
-	{ ID id-SRVCCHOIndication			CRITICALITY	reject	TYPE	SRVCCHOIndication		PRESENCE optional }|
-	{ ID id-Source-ToTarget-TransparentContainer CRITICALITY reject TYPE Source-ToTarget-TransparentContainer PRESENCE mandatory },
+	{ ID id-MME-UE-S1AP-ID							CRITICALITY reject	TYPE MME-UE-S1AP-ID		 							PRESENCE mandatory	} |
+	{ ID id-eNB-UE-S1AP-ID							CRITICALITY reject	TYPE ENB-UE-S1AP-ID		 							PRESENCE mandatory	} |
+	{ ID id-HandoverType							CRITICALITY reject	TYPE HandoverType		 							PRESENCE mandatory	} |
+	{ ID id-Cause									CRITICALITY ignore	TYPE Cause		 									PRESENCE mandatory	} |
+	{ ID id-TargetID								CRITICALITY reject	TYPE TargetID	 									PRESENCE mandatory	} |
+	{ ID id-Direct-Forwarding-Path-Availability		CRITICALITY ignore	TYPE Direct-Forwarding-Path-Availability		PRESENCE optional } |
+	{ ID id-SRVCCHOIndication						CRITICALITY reject	TYPE	SRVCCHOIndication							PRESENCE optional }|
+	{ ID id-Source-ToTarget-TransparentContainer	CRITICALITY reject 	TYPE Source-ToTarget-TransparentContainer 	PRESENCE mandatory }|
+	{ ID id-Source-ToTarget-TransparentContainer 	CRITICALITY reject 	TYPE Source-ToTarget-TransparentContainer 	PRESENCE optional }|
+	{ ID id-MSClassmark2							CRITICALITY reject	TYPE MSClassmark2									PRESENCE  conditional }|
+	{ ID id-MSClassmark3							CRITICALITY ignore	TYPE MSClassmark3									PRESENCE conditional },
 
 	...
 }
@@ -292,20 +308,19 @@ HandoverCommand ::= SEQUENCE {
 }
 
 HandoverCommandIEs S1AP-PROTOCOL-IES ::= {	
-	{ ID id-MME-UE-S1AP-ID					CRITICALITY reject	TYPE MME-UE-S1AP-ID		 			PRESENCE mandatory	} |
-	{ ID id-eNB-UE-S1AP-ID					CRITICALITY reject	TYPE ENB-UE-S1AP-ID		 			PRESENCE mandatory	} |
-	{ ID id-HandoverType					CRITICALITY reject	TYPE HandoverType		 			PRESENCE mandatory	} |
-	{ ID id-NAS-DownlinkCount					CRITICALITY reject	TYPE NAS-DownlinkCount					PRESENCE conditional
-	-- This IE shall be present if Handover Type IE is not set to value "IntraLTE" --			}|
-	{ ID id-E-RABSubjecttoDataForwardingList					CRITICALITY ignore	TYPE E-RABSubjecttoDataForwardingList		 			PRESENCE optional	} |
-	{ ID id-E-RABtoReleaseListHOCmd					CRITICALITY ignore	TYPE E-RABList		 			PRESENCE optional	} |
-	{ ID id-Target-ToSource-TransparentContainer			CRITICALITY	reject	TYPE Target-ToSource-TransparentContainer		PRESENCE mandatory }|
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
+	{ ID id-MME-UE-S1AP-ID							CRITICALITY reject	TYPE MME-UE-S1AP-ID		 									PRESENCE mandatory	} |
+	{ ID id-eNB-UE-S1AP-ID							CRITICALITY reject	TYPE ENB-UE-S1AP-ID		 									PRESENCE mandatory	} |
+	{ ID id-HandoverType							CRITICALITY reject	TYPE HandoverType		 									PRESENCE mandatory	} |
+	{ ID id-NASSecurityParametersfromE-UTRAN		CRITICALITY reject	TYPE NASSecurityParametersfromE-UTRAN					PRESENCE conditional
+	-- This IE shall be present if HandoverType IE is set to value "LTEtoUTRAN" or "LTEtoGERAN" --			}|
+	{ ID id-E-RABSubjecttoDataForwardingList		CRITICALITY ignore	TYPE E-RABSubjecttoDataForwardingList		 			PRESENCE optional	} |
+	{ ID id-E-RABtoReleaseListHOCmd					CRITICALITY ignore	TYPE E-RABList		 										PRESENCE optional	} |
+	{ ID id-Target-ToSource-TransparentContainer	CRITICALITY	reject	TYPE Target-ToSource-TransparentContainer			PRESENCE mandatory }|
+	{ ID id-Target-ToSource-TransparentContainer	CRITICALITY	reject	TYPE Target-ToSource-TransparentContainer			PRESENCE optional }|
+	{ ID id-CriticalityDiagnostics					CRITICALITY ignore	TYPE CriticalityDiagnostics								PRESENCE optional	},
 	...
 }
 
-NAS-DownlinkCount ::= BIT STRING (SIZE (4))
-
 E-RABSubjecttoDataForwardingList ::= E-RAB-IE-ContainerList { {E-RABDataForwardingItemIEs} }
 
 E-RABDataForwardingItemIEs S1AP-PROTOCOL-IES ::= {
@@ -314,12 +329,12 @@ E-RABDataForwardingItemIEs S1AP-PROTOCOL-IES ::= {
 }
 
 E-RABDataForwardingItem ::= SEQUENCE {
-	e-RAB-ID						E-RAB-ID,
-	dL-transportLayerAddress				TransportLayerAddress 	OPTIONAL,
-	dL-gTP-TEID					GTP-TEID 	OPTIONAL,
-	uL-TransportLayerAddress			TransportLayerAddress	OPTIONAL,
-	uL-GTP-TEID							GTP-TEID	OPTIONAL,
-	iE-Extensions					ProtocolExtensionContainer { { E-RABDataForwardingItem-ExtIEs} }			OPTIONAL,
+	e-RAB-ID							E-RAB-ID,
+	dL-transportLayerAddress			TransportLayerAddress 													OPTIONAL,
+	dL-gTP-TEID							GTP-TEID 																OPTIONAL,
+	uL-TransportLayerAddress			TransportLayerAddress													OPTIONAL,
+	uL-GTP-TEID							GTP-TEID																OPTIONAL,
+	iE-Extensions						ProtocolExtensionContainer { { E-RABDataForwardingItem-ExtIEs} }	OPTIONAL,
 	...
 }
 
@@ -343,8 +358,8 @@ HandoverPreparationFailure ::= SEQUENCE {
 HandoverPreparationFailureIEs S1AP-PROTOCOL-IES ::= {	
 	{ ID id-MME-UE-S1AP-ID					CRITICALITY ignore	TYPE MME-UE-S1AP-ID		 			PRESENCE mandatory	} |
 	{ ID id-eNB-UE-S1AP-ID					CRITICALITY ignore	TYPE ENB-UE-S1AP-ID		 			PRESENCE mandatory	} |
-	{ ID id-Cause					CRITICALITY ignore	TYPE Cause		 			PRESENCE mandatory	}|
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
+	{ ID id-Cause							CRITICALITY ignore	TYPE Cause		 					PRESENCE mandatory	}|
+	{ ID id-CriticalityDiagnostics			CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
 
@@ -366,18 +381,20 @@ HandoverRequest ::= SEQUENCE {
 }
 
 HandoverRequestIEs S1AP-PROTOCOL-IES ::= {	
-	{ ID id-MME-UE-S1AP-ID					CRITICALITY reject	TYPE MME-UE-S1AP-ID		 			PRESENCE mandatory	} |
-	{ ID id-HandoverType					CRITICALITY reject	TYPE HandoverType		 			PRESENCE mandatory	} |
-	{ ID id-Cause					CRITICALITY ignore	TYPE Cause		 			PRESENCE mandatory	} |
-	{ ID id-uEaggregateMaximumBitrate		CRITICALITY reject	TYPE UEAggregateMaximumBitrate		PRESENCE mandatory	}|
-	{ ID id-E-RABToBeSetupListHOReq					CRITICALITY reject	TYPE E-RABToBeSetupListHOReq		 			PRESENCE mandatory	} |
-	{ ID id-Source-ToTarget-TransparentContainer		CRITICALITY reject	TYPE Source-ToTarget-TransparentContainer		 			PRESENCE mandatory	} |
-	{ ID id-UESecurityCapabilities		CRITICALITY reject	TYPE UESecurityCapabilities			PRESENCE mandatory	}|
-	{ ID id-HandoverRestrictionList		CRITICALITY ignore	TYPE HandoverRestrictionList	PRESENCE optional	}|
-	{ ID id-TraceActivation				CRITICALITY ignore	TYPE TraceActivation	 		PRESENCE optional	}|
-	{ ID id-RequestType					CRITICALITY ignore	TYPE	RequestType				PRESENCE optional	}|
-	{ ID id-SRVCCOperationPossible		CRITICALITY ignore	TYPE	SRVCCOperationPossible	PRESENCE optional	}|
-	{ ID id-SecurityContext				CRITICALITY reject	TYPE	SecurityContext			PRESENCE mandatory},
+	{ ID id-MME-UE-S1AP-ID							CRITICALITY reject	TYPE MME-UE-S1AP-ID									PRESENCE mandatory	} |
+	{ ID id-HandoverType							CRITICALITY reject	TYPE HandoverType									PRESENCE mandatory	} |
+	{ ID id-Cause									CRITICALITY ignore	TYPE Cause		 									PRESENCE mandatory	} |
+	{ ID id-uEaggregateMaximumBitrate				CRITICALITY reject	TYPE UEAggregateMaximumBitrate					PRESENCE mandatory	}|
+	{ ID id-E-RABToBeSetupListHOReq					CRITICALITY reject	TYPE E-RABToBeSetupListHOReq		 				PRESENCE mandatory	} |
+	{ ID id-Source-ToTarget-TransparentContainer	CRITICALITY reject	TYPE Source-ToTarget-TransparentContainer	PRESENCE mandatory	} |
+	{ ID id-UESecurityCapabilities					CRITICALITY reject	TYPE UESecurityCapabilities						PRESENCE mandatory	}|
+	{ ID id-HandoverRestrictionList					CRITICALITY ignore	TYPE HandoverRestrictionList						PRESENCE optional	}|
+	{ ID id-TraceActivation							CRITICALITY ignore	TYPE TraceActivation								PRESENCE optional	}|
+	{ ID id-RequestType								CRITICALITY ignore	TYPE RequestType									PRESENCE optional	}|
+	{ ID id-SRVCCOperationPossible					CRITICALITY ignore	TYPE SRVCCOperationPossible						PRESENCE optional	}|
+	{ ID id-SecurityContext							CRITICALITY reject	TYPE SecurityContext								PRESENCE mandatory}|
+	{ ID id-NASSecurityParameterstoE-UTRAN			CRITICALITY reject	TYPE NASSecurityParameterstoE-UTRAN			PRESENCE conditional
+	-- This IE shall be present if the Handover Type IE is set to the value "UTRANtoLTE" or "GERANtoLTE" --	},
 	...
 }
 
@@ -389,11 +406,11 @@ E-RABToBeSetupItemHOReqIEs S1AP-PROTOCOL-IES ::= {
 }
 
 E-RABToBeSetupItemHOReq ::= SEQUENCE {
-	e-RAB-ID						E-RAB-ID,
+	e-RAB-ID							E-RAB-ID,
 	transportLayerAddress				TransportLayerAddress,
-	gTP-TEID					GTP-TEID,
+	gTP-TEID							GTP-TEID,
 	e-RABlevelQosParameters				E-RABLevelQoSParameters,
-	iE-Extensions					ProtocolExtensionContainer { {E-RABToBeSetupItemHOReq-ExtIEs} }			OPTIONAL,
+	iE-Extensions						ProtocolExtensionContainer { {E-RABToBeSetupItemHOReq-ExtIEs} }			OPTIONAL,
 	...
 }
 
@@ -413,13 +430,12 @@ HandoverRequestAcknowledge ::= SEQUENCE {
 }
 
 HandoverRequestAcknowledgeIEs S1AP-PROTOCOL-IES ::= {	
-	{ ID id-MME-UE-S1AP-ID					CRITICALITY ignore	TYPE MME-UE-S1AP-ID		 			PRESENCE mandatory	} |
-	{ ID id-eNB-UE-S1AP-ID					CRITICALITY ignore	TYPE ENB-UE-S1AP-ID		 			PRESENCE mandatory	} |
-	{ ID id-HandoverType					CRITICALITY ignore	TYPE HandoverType		 			PRESENCE mandatory	} |
-	{ ID id-E-RABAdmittedList					CRITICALITY ignore	TYPE E-RABAdmittedList		 			PRESENCE mandatory	} |
-	{ ID id-E-RABFailedToSetupListHOReqAck					CRITICALITY ignore	TYPE E-RABFailedtoSetupListHOReqAck		 			PRESENCE optional	} |
-	{ ID id-Target-ToSource-TransparentContainer	CRITICALITY reject TYPE Target-ToSource-TransparentContainer	PRESENCE mandatory }|
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
+	{ ID id-MME-UE-S1AP-ID							CRITICALITY ignore	TYPE MME-UE-S1AP-ID									PRESENCE mandatory	} |
+	{ ID id-eNB-UE-S1AP-ID							CRITICALITY ignore	TYPE ENB-UE-S1AP-ID									PRESENCE mandatory	} |
+	{ ID id-E-RABAdmittedList						CRITICALITY ignore	TYPE E-RABAdmittedList								PRESENCE mandatory	} |
+	{ ID id-E-RABFailedToSetupListHOReqAck			CRITICALITY ignore	TYPE E-RABFailedtoSetupListHOReqAck			PRESENCE optional	} |
+	{ ID id-Target-ToSource-TransparentContainer	CRITICALITY reject	TYPE Target-ToSource-TransparentContainer	PRESENCE mandatory }|
+	{ ID id-CriticalityDiagnostics					CRITICALITY ignore	TYPE CriticalityDiagnostics						PRESENCE optional	},
 	...
 }
 
@@ -432,13 +448,13 @@ E-RABAdmittedItemIEs S1AP-PROTOCOL-IES ::= {
 
 E-RABAdmittedItem ::= SEQUENCE {
 	e-RAB-ID						E-RAB-ID,
-	transportLayerAddress				TransportLayerAddress,
-	gTP-TEID					GTP-TEID,
-	dL-transportLayerAddress				TransportLayerAddress	OPTIONAL,
-	dL-gTP-TEID								GTP-TEID	OPTIONAL,
-	uL-TransportLayerAddress				TransportLayerAddress	OPTIONAL,
-	uL-GTP-TEID								GTP-TEID				OPTIONAL,
-	iE-Extensions					ProtocolExtensionContainer { {E-RABAdmittedItem-ExtIEs} }			OPTIONAL,
+	transportLayerAddress			TransportLayerAddress,
+	gTP-TEID						GTP-TEID,
+	dL-transportLayerAddress		TransportLayerAddress	OPTIONAL,
+	dL-gTP-TEID						GTP-TEID				OPTIONAL,
+	uL-TransportLayerAddress		TransportLayerAddress	OPTIONAL,
+	uL-GTP-TEID						GTP-TEID				OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { {E-RABAdmittedItem-ExtIEs} }	OPTIONAL,
 	...
 }
 
@@ -477,9 +493,9 @@ HandoverFailure ::= SEQUENCE {
 }
 
 HandoverFailureIEs S1AP-PROTOCOL-IES ::= {	
-	{ ID id-MME-UE-S1AP-ID					CRITICALITY ignore	TYPE MME-UE-S1AP-ID		 			PRESENCE mandatory	} |
-	{ ID id-Cause					CRITICALITY ignore	TYPE Cause		 			PRESENCE mandatory	}|
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
+	{ ID id-MME-UE-S1AP-ID				CRITICALITY ignore	TYPE MME-UE-S1AP-ID				PRESENCE mandatory	} |
+	{ ID id-Cause						CRITICALITY ignore	TYPE Cause		 				PRESENCE mandatory	}|
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics		PRESENCE optional	},
 	...
 }
 
@@ -501,11 +517,10 @@ HandoverNotify ::= SEQUENCE {
 }
 
 HandoverNotifyIEs S1AP-PROTOCOL-IES ::= {	
-	{ ID id-MME-UE-S1AP-ID					CRITICALITY reject	TYPE MME-UE-S1AP-ID		 			PRESENCE mandatory	} |
-	{ ID id-eNB-UE-S1AP-ID					CRITICALITY reject	TYPE ENB-UE-S1AP-ID		 			PRESENCE mandatory	} |
-	{ ID id-EUTRAN-CGI			CRITICALITY ignore	TYPE EUTRAN-CGI			PRESENCE mandatory}|
-	{ ID id-TAI					CRITICALITY ignore	TYPE TAI						PRESENCE mandatory}|
-	{ ID id-UESecurityCapabilities			CRITICALITY ignore	TYPE UESecurityCapabilities		 	PRESENCE mandatory	},
+	{ ID id-MME-UE-S1AP-ID			CRITICALITY reject	TYPE MME-UE-S1AP-ID			PRESENCE mandatory	} |
+	{ ID id-eNB-UE-S1AP-ID			CRITICALITY reject	TYPE ENB-UE-S1AP-ID			PRESENCE mandatory	} |
+	{ ID id-EUTRAN-CGI				CRITICALITY ignore	TYPE EUTRAN-CGI				PRESENCE mandatory}|
+	{ ID id-TAI						CRITICALITY ignore	TYPE TAI					PRESENCE mandatory}|
 	...
 }
 
@@ -528,11 +543,11 @@ PathSwitchRequest ::= SEQUENCE {
 
 PathSwitchRequestIEs S1AP-PROTOCOL-IES ::= {	
 	{ ID id-eNB-UE-S1AP-ID					CRITICALITY reject	TYPE ENB-UE-S1AP-ID	 			PRESENCE mandatory	}|
-	{ ID id-E-RABToBeSwitchedDLList					CRITICALITY reject	TYPE E-RABToBeSwitchedDLList		 			PRESENCE mandatory	}|
-	{ ID id-SourceMME-UE-S1AP-ID					CRITICALITY reject	TYPE MME-UE-S1AP-ID	 			PRESENCE mandatory	}|
-	{ ID id-EUTRAN-CGI			CRITICALITY ignore	TYPE EUTRAN-CGI			PRESENCE mandatory}|
-	{ ID id-TAI					CRITICALITY ignore	TYPE TAI						PRESENCE mandatory}|
-	{ ID id-UESecurityCapabilities			CRITICALITY ignore	TYPE UESecurityCapabilities		 	PRESENCE mandatory	},
+	{ ID id-E-RABToBeSwitchedDLList			CRITICALITY reject	TYPE E-RABToBeSwitchedDLList	PRESENCE mandatory	}|
+	{ ID id-SourceMME-UE-S1AP-ID			CRITICALITY reject	TYPE MME-UE-S1AP-ID	 			PRESENCE mandatory	}|
+	{ ID id-EUTRAN-CGI						CRITICALITY ignore	TYPE EUTRAN-CGI					PRESENCE mandatory}|
+	{ ID id-TAI								CRITICALITY ignore	TYPE TAI						PRESENCE mandatory}|
+	{ ID id-UESecurityCapabilities			CRITICALITY ignore	TYPE UESecurityCapabilities		PRESENCE mandatory	},
 	...
 }
 
@@ -585,7 +600,7 @@ E-RABToBeSwitchedULItemIEs S1AP-PROTOCOL-IES ::= {
 }
 
 E-RABToBeSwitchedULItem ::= SEQUENCE {
-	e-RAB-ID						E-RAB-ID,
+	e-RAB-ID							E-RAB-ID,
 	transportLayerAddress				TransportLayerAddress,
 	gTP-TEID							GTP-TEID,
 	iE-Extensions						ProtocolExtensionContainer { { E-RABToBeSwitchedULItem-ExtIEs} }			OPTIONAL,
@@ -676,10 +691,10 @@ E-RABSetupRequest ::= SEQUENCE {
 }
 
 E-RABSetupRequestIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID				CRITICALITY reject	TYPE MME-UE-S1AP-ID	 				PRESENCE mandatory	}|
-	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID	 				PRESENCE mandatory	}|
-	{ ID id-uEaggregateMaximumBitrate		CRITICALITY reject	TYPE UEAggregateMaximumBitrate		PRESENCE optional	}|
-	{ ID id-E-RABToBeSetupListBearerSUReq			CRITICALITY reject	TYPE E-RABToBeSetupListBearerSUReq	 	PRESENCE mandatory	},
+	{ ID id-MME-UE-S1AP-ID					CRITICALITY reject	TYPE MME-UE-S1AP-ID	 						PRESENCE mandatory	}|
+	{ ID id-eNB-UE-S1AP-ID					CRITICALITY reject	TYPE ENB-UE-S1AP-ID	 						PRESENCE mandatory	}|
+	{ ID id-uEaggregateMaximumBitrate		CRITICALITY reject	TYPE UEAggregateMaximumBitrate				PRESENCE optional	}|
+	{ ID id-E-RABToBeSetupListBearerSUReq	CRITICALITY reject	TYPE E-RABToBeSetupListBearerSUReq		PRESENCE mandatory	},
 	...
 }
 
@@ -691,10 +706,10 @@ E-RABToBeSetupItemBearerSUReqIEs 	S1AP-PROTOCOL-IES ::= {
 }
 
 E-RABToBeSetupItemBearerSUReq ::= SEQUENCE {
-	e-RAB-ID					E-RAB-ID,
-	e-RABlevelQoSParameters					E-RABLevelQoSParameters,		
+	e-RAB-ID						E-RAB-ID,
+	e-RABlevelQoSParameters			E-RABLevelQoSParameters,
 	transportLayerAddress 			TransportLayerAddress,
-	gTP-TEID					GTP-TEID,
+	gTP-TEID						GTP-TEID,
 	nAS-PDU							NAS-PDU,
 	iE-Extensions					ProtocolExtensionContainer { {E-RABToBeSetupItemBearerSUReqExtIEs} } OPTIONAL,
 	...
@@ -736,9 +751,9 @@ E-RABSetupItemBearerSUResIEs 	S1AP-PROTOCOL-IES ::= {
 
 E-RABSetupItemBearerSURes ::= SEQUENCE {
 	e-RAB-ID					E-RAB-ID,
-	transportLayerAddress 			TransportLayerAddress,
+	transportLayerAddress		TransportLayerAddress,
 	gTP-TEID					GTP-TEID,
-	iE-Extensions					ProtocolExtensionContainer { {E-RABSetupItemBearerSUResExtIEs} } OPTIONAL,
+	iE-Extensions				ProtocolExtensionContainer { {E-RABSetupItemBearerSUResExtIEs} } OPTIONAL,
 	...
 }
 
@@ -767,10 +782,10 @@ E-RABModifyRequest ::= SEQUENCE {
 }
 
 E-RABModifyRequestIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MME-UE-S1AP-ID				CRITICALITY reject	TYPE MME-UE-S1AP-ID	 				PRESENCE mandatory	}|
-	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID	 				PRESENCE mandatory	}|
-	{ ID id-uEaggregateMaximumBitrate		CRITICALITY reject	TYPE UEAggregateMaximumBitrate		PRESENCE optional	}|
-	{ ID id-E-RABToBeModifiedListBearerModReq		CRITICALITY reject	TYPE E-RABToBeModifiedListBearerModReq	 	PRESENCE mandatory	},
+	{ ID id-MME-UE-S1AP-ID						CRITICALITY reject	TYPE MME-UE-S1AP-ID								PRESENCE mandatory	}|
+	{ ID id-eNB-UE-S1AP-ID						CRITICALITY reject	TYPE ENB-UE-S1AP-ID								PRESENCE mandatory	}|
+	{ ID id-uEaggregateMaximumBitrate			CRITICALITY reject	TYPE UEAggregateMaximumBitrate				PRESENCE optional	}|
+	{ ID id-E-RABToBeModifiedListBearerModReq	CRITICALITY reject	TYPE E-RABToBeModifiedListBearerModReq		PRESENCE mandatory	},
 	...
 }
 
@@ -782,8 +797,8 @@ E-RABToBeModifiedItemBearerModReqIEs 	S1AP-PROTOCOL-IES ::= {
 }
 
 E-RABToBeModifiedItemBearerModReq ::= SEQUENCE {
-	e-RAB-ID					E-RAB-ID,
-	e-RABLevelQoSParameters					E-RABLevelQoSParameters,		
+	e-RAB-ID						E-RAB-ID,
+	e-RABLevelQoSParameters			E-RABLevelQoSParameters,
 	nAS-PDU							NAS-PDU,
 	iE-Extensions					ProtocolExtensionContainer { {E-RABToBeModifyItemBearerModReqExtIEs} } OPTIONAL,
 	...
@@ -851,7 +866,7 @@ E-RABModifyItemBearerModResExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 -- **************************************************************
 
 E-RABReleaseCommand ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {E-RABReleaseCommandIEs} },
+	protocolIEs			ProtocolIE-Container		{ {E-RABReleaseCommandIEs} },
 	...
 }
 
@@ -908,7 +923,7 @@ E-RABReleaseItemBearerRelCompExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 
 -- **************************************************************
 --
--- E-RAB RELEASE REQUEST ELEMENTARY PROCEDURE
+-- E-RAB RELEASE INDICATION ELEMENTARY PROCEDURE
 --
 -- **************************************************************
 
@@ -926,7 +941,7 @@ E-RABReleaseIndication ::= SEQUENCE {
 E-RABReleaseIndicationIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-MME-UE-S1AP-ID				CRITICALITY reject	TYPE MME-UE-S1AP-ID	 				PRESENCE mandatory	}|
 	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID	 				PRESENCE mandatory	}|
-	{ ID id-E-RABReleasedList		CRITICALITY ignore	TYPE E-RABList					PRESENCE mandatory	},
+	{ ID id-E-RABReleasedList			CRITICALITY ignore	TYPE E-RABList					PRESENCE mandatory	},
 	...
 }
 -- **************************************************************
@@ -977,7 +992,7 @@ E-RABToBeSetupItemCtxtSUReq ::= SEQUENCE {
 	e-RABlevelQoSParameters					E-RABLevelQoSParameters,		
 	transportLayerAddress 			TransportLayerAddress,
 	gTP-TEID			GTP-TEID,
-	nAS-PDU				NAS-PDU,
+	nAS-PDU				NAS-PDU		OPTIONAL,
 	iE-Extensions					ProtocolExtensionContainer { {E-RABToBeSetupItemCtxtSUReqExtIEs} } OPTIONAL,
 	...
 }
@@ -1065,11 +1080,12 @@ PagingIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-UEPagingID						CRITICALITY ignore	TYPE UEPagingID				PRESENCE mandatory	} |
 	{ ID id-pagingDRX					CRITICALITY ignore	TYPE PagingDRX			PRESENCE optional	} |
 	{ ID id-CNDomain					CRITICALITY ignore		TYPE CNDomain		PRESENCE mandatory	} |
-	{ ID id-TAIList					CRITICALITY ignore	TYPE TAIList		 	PRESENCE mandatory	},
+	{ ID id-TAIList					CRITICALITY ignore	TYPE TAIList		 	PRESENCE mandatory	}|
+	{ ID id-CSG-Id-List				CRITICALITY ignore	TYPE CSG-Id-List		PRESENCE optional },
 	...
 }
 
-TAIList::= SEQUENCE (SIZE(1.. maxnoofTAI)) OF ProtocolIE-SingleContainer {{TAIItemIEs}}
+TAIList::= SEQUENCE (SIZE(1.. maxnoofTAIs)) OF ProtocolIE-SingleContainer {{TAIItemIEs}}
 
 TAIItemIEs 	S1AP-PROTOCOL-IES ::= {
 	{ ID id-TAIItem	 CRITICALITY ignore		TYPE TAIItem	PRESENCE mandatory },
@@ -1150,7 +1166,7 @@ UEContextReleaseComplete-IEs S1AP-PROTOCOL-IES ::= {
 
 -- **************************************************************
 --
--- UE Context Modification
+-- UE CONTEXT MODIFICATION ELEMENTARY PROCEDURE
 --
 -- **************************************************************
 
@@ -1211,6 +1227,12 @@ UEContextModificationFailureIEs S1AP-PROTOCOL-IES ::= {
 
 -- **************************************************************
 --
+-- NAS TRANSPORT ELEMENTARY PROCEDURES
+--
+-- **************************************************************
+
+-- **************************************************************
+--
 -- DOWNLINK NAS TRANSPORT
 --
 -- **************************************************************
@@ -1241,12 +1263,13 @@ InitialUEMessage ::= SEQUENCE {
 }
 
 InitialUEMessage-IEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-eNB-UE-S1AP-ID			CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory} |
-	{ ID id-NAS-PDU					CRITICALITY reject	TYPE NAS-PDU				PRESENCE mandatory} |
-	{ ID id-TAI					CRITICALITY reject	TYPE TAI						PRESENCE mandatory}|
-	{ ID id-EUTRAN-CGI		CRITICALITY ignore	TYPE EUTRAN-CGI				PRESENCE mandatory} |
-	{ ID id-S-TMSI					CRITICALITY reject	TYPE S-TMSI				PRESENCE optional}|
-	{ ID id-CSG-Id					CRITICALITY reject	TYPE CSG-Id				PRESENCE optional},
+	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID					PRESENCE mandatory} |
+	{ ID id-NAS-PDU						CRITICALITY reject	TYPE NAS-PDU						PRESENCE mandatory} |
+	{ ID id-TAI							CRITICALITY reject	TYPE TAI							PRESENCE mandatory} |
+	{ ID id-EUTRAN-CGI					CRITICALITY ignore	TYPE EUTRAN-CGI						PRESENCE mandatory} |
+	{ ID id-RRC-Establishment-Cause		CRITICALITY ignore	TYPE RRC-Establishment-Cause		PRESENCE mandatory} |
+	{ ID id-S-TMSI						CRITICALITY reject	TYPE S-TMSI							PRESENCE optional} |
+	{ ID id-CSG-Id						CRITICALITY reject	TYPE CSG-Id							PRESENCE optional}.
 	...
 }
 
@@ -1400,10 +1423,11 @@ S1SetupRequest ::= SEQUENCE {
 }
 
 S1SetupRequestIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-Global-ENB-ID				CRITICALITY reject	TYPE Global-ENB-ID	 			PRESENCE mandatory	}|
-	{ ID id-eNBname				CRITICALITY ignore	TYPE ENBname			PRESENCE mandatory	}|
-	{ ID id-SupportedTAs		CRITICALITY reject	TYPE SupportedTAs	 	PRESENCE mandatory	}|
-	{ ID id-CSG-IdList					CRITICALITY reject	TYPE CSG-IdList				PRESENCE optional},
+	{ ID id-Global-ENB-ID	CRITICALITY reject	TYPE Global-ENB-ID	PRESENCE mandatory}|
+	{ ID id-eNBname	CRITICALITY ignore	TYPE ENBname	PRESENCE optional}|
+	{ ID id-SupportedTAs	CRITICALITY reject	TYPE SupportedTAs	PRESENCE mandatory}|
+	{ ID id-DefaultPagingDRX	CRITICALITY ignore	TYPE PagingDRX	PRESENCE mandatory}|
+	{ ID id-CSG-IdList	CRITICALITY reject	TYPE CSG-IdList	PRESENCE optional},
 	...
 }
 
@@ -1420,9 +1444,8 @@ S1SetupResponse ::= SEQUENCE {
 
 
 S1SetupResponseIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-MMEname				CRITICALITY ignore	TYPE MMEname	 		PRESENCE mandatory	}|
-	{ ID id-ServedPLMNs			CRITICALITY ignore	TYPE ServedPLMNs		PRESENCE mandatory	}|
-	{ ID id-ServedGUMMEIs				CRITICALITY ignore	TYPE ServedGUMMEIs				PRESENCE mandatory	}|
+	{ ID id-MMEname				CRITICALITY ignore	TYPE MMEname	 		PRESENCE optional	}|
+	{ ID id-ServedGUMMEIs				CRITICALITY reject	TYPE ServedGUMMEIs				PRESENCE mandatory	}|
 	{ ID id-RelativeMMECapacity					CRITICALITY ignore	TYPE RelativeMMECapacity		 			PRESENCE mandatory	}|
 	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
@@ -1466,7 +1489,8 @@ ENBConfigurationUpdate ::= SEQUENCE {
 ENBConfigurationUpdateIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-eNBname				CRITICALITY ignore	TYPE ENBname			PRESENCE optional	}|
 	{ ID id-SupportedTAs		CRITICALITY reject	TYPE SupportedTAs	 	PRESENCE optional	}|
-	{ ID id-CSG-IdList					CRITICALITY reject	TYPE CSG-IdList				PRESENCE optional},
+	{ ID id-CSG-IdList					CRITICALITY reject	TYPE CSG-IdList				PRESENCE optional}|
+	{ ID id-DefaultPagingDRX	CRITICALITY	ignore	TYPE PagingDRX		PRESENCE optional	},
 	...
 }
 
@@ -1525,7 +1549,6 @@ MMEConfigurationUpdate ::= SEQUENCE {
 
 MMEConfigurationUpdateIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-MMEname				CRITICALITY ignore	TYPE MMEname	 		PRESENCE optional	}|
-	{ ID id-ServedPLMNs			CRITICALITY reject	TYPE ServedPLMNs		PRESENCE optional	}|
 	{ ID id-ServedGUMMEIs			CRITICALITY reject	TYPE ServedGUMMEIs				PRESENCE optional	}|
 	{ ID id-RelativeMMECapacity	CRITICALITY reject	TYPE RelativeMMECapacity	PRESENCE optional},
 	...
@@ -1616,8 +1639,8 @@ UplinkS1cdma2000tunnelingIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-cdma2000RATType				CRITICALITY reject	TYPE Cdma2000RATType 			PRESENCE mandatory	} |
 	{ ID id-cdma2000SectorID			CRITICALITY reject	TYPE Cdma2000SectorID 			PRESENCE mandatory	} |
 	{ ID id-cdma2000HORequiredIndication			CRITICALITY ignore	TYPE Cdma2000HORequiredIndication 			PRESENCE optional	} |
-	{ ID id-cdma2000OneXSRVCCInfo			CRITICALITY ignore	TYPE Cdma2000OneXSRVCCInfo 			PRESENCE optional	} |
-	{ ID id-cdma2000OneXRAND			CRITICALITY ignore	TYPE Cdma2000OneXRAND 			PRESENCE optional	} |
+	{ ID id-cdma2000OneXSRVCCInfo			CRITICALITY reject	TYPE Cdma2000OneXSRVCCInfo 			PRESENCE optional	} |
+	{ ID id-cdma2000OneXRAND			CRITICALITY reject	TYPE Cdma2000OneXRAND 			PRESENCE optional	} |
 	{ ID id-cdma2000PDU					CRITICALITY reject	TYPE Cdma2000PDU	 			PRESENCE mandatory	},
 	...
 }
@@ -1733,7 +1756,7 @@ TraceFailureIndication ::= SEQUENCE {
 TraceFailureIndicationIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-MME-UE-S1AP-ID				CRITICALITY reject	TYPE MME-UE-S1AP-ID				PRESENCE mandatory} |
 	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory} |
-	{ ID id-TraceReference				CRITICALITY ignore	TYPE TraceReference				PRESENCE mandatory} |
+	{ ID id-E-UTRAN-Trace-ID				CRITICALITY ignore	TYPE E-UTRAN-Trace-ID				PRESENCE mandatory} |
 	{ ID id-Cause						CRITICALITY ignore	TYPE Cause						PRESENCE mandatory} ,
 	...
 }
@@ -1758,12 +1781,44 @@ DeactivateTrace ::= SEQUENCE {
 DeactivateTraceIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-MME-UE-S1AP-ID		CRITICALITY reject	TYPE MME-UE-S1AP-ID		PRESENCE mandatory} |
 	{ ID id-eNB-UE-S1AP-ID		CRITICALITY reject	TYPE ENB-UE-S1AP-ID		PRESENCE mandatory} |
-	{ ID id-TraceReference		CRITICALITY ignore	TYPE TraceReference	 	PRESENCE mandatory	},
+	{ ID id-E-UTRAN-Trace-ID		CRITICALITY ignore	TYPE E-UTRAN-Trace-ID	 	PRESENCE mandatory	},
 	...
 }
 
 -- **************************************************************
 --
+-- CELL TRAFFIC TRACE PROCEDURE
+--
+-- **************************************************************
+
+-- **************************************************************
+--
+-- CELL TRAFFIC TRACE
+--
+-- **************************************************************
+
+CellTrafficTrace ::= SEQUENCE {
+protocolIEs		ProtocolIE-Container	{ { CellTrafficTraceIEs } },
+...
+}
+
+CellTrafficTraceIEs S1AP-PROTOCOL-IES ::= {
+	{ID id-MME-UE-S1AP-ID	CRITICALITY reject	TYPE MME-UE-S1AP-ID	PRESENCE mandatory} |
+	{ID id-eNB-UE-S1AP-ID	CRITICALITY reject	TYPE ENB-UE-S1AP-ID	PRESENCE mandatory} |
+	{ID id-E-UTRAN-Trace-ID	CRITICALITY ignore	TYPE E-UTRAN-Trace-ID	PRESENCE mandatory}|
+	{ID id-EUTRAN-CGI	CRITICALITY ignore	TYPE EUTRAN-CGI	PRESENCE mandatory}|
+	{ID id-TraceCollectionEntityIPAddress	CRITICALITY ignore	TYPE TransportLayerAddress	PRESENCE mandatory },
+	...
+}
+
+-- **************************************************************
+--
+-- LOCATION ELEMENTARY PROCEDURE
+--
+-- **************************************************************
+
+-- **************************************************************
+--
 -- Location Reporting Control
 --
 -- **************************************************************
@@ -1794,7 +1849,7 @@ LocationReportingFailureIndication ::= SEQUENCE {
 LocationReportingFailureIndicationIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-MME-UE-S1AP-ID			CRITICALITY reject	TYPE MME-UE-S1AP-ID				PRESENCE mandatory} |
 	{ ID id-eNB-UE-S1AP-ID			CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory} |
-	{ ID id-Cause					CRITICALITY ignore	TYPE Cause						PRESENCE optional	} ,
+	{ ID id-Cause					CRITICALITY ignore	TYPE Cause						PRESENCE mandatory},
 	...
 }
 
@@ -1820,6 +1875,12 @@ LocationReportIEs S1AP-PROTOCOL-IES ::= {
 
 -- **************************************************************
 --
+-- OVERLOAD ELEMENTARY PROCEDURE
+--
+-- **************************************************************
+
+-- **************************************************************
+--
 -- Overload Start
 --
 -- **************************************************************
@@ -1849,7 +1910,7 @@ OverloadStopIEs S1AP-PROTOCOL-IES ::= {
 }
 -- **************************************************************
 --
--- WRITE-REPLACE WARNING PROCEDURE 
+-- WRITE-REPLACE WARNING ELEMENTARY PROCEDURE 
 --
 -- **************************************************************
 
@@ -1873,8 +1934,8 @@ WriteReplaceWarningRequestIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-NumberofBroadcastRequest	CRITICALITY reject	TYPE NumberofBroadcastRequest	PRESENCE mandatory	}|
 	{ ID id-WarningType					CRITICALITY ignore	TYPE WarningType			PRESENCE optional		}|
 	{ ID id-WarningSecurityInfo			CRITICALITY ignore	TYPE WarningSecurityInfo	PRESENCE optional		}|
-	{ ID id-DataCodingScheme			CRITICALITY reject	TYPE DataCodingScheme		PRESENCE mandatory		}|
-	{ ID id-WarningMessageContents		CRITICALITY reject	TYPE WarningMessageContents		PRESENCE mandatory		},
+	{ ID id-DataCodingScheme			CRITICALITY ignore	TYPE DataCodingScheme		PRESENCE optional		}|
+	{ ID id-WarningMessageContents		CRITICALITY ignore	TYPE WarningMessageContents		PRESENCE optional		},
 	...
 }
 -- **************************************************************
@@ -1944,7 +2005,49 @@ MMEDirectInformationTransferIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-Inter-SystemInformationTransferTypeMDT		CRITICALITY reject	TYPE Inter-SystemInformationTransferType				PRESENCE mandatory}  ,
 	...
 }
+-- **************************************************************
+--
+-- eNB CONFIGURATION TRANSFER ELEMENTARY PROCEDURE
+--
+-- **************************************************************
 
+-- **************************************************************
+--
+-- eNB Configuration Transfer
+--
+-- **************************************************************
+
+ENBConfigurationTransfer ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       {{ ENBConfigurationTransferIEs}},
+	...
+}
+
+ENBConfigurationTransferIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-SONConfigurationTransferECT		CRITICALITY ignore	TYPE SONConfigurationTransfer				PRESENCE optional}  ,
+	...
+}
+
+-- **************************************************************
+--
+-- MME CONFIGURATION TRANSFER ELEMENTARY PROCEDURE
+--
+-- **************************************************************
+
+-- **************************************************************
+--
+-- MME Configuration Transfer
+--
+-- **************************************************************
+
+MMEConfigurationTransfer ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       {{ MMEConfigurationTransferIEs}},
+	...
+}
+
+MMEConfigurationTransferIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-SONConfigurationTransferMCT		CRITICALITY ignore	TYPE SONConfigurationTransfer				PRESENCE optional}  ,
+	...
+}
 
 -- **************************************************************
 --
@@ -1968,3 +2071,4 @@ PrivateMessageIEs S1AP-PRIVATE-IES ::= {
 }
 
 END
+
diff --git a/asn1/s1ap/S1AP-PDU-Descriptions.asn b/asn1/s1ap/S1AP-PDU-Descriptions.asn
index 897fc9c1ba..2429fc6237 100644
--- a/asn1/s1ap/S1AP-PDU-Descriptions.asn
+++ b/asn1/s1ap/S1AP-PDU-Descriptions.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V8.4.0 (2008-12)
+-- 3GPP TS 36.413 V8.5.0 (2009-03)
 -- 9.3.2	Elementary Procedure Definitions
 -- **************************************************************
 --
@@ -26,6 +26,7 @@ IMPORTS
 	ProcedureCode
 FROM S1AP-CommonDataTypes
 
+	CellTrafficTrace,
 	DeactivateTrace,
 	DownlinkNASTransport,
 	DownlinkS1cdma2000tunneling,
@@ -88,11 +89,14 @@ FROM S1AP-CommonDataTypes
 	UplinkNASTransport,
 	UplinkS1cdma2000tunneling,
 	WriteReplaceWarningRequest,
-	WriteReplaceWarningResponse
+	WriteReplaceWarningResponse,
+	ENBConfigurationTransfer,
+	MMEConfigurationTransfer
 
 
 FROM S1AP-PDU-Contents
 	
+	id-CellTrafficTrace,
 	id-DeactivateTrace,
 	id-downlinkNASTransport,
 	id-DownlinkS1cdma2000tunneling,
@@ -132,7 +136,9 @@ FROM S1AP-PDU-Contents
 	id-UEContextReleaseRequest,
 	id-uplinkNASTransport,
 	id-UplinkS1cdma2000tunneling,
-	id-WriteReplaceWarning
+	id-WriteReplaceWarning,
+	id-eNBConfigurationTransfer,
+	id-MMEConfigurationTransfer
 FROM S1AP-Constants;
 
 
@@ -150,11 +156,11 @@ S1AP-ELEMENTARY-PROCEDURE ::= CLASS {
 	&criticality			Criticality 	DEFAULT ignore
 }
 WITH SYNTAX {
-	INITIATING MESSAGE		&InitiatingMessage
-	[SUCCESSFUL OUTCOME		&SuccessfulOutcome]
+	INITIATING MESSAGE			&InitiatingMessage
+	[SUCCESSFUL OUTCOME			&SuccessfulOutcome]
 	[UNSUCCESSFUL OUTCOME		&UnsuccessfulOutcome]
 	PROCEDURE CODE				&procedureCode
-	[CRITICALITY			&criticality]
+	[CRITICALITY				&criticality]
 }
 
 -- **************************************************************
@@ -172,19 +178,19 @@ S1AP-PDU ::= CHOICE {
 
 InitiatingMessage ::= SEQUENCE {
 	procedureCode	S1AP-ELEMENTARY-PROCEDURE.&procedureCode	({S1AP-ELEMENTARY-PROCEDURES}),
-	criticality	S1AP-ELEMENTARY-PROCEDURE.&criticality		({S1AP-ELEMENTARY-PROCEDURES}{@procedureCode}),
+	criticality	S1AP-ELEMENTARY-PROCEDURE.&criticality			({S1AP-ELEMENTARY-PROCEDURES}{@procedureCode}),
 	value		S1AP-ELEMENTARY-PROCEDURE.&InitiatingMessage	({S1AP-ELEMENTARY-PROCEDURES}{@procedureCode})
 }
 
 SuccessfulOutcome ::= SEQUENCE {
 	procedureCode	S1AP-ELEMENTARY-PROCEDURE.&procedureCode	({S1AP-ELEMENTARY-PROCEDURES}),
-	criticality	S1AP-ELEMENTARY-PROCEDURE.&criticality		({S1AP-ELEMENTARY-PROCEDURES}{@procedureCode}),
+	criticality	S1AP-ELEMENTARY-PROCEDURE.&criticality			({S1AP-ELEMENTARY-PROCEDURES}{@procedureCode}),
 	value		S1AP-ELEMENTARY-PROCEDURE.&SuccessfulOutcome	({S1AP-ELEMENTARY-PROCEDURES}{@procedureCode})
 }
 
 UnsuccessfulOutcome ::= SEQUENCE {
 	procedureCode	S1AP-ELEMENTARY-PROCEDURE.&procedureCode	({S1AP-ELEMENTARY-PROCEDURES}),
-	criticality	S1AP-ELEMENTARY-PROCEDURE.&criticality		({S1AP-ELEMENTARY-PROCEDURES}{@procedureCode}),
+	criticality	S1AP-ELEMENTARY-PROCEDURE.&criticality			({S1AP-ELEMENTARY-PROCEDURES}{@procedureCode}),
 	value		S1AP-ELEMENTARY-PROCEDURE.&UnsuccessfulOutcome	({S1AP-ELEMENTARY-PROCEDURES}{@procedureCode})
 }
 
@@ -205,9 +211,9 @@ S1AP-ELEMENTARY-PROCEDURES-CLASS-1 S1AP-ELEMENTARY-PROCEDURE ::= {
 	handoverPreparation				|
 	handoverResourceAllocation		|
 	pathSwitchRequest 				|
-	e-RABSetup					|
-	e-RABModify					|
-	e-RABRelease				|
+	e-RABSetup						|
+	e-RABModify						|
+	e-RABRelease					|
 	initialContextSetup				|
 	handoverCancel					|
 	reset							|
@@ -224,8 +230,8 @@ S1AP-ELEMENTARY-PROCEDURES-CLASS-2 S1AP-ELEMENTARY-PROCEDURE ::= {
 	handoverNotification			|
 	e-RABReleaseIndication			|
 	paging 							|
-	downlinkNASTransport						|
-	initialUEMessage							|
+	downlinkNASTransport			|
+	initialUEMessage				|
 	uplinkNASTransport				|
 	errorIndication					|
 	nASNonDeliveryIndication		|
@@ -238,13 +244,16 @@ S1AP-ELEMENTARY-PROCEDURES-CLASS-2 S1AP-ELEMENTARY-PROCEDURE ::= {
 	deactivateTrace					|
 	traceStart						|
 	traceFailureIndication			|
+	CellTrafficTrace				|
 	locationReportingControl		|
-	locationReportingFailureIndication		|
+	locationReportingFailureIndication	|
 	locationReport					|
 	overloadStart					|
 	overloadStop					|
 	eNBDirectInformationTransfer	|
 	mMEDirectInformationTransfer	|
+	eNBConfigurationTransfer		|
+	mMEConfigurationTransfer		|
 	privateMessage					,
 	...
 }
@@ -462,6 +471,11 @@ traceFailureIndication S1AP-ELEMENTARY-PROCEDURE ::= {
 	PROCEDURE CODE		id-TraceFailureIndication
 	CRITICALITY			ignore
 }
+cellTrafficTrace S1AP-ELEMENTARY-PROCEDURE ::={
+INITIATING MESSAGE CellTrafficTrace
+PROCEDURE CODE      id-CellTrafficTrace
+CRITICALITY         ignore
+}
 
 locationReportingControl S1AP-ELEMENTARY-PROCEDURE ::= {
 	INITIATING MESSAGE		LocationReportingControl
@@ -512,6 +526,19 @@ mMEDirectInformationTransfer S1AP-ELEMENTARY-PROCEDURE ::= {
 	CRITICALITY			ignore
 }
 
+eNBConfigurationTransfer S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		ENBConfigurationTransfer
+	PROCEDURE CODE			id-eNBConfigurationTransfer
+	CRITICALITY				ignore
+}
+
+mMEConfigurationTransfer S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		MMEConfigurationTransfer
+	PROCEDURE CODE			id-MMEConfigurationTransfer
+	CRITICALITY				ignore
+}
+
+
 privateMessage S1AP-ELEMENTARY-PROCEDURE ::= {
 	INITIATING MESSAGE	PrivateMessage
 	PROCEDURE CODE		id-PrivateMessage
@@ -521,3 +548,4 @@ privateMessage S1AP-ELEMENTARY-PROCEDURE ::= {
 END
 
 
+
diff --git a/asn1/s1ap/packet-s1ap-template.c b/asn1/s1ap/packet-s1ap-template.c
index d5f2a05c14..52b5e2a7da 100644
--- a/asn1/s1ap/packet-s1ap-template.c
+++ b/asn1/s1ap/packet-s1ap-template.c
@@ -66,10 +66,13 @@ static dissector_handle_t nas_eps_handle;
 /* Initialize the protocol and registered fields */
 static int proto_s1ap = -1;
 
+static int hf_s1ap_transportLayerAddressIPv4 = -1;
+static int hf_s1ap_transportLayerAddressIPv6 = -1;
 #include "packet-s1ap-hf.c"
 
 /* Initialize the subtree pointers */
 static int ett_s1ap = -1;
+static int ett_s1ap_TransportLayerAddress = -1;
 
 #include "packet-s1ap-ett.c"
 
@@ -187,6 +190,14 @@ void proto_register_s1ap(void) {
   /* List of fields */
 
   static hf_register_info hf[] = {
+    { &hf_s1ap_transportLayerAddressIPv4,
+      { "transportLayerAddress(IPv4)", "s1ap.transportLayerAddressIPv4",
+        FT_IPv4, BASE_DEC, NULL, 0,
+        NULL, HFILL }},
+    { &hf_s1ap_transportLayerAddressIPv6,
+      { "transportLayerAddress(IPv6)", "s1ap.transportLayerAddressIPv6",
+        FT_IPv4, BASE_HEX, NULL, 0,
+        NULL, HFILL }},
 
 #include "packet-s1ap-hfarr.c"
   };
@@ -194,6 +205,7 @@ void proto_register_s1ap(void) {
   /* List of subtrees */
   static gint *ett[] = {
 		  &ett_s1ap,
+		  &ett_s1ap_TransportLayerAddress,
 #include "packet-s1ap-ettarr.c"
   };
 
diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf
index aae81b4374..98e1fa1fe7 100644
--- a/asn1/s1ap/s1ap.cnf
+++ b/asn1/s1ap/s1ap.cnf
@@ -43,7 +43,7 @@ UnsuccessfulOutcome/value unsuccessfulOutcome_value
 SuccessfulOutcome/value successfulOutcome_value
 
 
-#PrivateIE-Field/id private_id
+PrivateIE-Field/id private_id
 ProtocolExtensionField/id ext_id
 
 #PrivateIE-Field/value private_value
@@ -199,6 +199,30 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
   if ((tvb_length(parameter_tvb)>0)&&(nas_eps_handle))
     call_dissector(nas_eps_handle,parameter_tvb,%(ACTX)s->pinfo, tree);
 
+#.FN_BODY TransportLayerAddress VAL_PTR = &parameter_tvb
+  tvbuff_t *parameter_tvb=NULL;
+  proto_tree *subtree;
+  gint tvb_len;
+  
+%(DEFAULT_BODY)s
+  if (!parameter_tvb)
+    return offset;
+
+# The Transport Layer Address signalled in S1-AP messages is a bit string of 
+# a)	32 bits in case of IPv4 address according to [6]; and
+# b)	128 bits in case of IPv6 address according to [5].
+	/* Get the length */
+	tvb_len = tvb_length(tvb);
+	subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_TransportLayerAddress);
+	if (tvb_len==4){
+		/* IPv4 */
+		 proto_tree_add_item(subtree, hf_s1ap_transportLayerAddressIPv4, tvb, 0, tvb_len, FALSE);
+	}
+	if (tvb_len==16){
+		/* IPv6 */
+		 proto_tree_add_item(subtree, hf_s1ap_transportLayerAddressIPv6, tvb, 0, tvb_len, FALSE);
+	}
+
 #.TYPE_ATTR
 ProtocolExtensionID TYPE = FT_UINT8  DISPLAY = BASE_DEC STRINGS = VALS(s1ap_ProtocolIE_ID_vals)
 
@@ -245,7 +269,9 @@ id-WriteReplaceWarning					ProcedureCode
 id-eNBDirectInformationTransfer			ProcedureCode
 id-MMEDirectInformationTransfer			ProcedureCode
 id-PrivateMessage						ProcedureCode
-
+id-eNBConfigurationTransfer				ProcedureCode
+id-MMEConfigurationTransfer				ProcedureCode
+id-CellTrafficTrace						ProcedureCode
 
 # ProtocolIE-ID
 id-MME-UE-S1AP-ID									ProtocolIE-ID
@@ -315,7 +341,7 @@ id-Direct-Forwarding-Path-Availability				ProtocolIE-ID
 id-UEIdentityIndexValue								ProtocolIE-ID
 id-cdma2000HOStatus									ProtocolIE-ID
 id-cdma2000HORequiredIndication						ProtocolIE-ID
-id-TraceReference									ProtocolIE-ID
+id-E-UTRAN-Trace-ID									ProtocolIE-ID
 id-RelativeMMECapacity								ProtocolIE-ID
 id-SourceMME-UE-S1AP-ID								ProtocolIE-ID
 id-Bearers-SubjectToStatusTransfer-Item				ProtocolIE-ID
@@ -359,7 +385,15 @@ id-SRVCCHOIndication								ProtocolIE-ID
 id-NAS-DownlinkCount								ProtocolIE-ID
 id-CSG-Id											ProtocolIE-ID
 id-CSG-IdList										ProtocolIE-ID
-
+id-SONConfigurationTransferECT						ProtocolIE-ID
+id-SONConfigurationTransferMCT						ProtocolIE-ID
+id-TraceCollectionEntityIPAddress					ProtocolIE-ID
+id-MSClassmark2										ProtocolIE-ID
+id-MSClassmark3										ProtocolIE-ID
+id-RRC-Establishment-Cause							ProtocolIE-ID
+id-NASSecurityParametersfromE-UTRAN					ProtocolIE-ID
+id-NASSecurityParameterstoE-UTRAN					ProtocolIE-ID
+id-DefaultPagingDRX									ProtocolIE-ID
 #.END
 
 #.REGISTER_NEW
@@ -431,7 +465,6 @@ Direct-Forwarding-Path-Availability		N s1ap.ies id-Direct-Forwarding-Path-Availa
 UEIdentityIndexValue					N s1ap.ies id-UEIdentityIndexValue								
 Cdma2000HOStatus						N s1ap.ies id-cdma2000HOStatus
 Cdma2000HORequiredIndication			N s1ap.ies id-cdma2000HORequiredIndication
-TraceReference							N s1ap.ies id-TraceReference
 RelativeMMECapacity						N s1ap.ies id-RelativeMMECapacity
 MME-UE-S1AP-ID							N s1ap.ies id-SourceMME-UE-S1AP-ID
 Bearers-SubjectToStatusTransfer-Item	N s1ap.ies id-Bearers-SubjectToStatusTransfer-Item
@@ -471,9 +504,17 @@ Inter-SystemInformationTransferType		N s1ap.ies id-Inter-SystemInformationTransf
 Target-ToSource-TransparentContainer	N s1ap.ies id-Target-ToSource-TransparentContainer
 SRVCCOperationPossible					N s1ap.ies id-SRVCCOperationPossible
 SRVCCHOIndication						N s1ap.ies id-SRVCCHOIndication
-NAS-DownlinkCount						N s1ap.ies id-NAS-DownlinkCount
 CSG-Id									N s1ap.ies id-CSG-Id
 CSG-IdList								N s1ap.ies id-CSG-IdList
+SONConfigurationTransfer				N s1ap.ies id-SONConfigurationTransferECT
+SONConfigurationTransfer				N s1ap.ies id-SONConfigurationTransferMCT
+TransportLayerAddress					N s1ap.ies id-TraceCollectionEntityIPAddress
+MSClassmark2							N s1ap.ies id-MSClassmark2
+MSClassmark3							N s1ap.ies id-MSClassmark3
+RRC-Establishment-Cause					N s1ap.ies id-RRC-Establishment-Cause
+NASSecurityParametersfromE-UTRAN		N s1ap.ies id-NASSecurityParametersfromE-UTRAN
+NASSecurityParameterstoE-UTRAN			N s1ap.ies id-NASSecurityParameterstoE-UTRAN
+PagingDRX								N s1ap.ies id-DefaultPagingDRX
 
 #S1AP-PROTOCOL-IES-PAIR
 #RAB-SetupOrModifyItemFirst         N s1ap.ies.pair.first id-RAB-SetupOrModifyItem
@@ -587,6 +628,13 @@ MMEDirectInformationTransfer			N s1ap.proc.imsg id-MMEDirectInformationTransfer
 
 PrivateMessage							N s1ap.proc.imsg id-PrivateMessage
 
+ENBConfigurationTransfer				N s1ap.proc.imsg id-eNBConfigurationTransfer
+
+MMEConfigurationTransfer				N s1ap.proc.imsg id-MMEConfigurationTransfer
+
+CellTrafficTrace						N s1ap.proc.imsg id-CellTrafficTrace
+
+
 #.TYPE_ATTR
 BitRate TYPE = FT_UINT64 DISPLAY = BASE_DEC STRINGS = NULL
 #.END