Update to the latest asn1 files and try to get rid of unused code warnings.

svn path=/trunk/; revision=26270

7 files changed, 332 insertions, 235 deletions

diff --git a/asn1/s1ap/S1AP-CommonDataTypes.asn b/asn1/s1ap/S1AP-CommonDataTypes.asn
index 923b7506a4..27ee7bae36 100644
--- a/asn1/s1ap/S1AP-CommonDataTypes.asn
+++ b/asn1/s1ap/S1AP-CommonDataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V8.2.0 (2008-06)
+-- 3GPP TS 36.413 V8.3.0 (2008-09
 -- 9.3.5	Common Definitions
 -- **************************************************************
 --
@@ -34,3 +34,4 @@ TriggeringMessage	::= ENUMERATED { initiating-message, successful-outcome, unsuc
 
 END
 
+
diff --git a/asn1/s1ap/S1AP-Constants.asn b/asn1/s1ap/S1AP-Constants.asn
index 45360c97ad..6e3d8004fe 100644
--- a/asn1/s1ap/S1AP-Constants.asn
+++ b/asn1/s1ap/S1AP-Constants.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V8.2.0 (2008-06)
+-- 3GPP TS 36.413 V8.3.0 (2008-09)
 -- 9.3.6	Constant Definitions
 -- **************************************************************
 --
@@ -68,6 +68,8 @@ id-MMEConfigurationUpdate			ProcedureCode ::= 30
 id-LocationReportingControl			ProcedureCode ::= 31
 id-LocationReportingFailureIndication	ProcedureCode ::= 32
 id-LocationReport					ProcedureCode ::= 33
+id-OverloadStart					ProcedureCode ::= 34
+id-OverloadStop						ProcedureCode ::= 35
 
 -- **************************************************************
 --
@@ -93,9 +95,10 @@ maxnoofBPLMNs							INTEGER ::= 6
 maxnoofPLMNsPerMME						INTEGER ::= 32 -- FFS
 maxnoofEPLMNs							INTEGER ::= 15
 maxnoofEPLMNsPlusOne					INTEGER ::= 16
-maxnoofForbLACs							INTEGER ::= 256		-- FFS Value to be checked
-maxnoofForbTACs							INTEGER ::= 256		-- FFS Value to be checked
+maxnoofForbLACs							INTEGER ::= 4096		
+maxnoofForbTACs							INTEGER ::= 4096		
 maxNrOfIndividualS1ConnectionsToReset	INTEGER ::= 256
+maxnoofGUMMEIs							INTEGER ::= 256 -- FFS
 
 
 
@@ -159,18 +162,16 @@ id-SAEBearerSetupItemCtxtSURes					ProtocolIE-ID ::= 50
 id-SAEBearerSetupListCtxtSURes					ProtocolIE-ID ::= 51
 id-SAEBearerToBeSetupItemCtxtSUReq				ProtocolIE-ID ::= 52
 id-SAEBearerToBeSetupListHOReq					ProtocolIE-ID ::= 53
-id-GERANtoLTEHOInformationReq					ProtocolIE-ID ::= 54
 id-GERANtoLTEHOInformationRes					ProtocolIE-ID ::= 55
-id-UTRANtoLTEHOInformationReq					ProtocolIE-ID ::= 56
 id-UTRANtoLTEHOInformationRes					ProtocolIE-ID ::= 57
 id-CriticalityDiagnostics 						ProtocolIE-ID ::= 58
-id-ENB-Global-ID								ProtocolIE-ID ::= 59
+id-Global-ENB-ID								ProtocolIE-ID ::= 59
 id-eNBname										ProtocolIE-ID ::= 60
 id-MMEname										ProtocolIE-ID ::= 61
 id-ServedPLMNs									ProtocolIE-ID ::= 63
 id-SupportedTAs									ProtocolIE-ID ::= 64
 id-TimeToWait									ProtocolIE-ID ::= 65
-id-aggregateMaximumBitrate						ProtocolIE-ID ::= 66
+id-uEaggregateMaximumBitrate						ProtocolIE-ID ::= 66
 id-TAI											ProtocolIE-ID ::= 67
 id-SAEBearerReleaseListBearerRelComp			ProtocolIE-ID ::= 69
 id-cdma2000PDU									ProtocolIE-ID ::= 70
@@ -184,7 +185,6 @@ id-Direct-Forwarding-Path-Availability			ProtocolIE-ID ::= 79
 id-UEIdentityIndexValue							ProtocolIE-ID ::= 80
 id-cdma2000HOStatus								ProtocolIE-ID ::= 83
 id-cdma2000HORequiredIndication					ProtocolIE-ID ::= 84
-id-cdma2000OneXMEID								ProtocolIE-ID ::= 85
 id-TraceReference								ProtocolIE-ID ::= 86
 id-RelativeMMECapacity							ProtocolIE-ID ::= 87
 id-SourceMME-UE-S1AP-ID							ProtocolIE-ID ::= 88
@@ -199,8 +199,14 @@ id-S-TMSI										ProtocolIE-ID ::= 96
 id-cdma2000OneXRAND								ProtocolIE-ID ::= 97
 id-RequestType									ProtocolIE-ID ::= 98
 id-UE-S1AP-IDs									ProtocolIE-ID ::= 99
-id-EUTRAN-CGI-ID								ProtocolIE-ID ::= 100
-
+id-EUTRAN-CGI								ProtocolIE-ID ::= 100
+id-OverloadResponse								ProtocolIE-ID ::= 101
+id-cdma2000OneXSRVCCInfo						ProtocolIE-ID ::= 102
+id-SAEBearerFailedToSwitchDLList				ProtocolIE-ID ::= 103
+id-SourceeNodeB-ToTargeteNodeB-TransparentContainer	ProtocolIE-ID ::= 104
+id-ServedGUMMEIs								ProtocolIE-ID ::= 105
+id-SubscriberProfileIDforRFP					ProtocolIE-ID ::= 106
 END
 
 
+
diff --git a/asn1/s1ap/S1AP-Containers.asn b/asn1/s1ap/S1AP-Containers.asn
index b84a31ed5d..93a60892f8 100644
--- a/asn1/s1ap/S1AP-Containers.asn
+++ b/asn1/s1ap/S1AP-Containers.asn
@@ -200,3 +200,4 @@ PrivateIE-Field {S1AP-PRIVATE-IES : IEsSetParam} ::= SEQUENCE {
 
 END
 
+
diff --git a/asn1/s1ap/S1AP-IEs.asn b/asn1/s1ap/S1AP-IEs.asn
index 6205383d87..33b67ff778 100644
--- a/asn1/s1ap/S1AP-IEs.asn
+++ b/asn1/s1ap/S1AP-IEs.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V8.2.0 (2008-06)
+-- 3GPP TS 36.413 V8.3.0 (2008-09)
 -- 9.3.4	Information Element Definitions
 -- **************************************************************
 --
@@ -21,7 +21,6 @@ IMPORTS
 	id-Bearers-SubjectToStatusTransfer-Item,
 	maxNrOfSAEBs,
 	maxNrOfInterfaces,
-	
 	maxNrOfErrors,
 	maxnoofBPLMNs,
 	maxnoofPLMNsPerMME,
@@ -30,7 +29,8 @@ IMPORTS
 	maxnoofEPLMNsPlusOne,
 	maxnoofForbLACs,
 	maxnoofForbTACs,
-	maxnoofTACs
+	maxnoofTACs,
+	maxnoofGUMMEIs
 
 FROM S1AP-Constants
 
@@ -49,30 +49,13 @@ FROM S1AP-Containers;
 
 -- A
 
-AllocationRetentionPriority ::= SEQUENCE {
-	priorityLevel			PriorityLevel, 
-	iE-Extensions			ProtocolExtensionContainer { {AllocationRetentionPriority-ExtIEs} } OPTIONAL,
-	...
-}
+AllocationRetentionPriority ::= INTEGER (0..15)
 
-AllocationRetentionPriority-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-	...
-}
 
-AggregateMaximumBitrate ::= SEQUENCE {
-	aggregateMaximumBitRateDL				SAE-Bearer-BitRate,
-	aggregateMaximumBitRateUL				SAE-Bearer-BitRate,
-	iE-Extensions							ProtocolExtensionContainer { {Aggregate-MaximumBitrates-ExtIEs} } OPTIONAL,
-	...
-}
-
-Aggregate-MaximumBitrates-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-	...
-}
 
 -- B
 
-Bearers-SubjectToStatusTransferList ::= SEQUENCE (SIZE(0.. maxNrOfSAEBs)) OF ProtocolIE-SingleContainer { { Bearers-SubjectToStatusTransfer-ItemIEs } }
+Bearers-SubjectToStatusTransferList ::= SEQUENCE (SIZE(1.. maxNrOfSAEBs)) OF ProtocolIE-SingleContainer { { Bearers-SubjectToStatusTransfer-ItemIEs } }
 
 Bearers-SubjectToStatusTransfer-ItemIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-Bearers-SubjectToStatusTransfer-Item	CRITICALITY ignore	TYPE Bearers-SubjectToStatusTransfer-Item 	PRESENCE mandatory	},
@@ -91,6 +74,8 @@ Bearers-SubjectToStatusTransfer-ItemExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+BitRate	::= INTEGER (0..10000000000) 
+
 BPLMNs ::= SEQUENCE (SIZE(1.. maxnoofBPLMNs)) OF PLMNidentity
 
 
@@ -144,6 +129,13 @@ CauseRadioNetwork ::= ENUMERATED {
 	unknown-mme-ue-s1ap-id,
 	unknown-enb-ue-s1ap-id,
 	unknown-pair-ue-s1ap-id,
+	handover-desirable-for-radio-reason,
+	time-critical-handover,
+	resource-optimisation-handover,
+	reduce-load-in-serving-cell,
+	user-inactivity,
+	radio-connection-with-ue-lost,
+	load-balancing-tau-required,
 	...
 
 }
@@ -162,6 +154,7 @@ CauseNas ::= ENUMERATED {
 	...
 }
 
+CellIdentity			::= BIT STRING (SIZE (28))
 
 Cdma2000PDU	::= OCTET STRING
 
@@ -184,14 +177,31 @@ Cdma2000HORequiredIndication ::= ENUMERATED {
 	...
 }
 
+Cdma2000OneXSRVCCInfo ::= SEQUENCE {
+	cdma2000OneXMEID			Cdma2000OneXMEID,
+	cdma2000OneXMSI				Cdma2000OneXMSI,
+	cdma2000OneXPilot			Cdma2000OneXPilot,
+	iE-Extensions				ProtocolExtensionContainer { {Cdma2000OneXSRVCCInfo-ExtIEs} } OPTIONAL,
+	...
+}
+
+Cdma2000OneXSRVCCInfo-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 Cdma2000OneXMEID ::= OCTET STRING
 
+Cdma2000OneXMSI ::= OCTET STRING
+
+Cdma2000OneXPilot ::= OCTET STRING
+
 Cdma2000OneXRAND ::= OCTET STRING
 
 CGI ::= SEQUENCE {
 	pLMNidentity				PLMNidentity,
 	lAC				LAC,
-	cI				CI
+	cI				CI,
+	rAC				RAC						OPTIONAL
 	}
 
 
@@ -221,7 +231,7 @@ CriticalityDiagnostics-IE-List ::= SEQUENCE (SIZE (1..maxNrOfErrors)) OF Critica
 CriticalityDiagnostics-IE-Item ::= 	SEQUENCE {
 	iECriticality			Criticality,
 	iE-ID					ProtocolIE-ID,
-	typeOfError 			TypeOfError				OPTIONAL,
+	typeOfError 			TypeOfError,
 	iE-Extensions			ProtocolExtensionContainer {{CriticalityDiagnostics-IE-Item-ExtIEs}} OPTIONAL,
 	...
 }
@@ -245,6 +255,24 @@ Direct-Forwarding-Path-Availability ::= ENUMERATED {
 
 -- E
 
+ENB-ID ::= CHOICE {
+	macroENB-ID			BIT STRING (SIZE(20)),
+	homeENB-ID			BIT STRING (SIZE(28)),
+	...
+}
+
+Global-ENB-ID ::= SEQUENCE {
+	pLMNidentity			PLMNidentity,
+	eNB-ID					ENB-ID,
+	iE-Extensions			ProtocolExtensionContainer { {GlobalENB-ID-ExtIEs} } OPTIONAL,
+	...
+}
+
+GlobalENB-ID-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
 ENB-StatusTransfer-TransparentContainer		::= SEQUENCE {
 	bearers-SubjectToStatusTransferList		Bearers-SubjectToStatusTransferList		OPTIONAL,
 	iE-Extensions			ProtocolExtensionContainer { {ENB-StatusTransfer-TransparentContainer-ExtIEs} } OPTIONAL,
@@ -256,7 +284,6 @@ ENB-StatusTransfer-TransparentContainer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 }
 
 ENB-UE-S1AP-ID				::= INTEGER (0..16777215)
-ENB-Global-ID							::= INTEGER (0..65535)
 
 ENBname ::= OCTET STRING
 
@@ -268,7 +295,17 @@ EventType	::= ENUMERATED {
 	...
 }
 
-EUTRAN-CGI-ID ::= OCTET STRING
+EUTRAN-CGI ::= SEQUENCE {
+	pLMNidentity			PLMNidentity,
+	cell-ID					CellIdentity,
+	iE-Extensions			ProtocolExtensionContainer { {EUTRAN-CGI-ExtIEs} } OPTIONAL,
+	...
+}
+
+EUTRAN-CGI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 ExtendedRNC-ID					::= INTEGER (4096..65535)
 
 -- F
@@ -300,6 +337,20 @@ 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,
+	...
+}
+
+GBR-QosInformation-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
 GTP-TEID					::= OCTET STRING (SIZE (4))
 
 GUMMEI			::= SEQUENCE {
@@ -400,6 +451,19 @@ NAS-PDU ::=  OCTET STRING
 
 
 -- O
+OverloadAction ::= ENUMERATED {
+reject-non-emergency-mo-dt,
+reject-all-rrc-cr-signalling,
+permit-emergency-sessions-only,
+	...
+}
+
+OverloadResponse ::= CHOICE {
+	overloadAction					OverloadAction,
+	...
+}
+
+
 -- P
 
 PagingDRX ::= INTEGER (0..4095)
@@ -417,7 +481,6 @@ PDCP-SN ::= INTEGER (0..4095)
 
 PLMNidentity 				::= TBCD-STRING 
 
-PriorityLevel				::= INTEGER (0..15)
 
 
 -- Q
@@ -452,7 +515,7 @@ RRC-Container	::= OCTET STRING
 
 -- S
 
-SAE-Bearer-ID		::= OCTET STRING
+SAE-Bearer-ID		::= INTEGER (0..15, ...)
 
 SAEBearerInformationList	::= SEQUENCE (SIZE (1.. maxNrOfSAEBs)) OF ProtocolIE-SingleContainer { { SAEBearerInformationListIEs } }
 
@@ -463,7 +526,7 @@ SAEBearerInformationListIEs S1AP-PROTOCOL-IES ::= {
 
 SAEBearerInformationListItem ::= SEQUENCE {
 	sAE-Bearer-ID					SAE-Bearer-ID,
-	dL-Forwarding					DL-Forwarding,
+	dL-Forwarding					DL-Forwarding		OPTIONAL,
 	iE-Extensions					ProtocolExtensionContainer { {SAEBearerInformationListItem-ExtIEs} }			OPTIONAL,
 	...
 }
@@ -472,10 +535,10 @@ SAEBearerInformationListItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-SAEBearerList ::= SEQUENCE (SIZE(0.. maxNrOfSAEBs)) OF ProtocolIE-SingleContainer { {SAEBearerItemIEs} }
+SAEBearerList ::= SEQUENCE (SIZE(1.. maxNrOfSAEBs)) OF ProtocolIE-SingleContainer { {SAEBearerItemIEs} }
 
 SAEBearerItemIEs 	S1AP-PROTOCOL-IES ::= {
-	{ ID id-SAEBearerItem	 CRITICALITY reject 	TYPE SAEBearerItem 	PRESENCE mandatory },
+	{ ID id-SAEBearerItem	 CRITICALITY ignore 	TYPE SAEBearerItem 	PRESENCE mandatory },
 	...
 }
 
@@ -491,13 +554,12 @@ SAEBearerItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 }
 
 
-SAE-Bearer-BitRate	::= INTEGER (0..10000000) 
 
 
 SAE-BearerLevelQoSParameters ::= SEQUENCE {
 	qCI			QCI,
-	allocationRetentionPriority			AllocationRetentionPriority OPTIONAL,
-	sAE-BearerType						SAE-Bearer-Type,	
+	allocationRetentionPriority			AllocationRetentionPriority,
+	gbrQosInformation					GBR-QosInformation			OPTIONAL,
 	iE-Extensions						ProtocolExtensionContainer { {SAE-Bearer-QoSParameters-ExtIEs} } OPTIONAL,
 	...
 }
@@ -506,40 +568,7 @@ SAE-Bearer-QoSParameters-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-SAE-Bearer-Type ::= CHOICE {
-	sAE-GBR-Bearer			SAE-GBR-Bearer,
-	sAE-non-GBR-Bearer		SAE-non-GBR-Bearer,
-	...
-}
 
-SAE-GBR-Bearer ::= SEQUENCE {
-	sAE-Bearer-MaximumBitrateDL			SAE-Bearer-BitRate,
-	sAE-Bearer-MaximumBitrateUL			SAE-Bearer-BitRate,
-	sAE-Bearer-GuaranteedBitrateDL		SAE-Bearer-BitRate,
-	sAE-Bearer-GuaranteedBitrateUL		SAE-Bearer-BitRate,
-	iE-Extensions						ProtocolExtensionContainer { {SAE-GBR-Bearer-Parameters-ExtIEs} } OPTIONAL,
-	...
-}
-
-SAE-GBR-Bearer-Parameters-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-	...
-}
-
-
-SAE-non-GBR-Bearer ::= SEQUENCE {
-	sAE-non-GBR-Bearer-Type			SAE-non-GBR-Bearer-Type,
-	iE-Extensions						ProtocolExtensionContainer { {SAE-non-GBR-Bearer-Parameters-ExtIEs} } OPTIONAL,
-	...
-}
-
-SAE-non-GBR-Bearer-Type	::= ENUMERATED {
-	non-GBR-Bearer,
-	...
-}
-
-SAE-non-GBR-Bearer-Parameters-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-	...
-}
 
 SecurityInfo ::= SEQUENCE {
 	securityKey		SecurityKey,
@@ -571,19 +600,12 @@ SecurityInformation-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 
 SourceBSS-ToTargetBSS-TransparentContainer		::= OCTET STRING
 
-SourceID ::= SEQUENCE {
-	sourceeNB-ID			SourceeNB-ID,
-	...
-}
-
-SourceeNB-ID ::= SEQUENCE {
-	pLMNidentity				PLMNidentity,
-	eNB-Global-ID				ENB-Global-ID -- FFS
-}
 
 SourceeNodeB-ToTargeteNodeB-TransparentContainer		::= SEQUENCE {
 	rRC-Container					RRC-Container,
 	sAEBearerInformationList		SAEBearerInformationList		OPTIONAL,
+	targetCell-ID					EUTRAN-CGI,
+	subscriberProfileIDforRFP				SubscriberProfileIDforRFP		OPTIONAL,
 	iE-Extensions			ProtocolExtensionContainer { {SourceeNodeB-ToTargeteNodeB-TransparentContainer-ExtIEs} } OPTIONAL,
 	...
 }
@@ -595,9 +617,12 @@ SourceeNodeB-ToTargeteNodeB-TransparentContainer-ExtIEs S1AP-PROTOCOL-EXTENSION
 
 SourceRNC-ToTargetRNC-TransparentContainer		::= OCTET STRING
 
+ServedGUMMEIs ::= SEQUENCE (SIZE(1.. maxnoofGUMMEIs)) OF GUMMEI
 
 ServedPLMNs ::= SEQUENCE (SIZE(1.. maxnoofPLMNsPerMME)) OF PLMNidentity
 
+SubscriberProfileIDforRFP ::= INTEGER (1..256) 
+
 SupportedTAs ::= SEQUENCE (SIZE(1.. maxnoofTACs)) OF SupportedTAs-Item
 
 SupportedTAs-Item ::=	SEQUENCE  {
@@ -630,21 +655,18 @@ TAI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 TBCD-STRING ::= OCTET STRING (SIZE (3))
 
 TargetID ::= CHOICE {
-	targeteNB-ID			TargeteNB-ID,
+	targeteNB-ID			Global-ENB-ID,
 	targetRNC-ID			TargetRNC-ID,
 	cGI				CGI,
 	...
 }
 
-TargeteNB-ID ::= SEQUENCE {
-	pLMNidentity				PLMNidentity,
-	eNB-Global-ID				ENB-Global-ID -- FFS
-}
 
 TargetRNC-ID ::= SEQUENCE {
-	lAI				LAI,
-	rAC				RAC 		OPTIONAL,
-	rNC-ID				RNC-ID
+	lAI					LAI,
+	rAC					RAC 		OPTIONAL,
+	rNC-ID				RNC-ID,
+	extendedRNC-ID		ExtendedRNC-ID		OPTIONAL
 	}
 
 
@@ -663,7 +685,7 @@ TargetBSS-ToSourceBSS-TransparentContainer		::= OCTET STRING
 
 TimeToWait ::= OCTET STRING
 
-TransportLayerAddress		::= OCTET STRING
+TransportLayerAddress		::= BIT STRING (SIZE(1..160, ...))
 
 TraceActivation ::= SEQUENCE {
 	traceReference					TraceReference,
@@ -695,11 +717,22 @@ TypeOfError ::= ENUMERATED {
 
 -- U
 
+UEAggregateMaximumBitrate ::= SEQUENCE {
+	uEaggregateMaximumBitRateDL				BitRate,
+	uEaggregateMaximumBitRateUL				BitRate,
+	iE-Extensions							ProtocolExtensionContainer { {UEAggregate-MaximumBitrates-ExtIEs} } OPTIONAL,
+	...
+}
+
+UEAggregate-MaximumBitrates-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
 
 UE-S1AP-IDs ::= CHOICE{
 	uE-S1AP-ID-pair		UE-S1AP-ID-pair,
 	mME-UE-S1AP-ID		MME-UE-S1AP-ID,
-	eNB-UE-S1AP-ID		ENB-UE-S1AP-ID,
 	...
 }
 
diff --git a/asn1/s1ap/S1AP-PDU-Contents.asn b/asn1/s1ap/S1AP-PDU-Contents.asn
index 74a6861a97..e4c6ce5523 100644
--- a/asn1/s1ap/S1AP-PDU-Contents.asn
+++ b/asn1/s1ap/S1AP-PDU-Contents.asn
@@ -1,11 +1,12 @@
 -- $Id$
--- 3GPP TS 36.413 V8.2.0 (2008-06)
+-- 3GPP TS 36.413 V8.3.0 (2008-09)
 -- 9.3.3	PDU Definitions
 -- **************************************************************
 --
 -- PDU definitions for S1AP.
 --
 -- **************************************************************
+
 S1AP-PDU-Contents { 
 itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) 
 eps-Access (20) modules (3) s1ap (1) version1 (1) s1ap-PDU-Contents (1) }
@@ -22,19 +23,20 @@ BEGIN
 
 IMPORTS
 	
-	AggregateMaximumBitrate,
+	UEAggregateMaximumBitrate,
 	Cause,
 	Cdma2000HORequiredIndication,
 	Cdma2000HOStatus,
-	Cdma2000OneXMEID,
+	Cdma2000OneXSRVCCInfo,
 	Cdma2000OneXRAND,
 	Cdma2000PDU,
 	Cdma2000RATType,
 	Cdma2000SectorID,
 	CriticalityDiagnostics,
 	Direct-Forwarding-Path-Availability,
-	ENB-Global-ID,
-	EUTRAN-CGI-ID,	ENBname,
+	Global-ENB-ID,
+	EUTRAN-CGI,
+	ENBname,
 	ENB-StatusTransfer-TransparentContainer,
 	ENB-UE-S1AP-ID,
 	GTP-TEID,
@@ -43,20 +45,24 @@ IMPORTS
 	HandoverType,
 	MMEname,
 	MME-UE-S1AP-ID,
-	NAS-PDU,	PagingCause,
+	NAS-PDU,
+	OverloadResponse,
+	PagingCause,
 	PagingDRX,
 	PLMNidentity,
-	RelativeMMECapacity,	RequestType,
+	RelativeMMECapacity,
+	RequestType,
 	SAE-Bearer-ID,
 	SAE-BearerLevelQoSParameters,
 	SAEBearerList,
 	SecurityInfo,
 	SecurityInformation,
+	ServedGUMMEIs,
 	ServedPLMNs,
 	SourceBSS-ToTargetBSS-TransparentContainer,
 	SourceeNodeB-ToTargeteNodeB-TransparentContainer,
-	SourceID,
 	SourceRNC-ToTargetRNC-TransparentContainer,
+	SubscriberProfileIDforRFP,
 	SupportedTAs,
 	TAI,
 	TargetBSS-ToSourceBSS-TransparentContainer,	
@@ -90,23 +96,22 @@ FROM S1AP-IEs
 FROM S1AP-Containers
 
 
-	id-aggregateMaximumBitrate,
-	
+	id-uEaggregateMaximumBitrate,
 	id-Cause,
 	id-cdma2000HORequiredIndication,
 	id-cdma2000HOStatus,
-	id-cdma2000OneXMEID,
+	id-cdma2000OneXSRVCCInfo,
 	id-cdma2000OneXRAND,
 	id-cdma2000PDU,
 	id-cdma2000RATType,
 	id-cdma2000SectorID,
 	id-CriticalityDiagnostics,
 	id-Direct-Forwarding-Path-Availability,
-	id-ENB-Global-ID,
-	id-EUTRAN-CGI-ID,
+	id-Global-ENB-ID,
+	id-EUTRAN-CGI,
 	id-eNBname,
-	id-eNB-StatusTransfer-TransparentContainer,	id-eNB-UE-S1AP-ID, 
-	id-GERANtoLTEHOInformationReq,
+	id-eNB-StatusTransfer-TransparentContainer,
+	id-eNB-UE-S1AP-ID, 
 	id-GERANtoLTEHOInformationRes,
 	id-GUMMEI-ID,
 	id-HandoverRestrictionList,
@@ -121,6 +126,7 @@ FROM S1AP-Containers
 	id-MMEname,
 	id-MME-UE-S1AP-ID,
 	id-NAS-PDU,
+	id-OverloadResponse,
 	id-pagingCause,
 	id-pagingDRX,
 	id-RelativeMMECapacity,
@@ -133,7 +139,7 @@ FROM S1AP-Containers
 	id-SAEBearerFailedtoSetupItemHOReqAck,
 	id-SAEBearerFailedToSetupListBearerSURes,
 	id-SAEBearerFailedToSetupListCtxtSURes,
-	id-SAEBearerFailedToSetupListHOReqAck,
+	id-SAEBearerFailedToSetupListHOReqAck,	id-SAEBearerFailedToSwitchDLList,
 	id-SAEBearerModify,
 	id-SAEBearerModifyItemBearerModRes,
 	id-SAEBearerModifyListBearerModRes,
@@ -164,9 +170,11 @@ FROM S1AP-Containers
 	id-SAEBearertoReleaseListHOCmd,
 	id-SecurityInfo,
 	id-Security-Information,
+	id-ServedGUMMEIs,
 	id-ServedPLMNs,
-	id-SourceID,
+	id-SourceeNodeB-ToTargeteNodeB-TransparentContainer,
 	id-SourceMME-UE-S1AP-ID,
+	id-SubscriberProfileIDforRFP,
 	id-SupportedTAs,
 	id-S-TMSI,
 	id-TAI,
@@ -179,7 +187,6 @@ FROM S1AP-Containers
 	id-UEIdentityIndexValue,
 	id-UEPagingID,
 	id-UERadioCapability,
-	id-UTRANtoLTEHOInformationReq,
 	id-UTRANtoLTEHOInformationRes,
 	id-UE-associatedLogicalS1-ConnectionListResAck,
 	id-UE-associatedLogicalS1-ConnectionItem,
@@ -222,18 +229,19 @@ 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-SourceID				CRITICALITY ignore	TYPE SourceID	 				PRESENCE mandatory	} |
 	{ ID id-TargetID				CRITICALITY reject	TYPE TargetID	 				PRESENCE mandatory	} |
+	{ ID id-TAI				CRITICALITY reject	TYPE TAI	 				PRESENCE mandatory	} |
 	{ ID id-Direct-Forwarding-Path-Availability	CRITICALITY ignore	TYPE Direct-Forwarding-Path-Availability	PRESENCE optional } |
 	{ ID id-Intra-LTEHOInformationReq			CRITICALITY reject	TYPE Intra-LTEHOInformationReq		PRESENCE conditional
-	-- This IE shall be present if Handover Type IE is set to value "IntraLTE" --		} |
+	-- This IE shall be present if Handover Type IE is set to value “IntraLTE” --		} |
 	{ ID id-LTEtoUTRANHOInformationReq			CRITICALITY reject	TYPE LTEtoUTRANHOInformationReq			PRESENCE conditional
-	-- This IE shall be present if the Handover Type IE is set to value "LTEtoUTRAN" --		} |
+	-- This IE shall be present if the Handover Type IE is set to value “LTEtoUTRAN” --		} |
 	{ ID id-LTEtoGERANHOInformationReq	
 							CRITICALITY reject	TYPE LTEtoGERANHOInformationReq PRESENCE conditional
-	-- This IE shall be present if the Handover Type IE is set to value "LTEtoGERAN" --												},
+	-- This IE shall be present if the Handover Type IE is set to value “LTEtoGERAN” --												},
 	...
 }
 
@@ -279,16 +287,18 @@ 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-SAEBearerSubjecttoDataForwardingList					CRITICALITY ignore	TYPE SAEBearerSubjecttoDataForwardingList		 			PRESENCE mandatory	} |
-	{ ID id-SAEBearertoReleaseListHOCmd					CRITICALITY ignore	TYPE SAEBearertoReleaseListHOCmd		 			PRESENCE mandatory	} |
+	{ ID id-HandoverType					CRITICALITY reject	TYPE HandoverType		 			PRESENCE mandatory	} |
+	{ ID id-SAEBearerSubjecttoDataForwardingList					CRITICALITY ignore	TYPE SAEBearerSubjecttoDataForwardingList		 			PRESENCE optional	} |
+	{ ID id-SAEBearertoReleaseListHOCmd					CRITICALITY ignore	TYPE SAEBearertoReleaseListHOCmd		 			PRESENCE optional	} |
 	{ ID id-Intra-LTEHOInformationRes			CRITICALITY reject	TYPE Intra-LTEHOInformationRes		PRESENCE conditional
-	-- This IE shall be present if Handover Type IE is set to value "IntraLTE" --		} |
+	-- This IE shall be present if Handover Type IE is set to value “IntraLTE” --		} |
 	{ ID id-LTEtoUTRANHOInformationRes			CRITICALITY reject	TYPE LTEtoUTRANHOInformationRes			PRESENCE conditional
-	-- This IE shall be present if the Handover Type IE is set to value "LTEtoUTRAN" --		} |
+	-- This IE shall be present if the Handover Type IE is set to value “LTEtoUTRAN” --		} |
 	{ ID id-LTEtoGERANHOInformationRes	
 							CRITICALITY reject	TYPE LTEtoGERANHOInformationRes PRESENCE conditional
-	-- This IE shall be present if the Handover Type IE is set to value "LTEtoGERAN" --												}|
+	-- This IE shall be present if the Handover Type IE is set to value “LTEtoGERAN” --												}|
 	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
@@ -371,6 +381,7 @@ HandoverPreparationFailure ::= SEQUENCE {
 }
 
 HandoverPreparationFailureIEs 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 mandatory	}|
 	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
@@ -398,24 +409,19 @@ 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-aggregateMaximumBitrate		CRITICALITY reject	TYPE AggregateMaximumBitrate		PRESENCE mandatory	}|
+	{ ID id-uEaggregateMaximumBitrate		CRITICALITY reject	TYPE UEAggregateMaximumBitrate		PRESENCE mandatory	}|
 	{ ID id-SAEBearerToBeSetupListHOReq					CRITICALITY reject	TYPE SAEBearerToBeSetupListHOReq		 			PRESENCE mandatory	} |
-	{ ID id-Intra-LTEHOInformationReq			CRITICALITY reject	TYPE Intra-LTEHOInformationReq		PRESENCE conditional
-	-- This IE shall be present if Handover Type IE is set to value "IntraLTE" --		} |
-	{ ID id-UTRANtoLTEHOInformationReq			CRITICALITY reject	TYPE UTRANtoLTEHOInformationReq			PRESENCE conditional
-	-- This IE shall be present if the Handover Type IE is set to value "UTRANtoLTE" --		} |
-	{ ID id-GERANtoLTEHOInformationReq	
-							CRITICALITY reject	TYPE GERANtoLTEHOInformationReq PRESENCE conditional
-	-- This IE shall be present if the Handover Type IE is set to value "GERANtoLTE" --												} |
+	{ ID id-SourceeNodeB-ToTargeteNodeB-TransparentContainer		CRITICALITY reject	TYPE SourceeNodeB-ToTargeteNodeB-TransparentContainer		 			PRESENCE mandatory	} |
 	{ ID id-HandoverRestrictionList		CRITICALITY ignore	TYPE HandoverRestrictionList	PRESENCE optional	}|
-	{ ID id-TraceActivation				CRITICALITY ignore	TYPE TraceActivation	 		PRESENCE optional	},
+	{ ID id-TraceActivation				CRITICALITY ignore	TYPE TraceActivation	 		PRESENCE optional	}|
+	{ ID id-RequestType					CRITICALITY ignore	TYPE	RequestType				PRESENCE optional	},
 	...
 }
 
 SAEBearerToBeSetupListHOReq 					::= SAEB-IE-ContainerList { {SAEBearerToBeSetupItemHOReqIEs} }
 
 SAEBearerToBeSetupItemHOReqIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-SAEBearerToBeSetupItemHOReq			CRITICALITY ignore	TYPE SAEBearerToBeSetupItemHOReq			PRESENCE mandatory	},
+	{ ID id-SAEBearerToBeSetupItemHOReq			CRITICALITY reject	TYPE SAEBearerToBeSetupItemHOReq			PRESENCE mandatory	},
 	...
 }
 
@@ -431,26 +437,6 @@ SAEBearerToBeSetupItemHOReq ::= SEQUENCE {
 SAEBearerToBeSetupItemHOReq-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
-UTRANtoLTEHOInformationReq ::= SEQUENCE {
-	sourceRNC-ToTargetRNC-TransparentContainer					SourceRNC-ToTargetRNC-TransparentContainer,
-	iE-Extensions					ProtocolExtensionContainer { {UTRANtoLTEHOInformationReq-ExtIEs} }			OPTIONAL,
-	...
-}
-
-UTRANtoLTEHOInformationReq-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-	...
-}
-
-GERANtoLTEHOInformationReq ::= SEQUENCE {
-	sourceBSS-ToTargetBSS-TransparentContainer					SourceBSS-ToTargetBSS-TransparentContainer,
-	iE-Extensions					ProtocolExtensionContainer { {GERANtoLTEHOInformationReq-ExtIEs} }			OPTIONAL,
-	...
-}
-
-GERANtoLTEHOInformationReq-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-	...
-}
-
 
 -- **************************************************************
 --
@@ -467,15 +453,15 @@ HandoverRequestAcknowledgeIEs 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-SAEBearerAdmittedList					CRITICALITY reject	TYPE SAEBearerAdmittedList		 			PRESENCE mandatory	} |
-	{ ID id-SAEBearerFailedToSetupListHOReqAck					CRITICALITY ignore	TYPE SAEBearerFailedtoSetupListHOReqAck		 			PRESENCE mandatory	} |
+	{ ID id-SAEBearerAdmittedList					CRITICALITY ignore	TYPE SAEBearerAdmittedList		 			PRESENCE mandatory	} |
+	{ ID id-SAEBearerFailedToSetupListHOReqAck					CRITICALITY ignore	TYPE SAEBearerFailedtoSetupListHOReqAck		 			PRESENCE optional	} |
 	{ ID id-Intra-LTEHOInformationRes			CRITICALITY reject	TYPE Intra-LTEHOInformationRes		PRESENCE conditional
-	-- This IE shall be present if Handover Type IE is set to value "IntraLTE" --		} |
+	-- This IE shall be present if Handover Type IE is set to value “IntraLTE” --		} |
 	{ ID id-UTRANtoLTEHOInformationRes			CRITICALITY reject	TYPE UTRANtoLTEHOInformationRes			PRESENCE conditional
-	-- This IE shall be present if the Handover Type IE is set to value "UTRANtoLTE" --		} |
+	-- This IE shall be present if the Handover Type IE is set to value “UTRANtoLTE” --		} |
 	{ ID id-GERANtoLTEHOInformationRes	
 							CRITICALITY reject	TYPE GERANtoLTEHOInformationRes PRESENCE conditional
-	-- This IE shall be present if the Handover Type IE is set to value "GERANtoLTE" --												}|
+	-- This IE shall be present if the Handover Type IE is set to value “GERANtoLTE” --												}|
 	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
@@ -578,7 +564,7 @@ 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-Cause					CRITICALITY ignore	TYPE Cause		 			PRESENCE mandatory	},
+	{ ID id-EUTRAN-CGI			CRITICALITY ignore	TYPE EUTRAN-CGI			PRESENCE mandatory},
 	...
 }
 
@@ -602,14 +588,15 @@ PathSwitchRequest ::= SEQUENCE {
 PathSwitchRequestIEs S1AP-PROTOCOL-IES ::= {	
 	{ ID id-eNB-UE-S1AP-ID					CRITICALITY reject	TYPE ENB-UE-S1AP-ID	 			PRESENCE mandatory	}|
 	{ ID id-SAEBearerToBeSwitchedDLList					CRITICALITY reject	TYPE SAEBearerToBeSwitchedDLList		 			PRESENCE mandatory	}|
-	{ ID id-SourceMME-UE-S1AP-ID					CRITICALITY reject	TYPE MME-UE-S1AP-ID	 			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},
 	...
 }
 
 SAEBearerToBeSwitchedDLList 					::= SAEB-IE-ContainerList { {SAEBearerToBeSwitchedDLItemIEs} }
 
 SAEBearerToBeSwitchedDLItemIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-SAEBearerToBeSwitchedDLItem			CRITICALITY ignore	TYPE SAEBearerToBeSwitchedDLItem			PRESENCE mandatory	},
+	{ ID id-SAEBearerToBeSwitchedDLItem			CRITICALITY reject	TYPE SAEBearerToBeSwitchedDLItem			PRESENCE mandatory	},
 	...
 }
 
@@ -638,8 +625,11 @@ PathSwitchRequestAcknowledge ::= SEQUENCE {
 
 PathSwitchRequestAcknowledgeIEs 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-SAEBearerToBeSwitchedULList		CRITICALITY ignore	TYPE SAEBearerToBeSwitchedULList	PRESENCE optional }|
-	{ ID id-HandoverRestrictionList			CRITICALITY ignore	TYPE HandoverRestrictionList	PRESENCE optional	} |	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
+	{ 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-SAEBearerToBeSwitchedULList		CRITICALITY ignore	TYPE SAEBearerToBeSwitchedULList	PRESENCE optional }|
+	{ ID id-SAEBearerFailedToSwitchDLList		CRITICALITY ignore	TYPE SAEBearerList				PRESENCE optional	}|
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
 
@@ -676,9 +666,9 @@ PathSwitchRequestFailure ::= SEQUENCE {
 
 PathSwitchRequestFailureIEs 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 reject	TYPE Cause		 			PRESENCE mandatory	}|
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
+	{ ID id-eNB-UE-S1AP-ID					CRITICALITY reject	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	},
 	...
 }
 
@@ -744,8 +734,9 @@ SAEBearerSetupRequest ::= SEQUENCE {
 SAEBearerSetupRequestIEs 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-SAEBearerToBeSetupListBearerSUReq			CRITICALITY reject	TYPE SAEBearerToBeSetupListBearerSUReq	 	PRESENCE mandatory	}|
-		{ ID id-NAS-PDU				CRITICALITY ignore	TYPE NAS-PDU	 		PRESENCE mandatory},
+	{ ID id-NAS-PDU				CRITICALITY ignore	TYPE NAS-PDU	 		PRESENCE mandatory},
 	...
 }
 
@@ -785,18 +776,17 @@ SAEBearerSetupResponse ::= SEQUENCE {
 SAEBearerSetupResponseIEs 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-SAEBearerSetupListBearerSURes				CRITICALITY reject	TYPE SAEBearerSetupListBearerSURes			PRESENCE optional	}|
+	{ ID id-SAEBearerSetupListBearerSURes				CRITICALITY ignore	TYPE SAEBearerSetupListBearerSURes			PRESENCE optional	}|
 	{ ID id-SAEBearerFailedToSetupListBearerSURes		CRITICALITY ignore	TYPE SAEBearerList					PRESENCE optional	}|
-	{ ID id-NAS-PDU				CRITICALITY ignore	TYPE NAS-PDU	 		PRESENCE mandatory}|
 	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
 
 
-SAEBearerSetupListBearerSURes ::= SEQUENCE (SIZE(0.. maxNrOfSAEBs)) OF ProtocolIE-SingleContainer { {SAEBearerSetupItemBearerSUResIEs} }
+SAEBearerSetupListBearerSURes ::= SEQUENCE (SIZE(1.. maxNrOfSAEBs)) OF ProtocolIE-SingleContainer { {SAEBearerSetupItemBearerSUResIEs} }
 
 SAEBearerSetupItemBearerSUResIEs 	S1AP-PROTOCOL-IES ::= {
-	{ ID id-SAEBearerSetupItemBearerSURes	 CRITICALITY reject 	TYPE SAEBearerSetupItemBearerSURes 	PRESENCE mandatory },
+	{ ID id-SAEBearerSetupItemBearerSURes	 CRITICALITY ignore 	TYPE SAEBearerSetupItemBearerSURes 	PRESENCE mandatory },
 	...
 }
 
@@ -835,6 +825,7 @@ SAEBearerModifyRequest ::= SEQUENCE {
 SAEBearerModifyRequestIEs 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-SAEBearerToBeModifiedListBearerModReq		CRITICALITY reject	TYPE SAEBearerToBeModifiedListBearerModReq	 	PRESENCE mandatory	}|
 	{ ID id-NAS-PDU				CRITICALITY ignore	TYPE NAS-PDU	 		PRESENCE mandatory},
 	...
@@ -877,16 +868,15 @@ SAEBearerModifyResponseIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID	 				PRESENCE mandatory	}|
 	{ ID id-SAEBearerModifyListBearerModRes				CRITICALITY ignore	TYPE SAEBearerModifyListBearerModRes		PRESENCE optional	}|
 	{ ID id-SAEBearerFailedToModifyList		CRITICALITY ignore	TYPE SAEBearerList				PRESENCE optional	}|
-	{ ID id-NAS-PDU				CRITICALITY ignore	TYPE NAS-PDU	 		PRESENCE mandatory}|
 	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
 
 
-SAEBearerModifyListBearerModRes ::= SEQUENCE (SIZE(0.. maxNrOfSAEBs)) OF ProtocolIE-SingleContainer { {SAEBearerModifyItemBearerModResIEs} }
+SAEBearerModifyListBearerModRes ::= SEQUENCE (SIZE(1.. maxNrOfSAEBs)) OF ProtocolIE-SingleContainer { {SAEBearerModifyItemBearerModResIEs} }
 
 SAEBearerModifyItemBearerModResIEs 	S1AP-PROTOCOL-IES ::= {
-	{ ID id-SAEBearerModifyItemBearerModRes	 CRITICALITY reject 	TYPE SAEBearerModifyItemBearerModRes 	PRESENCE mandatory },
+	{ ID id-SAEBearerModifyItemBearerModRes	 CRITICALITY ignore 	TYPE SAEBearerModifyItemBearerModRes 	PRESENCE mandatory },
 	...
 }
 
@@ -924,7 +914,8 @@ SAEBearerReleaseCommand ::= SEQUENCE {
 SAEBearerReleaseCommandIEs 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-SAEBearerToBeReleasedList		CRITICALITY ignore	TYPE SAEBearerList					PRESENCE optional	},
+	{ ID id-uEaggregateMaximumBitrate		CRITICALITY reject	TYPE UEAggregateMaximumBitrate		PRESENCE optional	}|
+	{ ID id-SAEBearerToBeReleasedList		CRITICALITY ignore	TYPE SAEBearerList					PRESENCE mandatory	},
 	...
 }
 
@@ -950,10 +941,10 @@ SAEBearerReleaseResponseIEs S1AP-PROTOCOL-IES ::= {
 }
 
 
-SAEBearerReleaseListBearerRelComp ::= SEQUENCE (SIZE(0.. maxNrOfSAEBs)) OF ProtocolIE-SingleContainer { {SAEBearerReleaseItemBearerRelCompIEs} }
+SAEBearerReleaseListBearerRelComp ::= SEQUENCE (SIZE(1.. maxNrOfSAEBs)) OF ProtocolIE-SingleContainer { {SAEBearerReleaseItemBearerRelCompIEs} }
 
 SAEBearerReleaseItemBearerRelCompIEs 	S1AP-PROTOCOL-IES ::= {
-	{ ID id-SAEBearerReleaseItemBearerRelComp	 CRITICALITY reject 	TYPE SAEBearerReleaseItemBearerRelComp 	PRESENCE mandatory },
+	{ ID id-SAEBearerReleaseItemBearerRelComp	 CRITICALITY ignore 	TYPE SAEBearerReleaseItemBearerRelComp 	PRESENCE mandatory },
 	...
 }
 
@@ -988,9 +979,9 @@ SAEBearerReleaseRequest ::= SEQUENCE {
 }
 
 SAEBearerReleaseRequestIEs 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-SAEBearerToBeReleasedList		CRITICALITY ignore	TYPE SAEBearerList					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-SAEBearerToBeReleasedList		CRITICALITY ignore	TYPE SAEBearerList					PRESENCE mandatory	},
 	...
 }
 -- **************************************************************
@@ -1013,30 +1004,14 @@ InitialContextSetupRequest ::= SEQUENCE {
 InitialContextSetupRequestIEs 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-aggregateMaximumBitrate		CRITICALITY reject	TYPE AggregateMaximumBitrate		PRESENCE mandatory	}|
+	{ ID id-uEaggregateMaximumBitrate		CRITICALITY reject	TYPE UEAggregateMaximumBitrate		PRESENCE mandatory	}|
 	{ ID id-SAEBearerToBeSetupListCtxtSUReq			CRITICALITY reject	TYPE SAEBearerToBeSetupListCtxtSUReq	 	PRESENCE mandatory	}|
-	{ ID id-Security-Information		CRITICALITY ignore	TYPE SecurityInformation		PRESENCE mandatory	}|
-	{ ID id-TraceActivation				CRITICALITY ignore	TYPE TraceActivation	 		PRESENCE optional	}|
-	{ ID id-HandoverRestrictionList		CRITICALITY ignore	TYPE HandoverRestrictionList	PRESENCE optional	}|
-	{ ID id-NAS-PDU				CRITICALITY ignore	TYPE NAS-PDU	 		PRESENCE optional}|
-	{ ID id-UERadioCapability			CRITICALITY ignore	TYPE UERadioCapability				PRESENCE optional	},
-	...
-}
--- **************************************************************
---
--- UE CONTEXT RELEASE REQUEST
---
--- **************************************************************
-
-UEContextReleaseRequest ::= SEQUENCE {
-	protocolIEs                     ProtocolIE-Container       {{UEContextReleaseRequest-IEs}},
-	...
-}
-
-UEContextReleaseRequest-IEs 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 mandatory} ,
+	{ ID id-Security-Information		CRITICALITY reject	TYPE SecurityInformation			PRESENCE mandatory	}|
+	{ ID id-TraceActivation				CRITICALITY ignore	TYPE TraceActivation	 			PRESENCE optional	}|
+	{ ID id-HandoverRestrictionList		CRITICALITY ignore	TYPE HandoverRestrictionList		PRESENCE optional	}|
+	{ ID id-NAS-PDU						CRITICALITY ignore	TYPE NAS-PDU	 					PRESENCE optional}|
+	{ ID id-UERadioCapability			CRITICALITY ignore	TYPE UERadioCapability				PRESENCE optional	}|
+	{ ID id-SubscriberProfileIDforRFP		CRITICALITY ignore	TYPE SubscriberProfileIDforRFP	PRESENCE optional	},
 	...
 }
 
@@ -1079,7 +1054,7 @@ InitialContextSetupResponse ::= SEQUENCE {
 InitialContextSetupResponseIEs 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-SAEBearerSetupListCtxtSURes				CRITICALITY reject	TYPE SAEBearerSetupListCtxtSURes			PRESENCE optional	}|
+	{ ID id-SAEBearerSetupListCtxtSURes				CRITICALITY ignore	TYPE SAEBearerSetupListCtxtSURes			PRESENCE optional	}|
 	{ ID id-SAEBearerFailedToSetupListCtxtSURes		CRITICALITY ignore	TYPE SAEBearerList					PRESENCE optional	}|
 	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
@@ -1089,7 +1064,7 @@ InitialContextSetupResponseIEs S1AP-PROTOCOL-IES ::= {
 SAEBearerSetupListCtxtSURes ::= SEQUENCE (SIZE(1.. maxNrOfSAEBs)) OF ProtocolIE-SingleContainer { {SAEBearerSetupItemCtxtSUResIEs} }
 
 SAEBearerSetupItemCtxtSUResIEs 	S1AP-PROTOCOL-IES ::= {
-	{ ID id-SAEBearerSetupItemCtxtSURes	 CRITICALITY reject 	TYPE SAEBearerSetupItemCtxtSURes 	PRESENCE mandatory },
+	{ ID id-SAEBearerSetupItemCtxtSURes	 CRITICALITY ignore 	TYPE SAEBearerSetupItemCtxtSURes 	PRESENCE mandatory },
 	...
 }
 
@@ -1140,7 +1115,7 @@ Paging ::= SEQUENCE {
 PagingIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-UEIdentityIndexValue		CRITICALITY ignore	TYPE UEIdentityIndexValue	PRESENCE mandatory	} |
 	{ ID id-UEPagingID						CRITICALITY ignore	TYPE UEPagingID				PRESENCE mandatory	} |
-	{ ID id-pagingDRX					CRITICALITY ignore	TYPE PagingDRX			PRESENCE mandatory	} |
+	{ ID id-pagingDRX					CRITICALITY ignore	TYPE PagingDRX			PRESENCE optional	} |
 	{ ID id-pagingCause					CRITICALITY ignore	TYPE PagingCause		PRESENCE mandatory	} |
 	{ ID id-TAIList					CRITICALITY ignore	TYPE TAIList		 	PRESENCE mandatory	},
 	...
@@ -1170,6 +1145,23 @@ TAIItemExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 --
 -- **************************************************************
 
+-- **************************************************************
+--
+-- UE CONTEXT RELEASE REQUEST
+--
+-- **************************************************************
+
+UEContextReleaseRequest ::= SEQUENCE {
+	protocolIEs                     ProtocolIE-Container       {{UEContextReleaseRequest-IEs}},
+	...
+}
+
+UEContextReleaseRequest-IEs 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 mandatory} ,
+	...
+}
 
 -- **************************************************************
 --
@@ -1228,7 +1220,9 @@ UEContextModificationRequest ::= SEQUENCE {
 UEContextModificationRequestIEs 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-SecurityInfo					CRITICALITY reject	TYPE SecurityInfo		 			PRESENCE optional	},	...
+	{ ID id-SecurityInfo					CRITICALITY reject	TYPE SecurityInfo		 			PRESENCE optional	}|
+	{ ID id-SubscriberProfileIDforRFP		CRITICALITY ignore	TYPE SubscriberProfileIDforRFP	PRESENCE optional	},
+	...
 }
 -- **************************************************************
 --
@@ -1300,6 +1294,7 @@ 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},
 	...
 }
@@ -1452,7 +1447,7 @@ S1SetupRequest ::= SEQUENCE {
 }
 
 S1SetupRequestIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-ENB-Global-ID				CRITICALITY reject	TYPE ENB-Global-ID	 			PRESENCE mandatory	}|
+	{ 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	},
 	...
@@ -1473,7 +1468,7 @@ S1SetupResponse ::= SEQUENCE {
 S1SetupResponseIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-MMEname				CRITICALITY ignore	TYPE MMEname	 		PRESENCE mandatory	}|
 	{ ID id-ServedPLMNs			CRITICALITY reject	TYPE ServedPLMNs		PRESENCE mandatory	}|
-	{ ID id-GUMMEI-ID				CRITICALITY reject	TYPE GUMMEI				PRESENCE mandatory	}|
+	{ ID id-ServedGUMMEIs				CRITICALITY reject	TYPE ServedGUMMEIs				PRESENCE mandatory	}|
 	{ ID id-RelativeMMECapacity					CRITICALITY reject	TYPE RelativeMMECapacity		 			PRESENCE mandatory	}|
 	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
@@ -1576,7 +1571,7 @@ 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-GUMMEI-ID			CRITICALITY reject	TYPE GUMMEI				PRESENCE optional	}|
+	{ ID id-ServedGUMMEIs			CRITICALITY reject	TYPE ServedGUMMEIs				PRESENCE optional	}|
 	{ ID id-RelativeMMECapacity	CRITICALITY reject	TYPE RelativeMMECapacity	PRESENCE optional},
 	...
 }
@@ -1666,7 +1661,7 @@ 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-cdma2000OneXMEID			CRITICALITY ignore	TYPE Cdma2000OneXMEID 			PRESENCE optional	} |
+	{ ID id-cdma2000OneXSRVCCInfo			CRITICALITY ignore	TYPE Cdma2000OneXSRVCCInfo 			PRESENCE optional	} |
 	{ ID id-cdma2000OneXRAND			CRITICALITY ignore	TYPE Cdma2000OneXRAND 			PRESENCE optional	} |
 	{ ID id-cdma2000PDU					CRITICALITY reject	TYPE Cdma2000PDU	 			PRESENCE mandatory	},
 	...
@@ -1765,7 +1760,7 @@ TraceStart ::= SEQUENCE {
 TraceStartIEs 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-TraceActivation				CRITICALITY ignore	TYPE TraceActivation			PRESENCE optional	},
+	{ ID id-TraceActivation				CRITICALITY ignore	TYPE TraceActivation			PRESENCE mandatory	},
 	...
 }
 
@@ -1862,10 +1857,39 @@ LocationReport ::= SEQUENCE {
 LocationReportIEs 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-ID				CRITICALITY ignore	TYPE EUTRAN-CGI-ID				PRESENCE mandatory} |
+	{ ID id-EUTRAN-CGI				CRITICALITY ignore	TYPE EUTRAN-CGI				PRESENCE mandatory} |
 	{ ID id-RequestType				CRITICALITY ignore	TYPE RequestType				PRESENCE mandatory} ,
 	...
 }
 
+-- **************************************************************
+--
+-- Overload Start
+--
+-- **************************************************************
+
+OverloadStart ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {OverloadStartIEs} },
+	...
+}
+
+OverloadStartIEs S1AP-PROTOCOL-IES ::= {	
+	{ ID id-OverloadResponse					CRITICALITY reject	TYPE OverloadResponse		 			PRESENCE mandatory	},
+	...
+}
+-- **************************************************************
+--
+-- Overload Stop
+--
+-- **************************************************************
+
+OverloadStop ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {OverloadStopIEs} },
+	...
+}
+
+OverloadStopIEs S1AP-PROTOCOL-IES ::= {	
+	...
+}
 
-END
+END
\ No newline at end of file
diff --git a/asn1/s1ap/S1AP-PDU-Descriptions.asn b/asn1/s1ap/S1AP-PDU-Descriptions.asn
index baf5c68990..0502e66139 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.2.0 (2008-06)
+-- 3GPP TS 36.413 V8.3.0 (2008-09)
 -- 9.3.2	Elementary Procedure Definitions
 -- **************************************************************
 --
@@ -50,12 +50,13 @@ FROM S1AP-CommonDataTypes
 	LocationReportingControl,
 	LocationReportingFailureIndication,
 	LocationReport,
-
 	MMEConfigurationUpdate,
 	MMEConfigurationUpdateAcknowledge,
 	MMEConfigurationUpdateFailure,
 	MMEStatusTransfer,
 	NASNonDeliveryIndication,
+	OverloadStart,
+	OverloadStop,
 	Paging,
 	PathSwitchRequest,
 	PathSwitchRequestAcknowledge,
@@ -104,6 +105,8 @@ FROM S1AP-PDU-Contents
 	id-MMEConfigurationUpdate,
 	id-MMEStatusTransfer,
 	id-NASNonDeliveryIndication,
+	id-OverloadStart,
+	id-OverloadStop,
 	id-Paging,
 	id-PathSwitchRequest,
 	id-Reset,
@@ -226,7 +229,9 @@ S1AP-ELEMENTARY-PROCEDURES-CLASS-2 S1AP-ELEMENTARY-PROCEDURE ::= {
 	traceFailureIndication			|
 	locationReportingControl		|
 	locationReportingFailureIndication		|
-	locationReport					,
+	locationReport					|
+	overloadStart					|
+	overloadStop					,
 	...
 }
 
@@ -461,4 +466,18 @@ locationReport S1AP-ELEMENTARY-PROCEDURE ::= {
 	PROCEDURE CODE			id-LocationReport
 	CRITICALITY				ignore
 }
+
+overloadStart S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE	OverloadStart
+	PROCEDURE CODE		id-OverloadStart
+	CRITICALITY		ignore
+}
+
+overloadStop S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE	OverloadStop
+	PROCEDURE CODE		id-OverloadStop
+	CRITICALITY		reject
+}
+
 END
+
diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf
index eb7d8dd802..c16f87051f 100644
--- a/asn1/s1ap/s1ap.cnf
+++ b/asn1/s1ap/s1ap.cnf
@@ -22,6 +22,7 @@ TBCD-STRING
 
 #.OMIT_ASSIGNMENT
 # Get rid of unused code warnings
+ProtocolIE-FieldPair 
 ProtocolIE-ContainerPair
 ProtocolIE-ContainerPairList
 ProtocolError-IE-ContainerList
@@ -62,8 +63,9 @@ ProtocolIE-Field/value ie_field_value
 
 
 #.FN_PARS ProtocolIE-Field/value  FN_VARIANT=_pdu_new  TYPE_REF_FN=dissect_ProtocolIEFieldValue 
-#.FN_PARS ProtocolIE-FieldPair/firstValue  FN_VARIANT=_pdu_new  TYPE_REF_FN=dissect_ProtocolIEFieldPairFirstValue 
-#.FN_PARS ProtocolIE-FieldPair/secondValue  FN_VARIANT=_pdu_new  TYPE_REF_FN=dissect_ProtocolIEFieldPairSecondValue 
+# Currently not used
+# FN_PARS ProtocolIE-FieldPair/firstValue  FN_VARIANT=_pdu_new  TYPE_REF_FN=dissect_ProtocolIEFieldPairFirstValue 
+# FN_PARS ProtocolIE-FieldPair/secondValue  FN_VARIANT=_pdu_new  TYPE_REF_FN=dissect_ProtocolIEFieldPairSecondValue 
 
 #.FN_PARS ProtocolExtensionID  VAL_PTR=&ProtocolExtensionID
 #.FN_PARS ProtocolExtensionField/extensionValue  FN_VARIANT=_pdu_new  TYPE_REF_FN=dissect_ProtocolExtensionFieldExtensionValue
@@ -146,6 +148,8 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
 #  asn1_stack_frame_pop(%(ACTX)s, "ProtocolIE-ContainerList");
 # END
 
+# Handle 64 bit constraint
+#.FN_PARS BitRate FN_VARIANT = _64b
 
 # following construction is not supported by asn2wrs
 # PLMNidentity ::= TBCD-STRING (SIZE (3))
@@ -228,12 +232,13 @@ id-MMEConfigurationUpdate				ProcedureCode
 id-LocationReportingControl				ProcedureCode
 id-LocationReportingFailureIndication	ProcedureCode
 id-LocationReport						ProcedureCode
+id-OverloadStart						ProcedureCode
+id-OverloadStop							ProcedureCode
 
 # ProtocolIE-ID
 id-MME-UE-S1AP-ID									ProtocolIE-ID
 id-HandoverType										ProtocolIE-ID
 id-Cause											ProtocolIE-ID
-id-SourceID											ProtocolIE-ID
 id-TargetID											ProtocolIE-ID
 id-Intra-LTEHOInformationReq						ProtocolIE-ID
 id-LTEtoUTRANHOInformationReq						ProtocolIE-ID
@@ -282,18 +287,16 @@ id-SAEBearerSetupItemCtxtSURes						ProtocolIE-ID
 id-SAEBearerSetupListCtxtSURes						ProtocolIE-ID
 id-SAEBearerToBeSetupItemCtxtSUReq					ProtocolIE-ID
 id-SAEBearerToBeSetupListHOReq						ProtocolIE-ID
-id-GERANtoLTEHOInformationReq						ProtocolIE-ID
 id-GERANtoLTEHOInformationRes						ProtocolIE-ID
-id-UTRANtoLTEHOInformationReq						ProtocolIE-ID
 id-UTRANtoLTEHOInformationRes						ProtocolIE-ID
 id-CriticalityDiagnostics 							ProtocolIE-ID
 id-eNBname											ProtocolIE-ID
 id-MMEname											ProtocolIE-ID
-id-ENB-Global-ID									ProtocolIE-ID
+id-Global-ENB-ID									ProtocolIE-ID
 id-ServedPLMNs										ProtocolIE-ID
 id-SupportedTAs										ProtocolIE-ID
 id-TimeToWait										ProtocolIE-ID
-id-aggregateMaximumBitrate							ProtocolIE-ID
+id-uEaggregateMaximumBitrate						ProtocolIE-ID
 id-TAI												ProtocolIE-ID
 id-SAEBearerReleaseListBearerRelComp				ProtocolIE-ID
 id-cdma2000PDU										ProtocolIE-ID
@@ -307,7 +310,6 @@ id-Direct-Forwarding-Path-Availability				ProtocolIE-ID
 id-UEIdentityIndexValue								ProtocolIE-ID
 id-cdma2000HOStatus									ProtocolIE-ID
 id-cdma2000HORequiredIndication						ProtocolIE-ID
-id-cdma2000OneXMEID									ProtocolIE-ID
 id-TraceReference									ProtocolIE-ID
 id-RelativeMMECapacity								ProtocolIE-ID
 id-SourceMME-UE-S1AP-ID								ProtocolIE-ID
@@ -322,8 +324,13 @@ id-S-TMSI											ProtocolIE-ID
 id-cdma2000OneXRAND									ProtocolIE-ID
 id-RequestType										ProtocolIE-ID
 id-UE-S1AP-IDs										ProtocolIE-ID
-id-EUTRAN-CGI-ID									ProtocolIE-ID 
-
+id-EUTRAN-CGI										ProtocolIE-ID
+id-OverloadResponse									ProtocolIE-ID
+id-cdma2000OneXSRVCCInfo							ProtocolIE-ID
+id-SAEBearerFailedToSwitchDLList					ProtocolIE-ID
+id-SourceeNodeB-ToTargeteNodeB-TransparentContainer	ProtocolIE-ID
+id-ServedGUMMEIs									ProtocolIE-ID
+id-SubscriberProfileIDforRFP						ProtocolIE-ID
 #.END
 
 #.REGISTER_NEW
@@ -332,7 +339,6 @@ id-EUTRAN-CGI-ID									ProtocolIE-ID
 MME-UE-S1AP-ID							N s1ap.ies id-MME-UE-S1AP-ID
 HandoverType							N s1ap.ies id-HandoverType
 Cause									N s1ap.ies id-Cause
-SourceID								N s1ap.ies id-SourceID
 TargetID								N s1ap.ies id-TargetID
 Intra-LTEHOInformationReq				N s1ap.ies id-Intra-LTEHOInformationReq
 LTEtoUTRANHOInformationReq				N s1ap.ies id-LTEtoUTRANHOInformationReq
@@ -381,18 +387,16 @@ SAEBearerSetupItemCtxtSURes				N s1ap.ies id-SAEBearerSetupItemCtxtSURes
 SAEBearerSetupListCtxtSURes				N s1ap.ies id-SAEBearerSetupListCtxtSURes
 SAEBearerToBeSetupItemCtxtSUReq			N s1ap.ies id-SAEBearerToBeSetupItemCtxtSUReq
 SAEBearerToBeSetupListHOReq				N s1ap.ies id-SAEBearerToBeSetupListHOReq
-GERANtoLTEHOInformationReq				N s1ap.ies id-GERANtoLTEHOInformationReq
 GERANtoLTEHOInformationRes				N s1ap.ies id-GERANtoLTEHOInformationRes
-UTRANtoLTEHOInformationReq				N s1ap.ies id-UTRANtoLTEHOInformationReq
 UTRANtoLTEHOInformationRes				N s1ap.ies id-UTRANtoLTEHOInformationRes
 CriticalityDiagnostics					N s1ap.ies id-CriticalityDiagnostics
-ENB-Global-ID							N s1ap.ies id-ENB-Global-ID
+Global-ENB-ID							N s1ap.ies id-Global-ENB-ID
 ENBname									N s1ap.ies id-eNBname
 MMEname									N s1ap.ies id-MMEname
 ServedPLMNs								N s1ap.ies id-ServedPLMNs
 SupportedTAs							N s1ap.ies id-SupportedTAs
 TimeToWait								N s1ap.ies id-TimeToWait
-AggregateMaximumBitrate					N s1ap.ies id-aggregateMaximumBitrate
+UEAggregateMaximumBitrate				N s1ap.ies id-uEaggregateMaximumBitrate
 TAI										N s1ap.ies id-TAI
 SAEBearerReleaseListBearerRelComp		N s1ap.ies id-SAEBearerReleaseListBearerRelComp				
 Cdma2000PDU								N s1ap.ies id-cdma2000PDU										
@@ -406,7 +410,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
-Cdma2000OneXMEID						N s1ap.ies id-cdma2000OneXMEID
 TraceReference							N s1ap.ies id-TraceReference
 RelativeMMECapacity						N s1ap.ies id-RelativeMMECapacity
 MME-UE-S1AP-ID							N s1ap.ies id-SourceMME-UE-S1AP-ID
@@ -421,7 +424,13 @@ S-TMSI									N s1ap.ies id-S-TMSI
 Cdma2000OneXRAND						N s1ap.ies id-cdma2000OneXRAND
 RequestType								N s1ap.ies id-RequestType
 UE-S1AP-IDs								N s1ap.ies id-UE-S1AP-IDs
-EUTRAN-CGI-ID							N s1ap.ies id-EUTRAN-CGI-ID 
+EUTRAN-CGI								N s1ap.ies id-EUTRAN-CGI
+OverloadResponse						N s1ap.ies id-OverloadResponse
+Cdma2000OneXSRVCCInfo					N s1ap.ies id-cdma2000OneXSRVCCInfo
+SAEBearerList							N s1ap.ies id-SAEBearerFailedToSwitchDLList
+SourceeNodeB-ToTargeteNodeB-TransparentContainer	N s1ap.ies id-SourceeNodeB-ToTargeteNodeB-TransparentContainer
+ServedGUMMEIs							N s1ap.ies id-ServedGUMMEIs
+SubscriberProfileIDforRFP				N s1ap.ies id-SubscriberProfileIDforRFP
 
 #S1AP-PROTOCOL-IES-PAIR
 #RAB-SetupOrModifyItemFirst         N s1ap.ies.pair.first id-RAB-SetupOrModifyItem
@@ -521,4 +530,8 @@ LocationReportingControl				N s1ap.proc.imsg id-LocationReportingControl
 LocationReportingFailureIndication		N s1ap.proc.imsg id-LocationReportingFailureIndication
 
 LocationReport							N s1ap.proc.imsg id-LocationReport
+
+OverloadStart							N s1ap.proc.imsg id-OverloadStart
+
+OverloadStop							N s1ap.proc.imsg id-OverloadStop
 #.END