Update S1AP to the latest spec rename nas_eps nas-eps.

svn path=/trunk/; revision=27042

10 files changed, 1058 insertions, 662 deletions

diff --git a/asn1/lte-rrc/lte-rrc.cnf b/asn1/lte-rrc/lte-rrc.cnf
index 09f6b4cea5..2f30be3c57 100644
--- a/asn1/lte-rrc/lte-rrc.cnf
+++ b/asn1/lte-rrc/lte-rrc.cnf
@@ -26,6 +26,6 @@ UL-DCCH-Message              @ul.dcch
 
 %(DEFAULT_BODY)s
 
-	if (nas_eps_tvb)
+	if ((nas_eps_tvb)&&(nas_eps_handle))
 		call_dissector(nas_eps_handle,nas_eps_tvb,%(ACTX)s->pinfo, proto_tree_get_root(tree));
 
diff --git a/asn1/lte-rrc/packet-lte-rrc-template.c b/asn1/lte-rrc/packet-lte-rrc-template.c
index 6a6f88f306..f7db4c397d 100644
--- a/asn1/lte-rrc/packet-lte-rrc-template.c
+++ b/asn1/lte-rrc/packet-lte-rrc-template.c
@@ -46,7 +46,7 @@
 #define PSNAME "LTE RRC"
 #define PFNAME "lte_rrc"
 
-static dissector_handle_t nas_eps_handle;
+static dissector_handle_t nas_eps_handle = NULL;
 
 /* Include constants */
 #include "packet-lte-rrc-val.h"
@@ -121,7 +121,7 @@ void
 proto_reg_handoff_lte_rrc(void)
 {
 
-	nas_eps_handle = find_dissector("nas_eps");
+	nas_eps_handle = find_dissector("nas-eps");
 }
 
 
diff --git a/asn1/s1ap/S1AP-CommonDataTypes.asn b/asn1/s1ap/S1AP-CommonDataTypes.asn
index 27ee7bae36..72ddceea17 100644
--- a/asn1/s1ap/S1AP-CommonDataTypes.asn
+++ b/asn1/s1ap/S1AP-CommonDataTypes.asn
@@ -33,5 +33,3 @@ 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 6e3d8004fe..e6df898143 100644
--- a/asn1/s1ap/S1AP-Constants.asn
+++ b/asn1/s1ap/S1AP-Constants.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V8.3.0 (2008-09)
+-- 3GPP TS 36.413 V8.4.0 (2008-12)
 -- 9.3.6	Constant Definitions
 -- **************************************************************
 --
@@ -39,11 +39,11 @@ id-HandoverResourceAllocation 		ProcedureCode ::= 1
 id-HandoverNotification 			ProcedureCode ::= 2
 id-PathSwitchRequest 				ProcedureCode ::= 3
 id-HandoverCancel 					ProcedureCode ::= 4
-id-SAEBearerSetup						ProcedureCode ::= 5
-id-SAEBearerModify 					ProcedureCode ::= 6
-id-SAEBearerRelease					ProcedureCode ::= 7
-id-SAEBearerReleaseRequest				ProcedureCode ::= 8
-id-InitialContextSetup						ProcedureCode ::= 9
+id-E-RABSetup						ProcedureCode ::= 5
+id-E-RABModify 						ProcedureCode ::= 6
+id-E-RABRelease						ProcedureCode ::= 7
+id-E-RABReleaseIndication			ProcedureCode ::= 8
+id-InitialContextSetup				ProcedureCode ::= 9
 id-Paging							ProcedureCode ::= 10
 id-downlinkNASTransport				ProcedureCode ::= 11
 id-initialUEMessage					ProcedureCode ::= 12
@@ -70,6 +70,11 @@ id-LocationReportingFailureIndication	ProcedureCode ::= 32
 id-LocationReport					ProcedureCode ::= 33
 id-OverloadStart					ProcedureCode ::= 34
 id-OverloadStop						ProcedureCode ::= 35
+id-WriteReplaceWarning				ProcedureCode ::= 36
+id-eNBDirectInformationTransfer			ProcedureCode ::= 37
+id-MMEDirectInformationTransfer			ProcedureCode ::= 38
+id-PrivateMessage					ProcedureCode ::= 39
+
 
 -- **************************************************************
 --
@@ -86,10 +91,11 @@ maxProtocolIEs						INTEGER ::= 65535
 --
 -- **************************************************************
 
-maxNrOfSAEBs							INTEGER ::= 256
+maxNrOfCSGs								INTEGER ::= 256
+maxNrOfE-RABs							INTEGER ::= 256
 maxNrOfInterfaces						INTEGER ::= 3   --FFS
-maxnoofTAI								INTEGER ::= 256 --FFS
-maxnoofTACs								INTEGER ::= 256 --FFS
+maxnoofTAI								INTEGER ::= 256
+maxnoofTACs								INTEGER ::= 256
 maxNrOfErrors							INTEGER ::= 256
 maxnoofBPLMNs							INTEGER ::= 6
 maxnoofPLMNsPerMME						INTEGER ::= 32 -- FFS
@@ -99,7 +105,13 @@ maxnoofForbLACs							INTEGER ::= 4096
 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
+maxnoofeNBX2TLAs						INTEGER ::= 2
 
 
 
@@ -114,54 +126,47 @@ id-HandoverType									ProtocolIE-ID ::= 1
 id-Cause										ProtocolIE-ID ::= 2
 id-SourceID										ProtocolIE-ID ::= 3
 id-TargetID										ProtocolIE-ID ::= 4
-id-Intra-LTEHOInformationReq					ProtocolIE-ID ::= 5
-id-LTEtoUTRANHOInformationReq					ProtocolIE-ID ::= 6
-id-LTEtoGERANHOInformationReq					ProtocolIE-ID ::= 7
 id-eNB-UE-S1AP-ID								ProtocolIE-ID ::= 8
-id-Intra-LTEHOInformationRes					ProtocolIE-ID ::= 9
-id-LTEtoUTRANHOInformationRes					ProtocolIE-ID ::= 10
-id-LTEtoGERANHOInformationRes					ProtocolIE-ID ::= 11
-id-SAEBearerSubjecttoDataForwardingList			ProtocolIE-ID ::= 12
-id-SAEBearertoReleaseListHOCmd					ProtocolIE-ID ::= 13
-id-SAEBearerDataForwardingItem					ProtocolIE-ID ::= 14
-id-SAEBearerReleaseItemBearerRelComp			ProtocolIE-ID ::= 15
-id-SAEBearerToBeSetupListBearerSUReq			ProtocolIE-ID ::= 16
-id-SAEBearerToBeSetupItemBearerSUReq			ProtocolIE-ID ::= 17
-id-SAEBearerAdmittedList						ProtocolIE-ID ::= 18
-id-SAEBearerFailedToSetupListHOReqAck			ProtocolIE-ID ::= 19
-id-SAEBearerAdmittedItem						ProtocolIE-ID ::= 20
-id-SAEBearerFailedtoSetupItemHOReqAck			ProtocolIE-ID ::= 21
-id-SAEBearerToBeSwitchedDLList					ProtocolIE-ID ::= 22
-id-SAEBearerToBeSwitchedDLItem					ProtocolIE-ID ::= 23
-id-SAEBearerToBeSetupListCtxtSUReq				ProtocolIE-ID ::= 24
+id-E-RABSubjecttoDataForwardingList			ProtocolIE-ID ::= 12
+id-E-RABtoReleaseListHOCmd					ProtocolIE-ID ::= 13
+id-E-RABDataForwardingItem					ProtocolIE-ID ::= 14
+id-E-RABReleaseItemBearerRelComp			ProtocolIE-ID ::= 15
+id-E-RABToBeSetupListBearerSUReq			ProtocolIE-ID ::= 16
+id-E-RABToBeSetupItemBearerSUReq			ProtocolIE-ID ::= 17
+id-E-RABAdmittedList						ProtocolIE-ID ::= 18
+id-E-RABFailedToSetupListHOReqAck			ProtocolIE-ID ::= 19
+id-E-RABAdmittedItem						ProtocolIE-ID ::= 20
+id-E-RABFailedtoSetupItemHOReqAck			ProtocolIE-ID ::= 21
+id-E-RABToBeSwitchedDLList					ProtocolIE-ID ::= 22
+id-E-RABToBeSwitchedDLItem					ProtocolIE-ID ::= 23
+id-E-RABToBeSetupListCtxtSUReq				ProtocolIE-ID ::= 24
 id-TraceActivation								ProtocolIE-ID ::= 25
 id-NAS-PDU										ProtocolIE-ID ::= 26
-id-SAEBearerToBeSetupItemHOReq					ProtocolIE-ID ::= 27
-id-SAEBearerSetupListBearerSURes				ProtocolIE-ID ::= 28
-id-SAEBearerFailedToSetupListBearerSURes		ProtocolIE-ID ::= 29
-id-SAEBearerToBeModifiedListBearerModReq		ProtocolIE-ID ::= 30
-id-SAEBearerModifyListBearerModRes				ProtocolIE-ID ::= 31
-id-SAEBearerFailedToModifyList					ProtocolIE-ID ::= 32
-id-SAEBearerToBeReleasedList					ProtocolIE-ID ::= 33
-id-SAEBearerFailedToReleaseList					ProtocolIE-ID ::= 34
-id-SAEBearerItem								ProtocolIE-ID ::= 35
-id-SAEBearerToBeModifiedItemBearerModReq		ProtocolIE-ID ::= 36
-id-SAEBearerModifyItemBearerModRes				ProtocolIE-ID ::= 37
-id-SAEBearerReleaseItem							ProtocolIE-ID ::= 38
-id-SAEBearerSetupItemBearerSURes				ProtocolIE-ID ::= 39
-id-Security-Information							ProtocolIE-ID ::= 40
+id-E-RABToBeSetupItemHOReq					ProtocolIE-ID ::= 27
+id-E-RABSetupListBearerSURes				ProtocolIE-ID ::= 28
+id-E-RABFailedToSetupListBearerSURes		ProtocolIE-ID ::= 29
+id-E-RABToBeModifiedListBearerModReq		ProtocolIE-ID ::= 30
+id-E-RABModifyListBearerModRes				ProtocolIE-ID ::= 31
+id-E-RABFailedToModifyList					ProtocolIE-ID ::= 32
+id-E-RABToBeReleasedList					ProtocolIE-ID ::= 33
+id-E-RABFailedToReleaseList					ProtocolIE-ID ::= 34
+id-E-RABItem								ProtocolIE-ID ::= 35
+id-E-RABToBeModifiedItemBearerModReq		ProtocolIE-ID ::= 36
+id-E-RABModifyItemBearerModRes				ProtocolIE-ID ::= 37
+id-E-RABReleaseItem							ProtocolIE-ID ::= 38
+id-E-RABSetupItemBearerSURes				ProtocolIE-ID ::= 39
+id-SecurityContext							ProtocolIE-ID ::= 40
 id-HandoverRestrictionList						ProtocolIE-ID ::= 41
 id-UEPagingID 									ProtocolIE-ID ::= 43
 id-pagingDRX 									ProtocolIE-ID ::= 44
-id-pagingCause									ProtocolIE-ID ::= 45
 id-TAIList										ProtocolIE-ID ::= 46
 id-TAIItem										ProtocolIE-ID ::= 47
-id-SAEBearerFailedToSetupListCtxtSURes			ProtocolIE-ID ::= 48
-id-SAEBearerReleaseItemHOCmd					ProtocolIE-ID ::= 49
-id-SAEBearerSetupItemCtxtSURes					ProtocolIE-ID ::= 50
-id-SAEBearerSetupListCtxtSURes					ProtocolIE-ID ::= 51
-id-SAEBearerToBeSetupItemCtxtSUReq				ProtocolIE-ID ::= 52
-id-SAEBearerToBeSetupListHOReq					ProtocolIE-ID ::= 53
+id-E-RABFailedToSetupListCtxtSURes			ProtocolIE-ID ::= 48
+id-E-RABReleaseItemHOCmd					ProtocolIE-ID ::= 49
+id-E-RABSetupItemCtxtSURes					ProtocolIE-ID ::= 50
+id-E-RABSetupListCtxtSURes					ProtocolIE-ID ::= 51
+id-E-RABToBeSetupItemCtxtSUReq				ProtocolIE-ID ::= 52
+id-E-RABToBeSetupListHOReq					ProtocolIE-ID ::= 53
 id-GERANtoLTEHOInformationRes					ProtocolIE-ID ::= 55
 id-UTRANtoLTEHOInformationRes					ProtocolIE-ID ::= 57
 id-CriticalityDiagnostics 						ProtocolIE-ID ::= 58
@@ -173,14 +178,14 @@ id-SupportedTAs									ProtocolIE-ID ::= 64
 id-TimeToWait									ProtocolIE-ID ::= 65
 id-uEaggregateMaximumBitrate						ProtocolIE-ID ::= 66
 id-TAI											ProtocolIE-ID ::= 67
-id-SAEBearerReleaseListBearerRelComp			ProtocolIE-ID ::= 69
+id-E-RABReleaseListBearerRelComp			ProtocolIE-ID ::= 69
 id-cdma2000PDU									ProtocolIE-ID ::= 70
 id-cdma2000RATType								ProtocolIE-ID ::= 71
 id-cdma2000SectorID								ProtocolIE-ID ::= 72
-id-SecurityInfo									ProtocolIE-ID ::= 73
+id-SecurityKey									ProtocolIE-ID ::= 73
 id-UERadioCapability							ProtocolIE-ID ::= 74
 id-GUMMEI-ID									ProtocolIE-ID ::= 75
-id-SAEBearerInformationListItem					ProtocolIE-ID ::= 78
+id-E-RABInformationListItem					ProtocolIE-ID ::= 78
 id-Direct-Forwarding-Path-Availability			ProtocolIE-ID ::= 79
 id-UEIdentityIndexValue							ProtocolIE-ID ::= 80
 id-cdma2000HOStatus								ProtocolIE-ID ::= 83
@@ -193,8 +198,8 @@ id-eNB-StatusTransfer-TransparentContainer		ProtocolIE-ID ::= 90
 id-UE-associatedLogicalS1-ConnectionItem		ProtocolIE-ID ::= 91
 id-ResetType									ProtocolIE-ID ::= 92
 id-UE-associatedLogicalS1-ConnectionListResAck	ProtocolIE-ID ::= 93
-id-SAEBearerToBeSwitchedULItem					ProtocolIE-ID ::= 94
-id-SAEBearerToBeSwitchedULList					ProtocolIE-ID ::= 95
+id-E-RABToBeSwitchedULItem					ProtocolIE-ID ::= 94
+id-E-RABToBeSwitchedULList					ProtocolIE-ID ::= 95
 id-S-TMSI										ProtocolIE-ID ::= 96
 id-cdma2000OneXRAND								ProtocolIE-ID ::= 97
 id-RequestType									ProtocolIE-ID ::= 98
@@ -202,11 +207,31 @@ id-UE-S1AP-IDs									ProtocolIE-ID ::= 99
 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-E-RABFailedToBeReleasedList				ProtocolIE-ID ::= 103
+id-Source-ToTarget-TransparentContainer	ProtocolIE-ID ::= 104
 id-ServedGUMMEIs								ProtocolIE-ID ::= 105
 id-SubscriberProfileIDforRFP					ProtocolIE-ID ::= 106
-END
-
-
+id-UESecurityCapabilities						ProtocolIE-ID ::= 107
+id-CSFallbackIndicator							ProtocolIE-ID ::= 108
+id-CNDomain										ProtocolIE-ID ::= 109
+id-E-RABReleasedList						ProtocolIE-ID ::= 110
+id-MessageIdentifier							ProtocolIE-ID ::= 111
+id-SerialNumber									ProtocolIE-ID ::= 112
+id-WarningAreaList								ProtocolIE-ID ::= 113
+id-RepetitionPeriod								ProtocolIE-ID ::= 114
+id-NumberofBroadcastRequest						ProtocolIE-ID ::= 115
+id-WarningType									ProtocolIE-ID ::= 116
+id-WarningSecurityInfo							ProtocolIE-ID ::= 117
+id-DataCodingScheme								ProtocolIE-ID ::= 118
+id-WarningMessageContents						ProtocolIE-ID ::= 119
+id-BroadcastCompletedAreaList					ProtocolIE-ID ::= 120
+id-Inter-SystemInformationTransferTypeEDT			ProtocolIE-ID ::= 121
+id-Inter-SystemInformationTransferTypeMDT			ProtocolIE-ID ::= 122
+id-Target-ToSource-TransparentContainer			ProtocolIE-ID ::= 123
+id-SRVCCOperationPossible						ProtocolIE-ID ::= 124
+id-SRVCCHOIndication							ProtocolIE-ID ::= 125
+id-NAS-DownlinkCount							ProtocolIE-ID ::= 126
+id-CSG-Id										ProtocolIE-ID ::= 127
+id-CSG-IdList									ProtocolIE-ID ::= 128
 
+END
diff --git a/asn1/s1ap/S1AP-Containers.asn b/asn1/s1ap/S1AP-Containers.asn
index 93a60892f8..b6ebf173b9 100644
--- a/asn1/s1ap/S1AP-Containers.asn
+++ b/asn1/s1ap/S1AP-Containers.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V8.2.0 (2008-06)
+-- 3GPP TS 36.413 V8.4.0 (2008-12)
 -- 9.3.7	Container Definitions
 -- **************************************************************
 --
@@ -201,3 +201,4 @@ PrivateIE-Field {S1AP-PRIVATE-IES : IEsSetParam} ::= SEQUENCE {
 END
 
 
+
diff --git a/asn1/s1ap/S1AP-IEs.asn b/asn1/s1ap/S1AP-IEs.asn
index 33b67ff778..8411e45722 100644
--- a/asn1/s1ap/S1AP-IEs.asn
+++ b/asn1/s1ap/S1AP-IEs.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V8.3.0 (2008-09)
+-- 3GPP TS 36.413 V8.4.0 (2008-12)
 -- 9.3.4	Information Element Definitions
 -- **************************************************************
 --
@@ -16,10 +16,11 @@ DEFINITIONS AUTOMATIC TAGS ::=
 BEGIN
 
 IMPORTS
-	id-SAEBearerInformationListItem,
-	id-SAEBearerItem,
+	id-E-RABInformationListItem,
+	id-E-RABItem,
 	id-Bearers-SubjectToStatusTransfer-Item,
-	maxNrOfSAEBs,
+	maxNrOfCSGs,
+	maxNrOfE-RABs,
 	maxNrOfInterfaces,
 	maxNrOfErrors,
 	maxnoofBPLMNs,
@@ -30,7 +31,15 @@ IMPORTS
 	maxnoofForbLACs,
 	maxnoofForbTACs,
 	maxnoofTACs,
-	maxnoofGUMMEIs
+	maxnoofGUMMEIs,
+	maxnoofCells,
+	maxnoofCellID,
+	maxnoofEmergencyAreaID,
+	maxnoofTAIforWarning,
+	maxnoofCellinTAI,
+	maxnoofCellinEAI
+
+
 
 FROM S1AP-Constants
 
@@ -49,13 +58,23 @@ FROM S1AP-Containers;
 
 -- A
 
-AllocationRetentionPriority ::= INTEGER (0..15)
 
+AllocationAndRetentionPriority ::= SEQUENCE {
+	priorityLevel				PriorityLevel,
+	pre-emptionCapability		Pre-emptionCapability,
+	pre-emptionVulnerability	Pre-emptionVulnerability,
+	iE-Extensions				ProtocolExtensionContainer { {AllocationAndRetentionPriority-ExtIEs} } OPTIONAL,
+	...
+}
+
+AllocationAndRetentionPriority-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
 
 -- B
 
-Bearers-SubjectToStatusTransferList ::= SEQUENCE (SIZE(1.. maxNrOfSAEBs)) OF ProtocolIE-SingleContainer { { Bearers-SubjectToStatusTransfer-ItemIEs } }
+Bearers-SubjectToStatusTransferList ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) 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	},
@@ -63,9 +82,10 @@ Bearers-SubjectToStatusTransfer-ItemIEs S1AP-PROTOCOL-IES ::= {
 }
 
 Bearers-SubjectToStatusTransfer-Item ::= SEQUENCE {
-	sAE-Bearer-ID								SAE-Bearer-ID,
+	e-RAB-ID								E-RAB-ID,
 	uL-COUNTvalue								COUNTvalue,
 	dL-COUNTvalue								COUNTvalue,
+	receiveStatusofULPDCPSDUs					ReceiveStatusofULPDCPSDUs			OPTIONAL,
 	iE-Extensions							ProtocolExtensionContainer { {Bearers-SubjectToStatusTransfer-ItemExtIEs} } OPTIONAL,
 	...
 }
@@ -78,6 +98,12 @@ BitRate	::= INTEGER (0..10000000000)
 
 BPLMNs ::= SEQUENCE (SIZE(1.. maxnoofBPLMNs)) OF PLMNidentity
 
+BroadcastCompletedAreaList ::= SEQUENCE {
+	cellID-Broadcast				CellID-Broadcast,
+	tAI-Broadcast					TAI-Broadcast,
+	emergencyAreaID-Broadcast		EmergencyAreaID-Broadcast,
+	...
+}
 
 -- C
 
@@ -136,6 +162,10 @@ CauseRadioNetwork ::= ENUMERATED {
 	user-inactivity,
 	radio-connection-with-ue-lost,
 	load-balancing-tau-required,
+	cs-fallback-triggered,
+	ue-not-available-for-ps-service,
+	radio-resources-not-available,
+	failure-in-radio-interface-procedure,
 	...
 
 }
@@ -156,6 +186,13 @@ CauseNas ::= ENUMERATED {
 
 CellIdentity			::= BIT STRING (SIZE (28))
 
+CellID-Broadcast ::= SEQUENCE (SIZE(1..maxnoofCellID)) OF CellID-Broadcast-Item
+
+CellID-Broadcast-Item ::= SEQUENCE {
+	eCGI				EUTRAN-CGI,
+	...
+}
+
 Cdma2000PDU	::= OCTET STRING
 
 Cdma2000RATType ::= ENUMERATED {
@@ -197,6 +234,8 @@ Cdma2000OneXPilot ::= OCTET STRING
 
 Cdma2000OneXRAND ::= OCTET STRING
 
+CellType ::= ENUMERATED {ffs,...} -- FFS: The definition of CellType
+
 CGI ::= SEQUENCE {
 	pLMNidentity				PLMNidentity,
 	lAC				LAC,
@@ -207,6 +246,28 @@ CGI ::= SEQUENCE {
 
 CI					::= OCTET STRING (SIZE (2))
 
+CNDomain ::= ENUMERATED {
+	cs, 
+	ps 
+}
+
+CSFallbackIndicator ::= ENUMERATED { 
+	cs-fallback-required, 
+	... 
+}
+
+CSG-Id		::= BIT STRING (SIZE (28))
+
+
+CSG-IdList ::= SEQUENCE (SIZE (1..maxNrOfCSGs)) OF CSG-IdList-Item
+
+CSG-IdList-Item ::= SEQUENCE {
+	cSG-Id			CSG-Id,
+	...
+}
+
+
+
 COUNTvalue ::= SEQUENCE {
 	pDCP-SN			PDCP-SN,
 	hFN				HFN,
@@ -243,6 +304,8 @@ CriticalityDiagnostics-IE-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 
 -- D
 
+DataCodingScheme ::= BIT STRING (SIZE (8))
+
 DL-Forwarding ::= ENUMERATED {
 	dL-Forwarding-proposed,
 	...
@@ -255,12 +318,44 @@ Direct-Forwarding-Path-Availability ::= ENUMERATED {
 
 -- E
 
+ECGIList ::= SEQUENCE (SIZE(1..maxnoofCellID)) OF EUTRAN-CGI
+
+EmergencyAreaIDList ::= SEQUENCE (SIZE(1..maxnoofEmergencyAreaID)) OF EmergencyAreaID
+
+EmergencyAreaID ::= OCTET STRING (SIZE (2))
+
+EmergencyAreaID-Broadcast ::= SEQUENCE (SIZE(1..maxnoofEmergencyAreaID)) OF EmergencyAreaID-Broadcast-Item
+
+EmergencyAreaID-Broadcast-Item ::= SEQUENCE {
+	emergencyAreaID			EmergencyAreaID,
+	completedCellinEAI		CompletedCellinEAI
+}
+
+CompletedCellinEAI ::= SEQUENCE (SIZE(1..maxnoofCellinEAI)) OF CompletedCellinEAI-Item
+
+CompletedCellinEAI-Item ::= SEQUENCE {
+	eCGI					EUTRAN-CGI,
+	...
+}
+
 ENB-ID ::= CHOICE {
 	macroENB-ID			BIT STRING (SIZE(20)),
 	homeENB-ID			BIT STRING (SIZE(28)),
 	...
 }
 
+GERAN-Cell-ID ::= SEQUENCE {
+	lAI				LAI,
+    rAC				RAC, 
+	cI				CI,
+	iE-Extensions			ProtocolExtensionContainer { { GERAN-Cell-ID-ExtIEs} } OPTIONAL,
+	...
+}
+
+GERAN-Cell-ID-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 Global-ENB-ID ::= SEQUENCE {
 	pLMNidentity			PLMNidentity,
 	eNB-ID					ENB-ID,
@@ -287,6 +382,9 @@ ENB-UE-S1AP-ID				::= INTEGER (0..16777215)
 
 ENBname ::= OCTET STRING
 
+
+EncryptionAlgorithms ::= BIT STRING (SIZE (16,...))
+
 EPLMNs ::= SEQUENCE (SIZE(1..maxnoofEPLMNs)) OF PLMNidentity
 EventType	::= ENUMERATED {
 	direct,
@@ -338,10 +436,10 @@ 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,
+	e-RAB-MaximumBitrateDL			BitRate,
+	e-RAB-MaximumBitrateUL			BitRate,
+	e-RAB-GuaranteedBitrateDL		BitRate,
+	e-RAB-GuaranteedBitrateUL		BitRate,
 	iE-Extensions						ProtocolExtensionContainer { { GBR-QosInformation-ExtIEs} } OPTIONAL,
 	...
 }
@@ -396,6 +494,8 @@ HFN ::= INTEGER (0..1048575)
 
 IMSI	::=	OCTET STRING (SIZE (3..8))
 
+IntegrityProtectionAlgorithms ::= BIT STRING (SIZE (16,...))
+
 InterfacesToTraceList ::= SEQUENCE (SIZE (1..maxNrOfInterfaces)) OF InterfacesToTraceItem
 
 InterfacesToTraceItem ::= SEQUENCE {
@@ -433,8 +533,29 @@ LAI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+LastVisitedCell-Item ::= CHOICE {
+	e-UTRAN-Cell					LastVisitedEUTRANCellInformation,
+	uTRAN-Cell						LastVisitedUTRANCellInformation,
+	...
+}
+LastVisitedEUTRANCellInformation ::= SEQUENCE {
+	global-Cell-ID					EUTRAN-CGI,
+	cellType						CellType,
+	time-UE-StayedInCell			Time-UE-StayedInCell,
+	iE-Extensions					ProtocolExtensionContainer { { LastVisitedEUTRANCellInformation-ExtIEs} } OPTIONAL,
+	...
+}
+LastVisitedEUTRANCellInformation-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+LastVisitedUTRANCellInformation	::= OCTET STRING
+
+
+
 -- M
 
+MessageIdentifier	::= OCTET STRING (SIZE (16))
+
 MMEname ::= OCTET STRING
 
 MME-Group-ID	::= OCTET STRING (SIZE (2))
@@ -449,6 +570,9 @@ M-TMSI			::= OCTET STRING (SIZE (4))
 
 NAS-PDU ::=  OCTET STRING
 
+NumberofBroadcastRequest ::= INTEGER (0..65535)
+
+NumberofBroadcast ::= INTEGER (0..65535)
 
 -- O
 OverloadAction ::= ENUMERATED {
@@ -466,21 +590,29 @@ OverloadResponse ::= CHOICE {
 
 -- P
 
-PagingDRX ::= INTEGER (0..4095)
+PagingDRX ::= ENUMERATED {
+	v32,
+	v64,
+	v128,
+	v256,
+	...
+	}
 
-PagingCause ::= ENUMERATED { 
-	terminating-conversational-call, 
-	terminating-streaming-call, 
-	terminating-interactive-call, 
-	terminating-background-call, 
-	terminating-low-priority-signalling,
-	..., 
-	terminating-high-priority-signalling
-}
 PDCP-SN ::= INTEGER (0..4095) 
 
 PLMNidentity 				::= TBCD-STRING 
 
+Pre-emptionCapability ::= ENUMERATED {
+	shall-not-trigger-pre-emption,
+	may-trigger-pre-emption
+}
+
+Pre-emptionVulnerability ::= ENUMERATED {
+	not-pre-emptable,
+	pre-emptable
+}
+
+PriorityLevel				::= INTEGER { spare (0), highest (1), lowest (14), no-priority (15) } (0..15)
 
 
 -- Q
@@ -489,6 +621,8 @@ QCI						::= INTEGER (1..256)
 
 -- R
 
+ReceiveStatusofULPDCPSDUs ::= BIT STRING (SIZE(4096))
+
 RelativeMMECapacity				::= INTEGER (0..255)
 
 RAC					::= OCTET STRING (SIZE (1))
@@ -506,8 +640,28 @@ RequestType-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+RIMTransfer ::= SEQUENCE {
+	rIMInformation					RIMInformation,
+	rIMRoutingAddress				RIMRoutingAddress		OPTIONAL,
+	iE-Extensions			ProtocolExtensionContainer { { RIMTransfer-ExtIEs} }			OPTIONAL,
+...
+}
+
+RIMTransfer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+RIMInformation ::= OCTET STRING
+
+RIMRoutingAddress ::= CHOICE {
+	gERAN-Cell-ID			GERAN-Cell-ID,
+	...
+}
+
 ReportArea	::= OCTET STRING
 
+RepetitionPeriod ::= INTEGER (1..4096)
+
 
 RNC-ID					::= INTEGER (0..4095)
 
@@ -515,97 +669,102 @@ RRC-Container	::= OCTET STRING
 
 -- S
 
-SAE-Bearer-ID		::= INTEGER (0..15, ...)
+E-RAB-ID		::= INTEGER (0..15, ...)
 
-SAEBearerInformationList	::= SEQUENCE (SIZE (1.. maxNrOfSAEBs)) OF ProtocolIE-SingleContainer { { SAEBearerInformationListIEs } }
+E-RABInformationList	::= SEQUENCE (SIZE (1.. maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { { E-RABInformationListIEs } }
 
-SAEBearerInformationListIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-SAEBearerInformationListItem			CRITICALITY ignore	TYPE SAEBearerInformationListItem			PRESENCE mandatory	},
+E-RABInformationListIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-E-RABInformationListItem			CRITICALITY ignore	TYPE E-RABInformationListItem			PRESENCE mandatory	},
 	...
 }
 
-SAEBearerInformationListItem ::= SEQUENCE {
-	sAE-Bearer-ID					SAE-Bearer-ID,
+E-RABInformationListItem ::= SEQUENCE {
+	e-RAB-ID					E-RAB-ID,
 	dL-Forwarding					DL-Forwarding		OPTIONAL,
-	iE-Extensions					ProtocolExtensionContainer { {SAEBearerInformationListItem-ExtIEs} }			OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { {E-RABInformationListItem-ExtIEs} }			OPTIONAL,
 	...
 }
 
-SAEBearerInformationListItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+E-RABInformationListItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-SAEBearerList ::= SEQUENCE (SIZE(1.. maxNrOfSAEBs)) OF ProtocolIE-SingleContainer { {SAEBearerItemIEs} }
+E-RABList ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { {E-RABItemIEs} }
 
-SAEBearerItemIEs 	S1AP-PROTOCOL-IES ::= {
-	{ ID id-SAEBearerItem	 CRITICALITY ignore 	TYPE SAEBearerItem 	PRESENCE mandatory },
+E-RABItemIEs 	S1AP-PROTOCOL-IES ::= {
+	{ ID id-E-RABItem	 CRITICALITY ignore 	TYPE E-RABItem 	PRESENCE mandatory },
 	...
 }
 
-SAEBearerItem ::= SEQUENCE {
-	sAE-Bearer-ID				SAE-Bearer-ID,
+E-RABItem ::= SEQUENCE {
+	e-RAB-ID				E-RAB-ID,
 	cause						Cause,
-	iE-Extensions				ProtocolExtensionContainer { {SAEBearerItem-ExtIEs} } OPTIONAL,
+	iE-Extensions				ProtocolExtensionContainer { {E-RABItem-ExtIEs} } OPTIONAL,
 	...
 }
 
-SAEBearerItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+E-RABItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
 
 
 
-SAE-BearerLevelQoSParameters ::= SEQUENCE {
+E-RABLevelQoSParameters ::= SEQUENCE {
 	qCI			QCI,
-	allocationRetentionPriority			AllocationRetentionPriority,
+	allocationRetentionPriority			AllocationAndRetentionPriority,
 	gbrQosInformation					GBR-QosInformation			OPTIONAL,
-	iE-Extensions						ProtocolExtensionContainer { {SAE-Bearer-QoSParameters-ExtIEs} } OPTIONAL,
+	iE-Extensions						ProtocolExtensionContainer { {E-RABQoSParameters-ExtIEs} } OPTIONAL,
 	...
 }
 
-SAE-Bearer-QoSParameters-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+E-RABQoSParameters-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
 
 
-SecurityInfo ::= SEQUENCE {
-	securityKey		SecurityKey,
-	iE-Extensions			ProtocolExtensionContainer { { SecurityInfo-ExtIEs} } OPTIONAL,
-	...
-}
 
-SecurityKey	::= BIT STRING (SIZE(128))
+
+SecurityKey	::= BIT STRING (SIZE(256))
 
 
-SecurityInfo-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+
+SecurityContext ::= SEQUENCE {
+	nexthopchainingcount		SecurityKey,
+	nexthopparameter							BIT STRING (SIZE(3)),
+	iE-Extensions			ProtocolExtensionContainer { { SecurityContext-ExtIEs} } OPTIONAL,
 	...
 }
 
-SecurityInformation ::= SEQUENCE {
-	securityPlaceHolder		SecurityPlaceHolder,
-	iE-Extensions			ProtocolExtensionContainer { { SecurityInformation-ExtIEs} } OPTIONAL,
+
+SecurityContext-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-SecurityPlaceHolder	::= ENUMERATED {
-	whatever,
+SerialNumber ::= BIT STRING (SIZE (16))
+
+Source-ToTarget-TransparentContainer ::= OCTET STRING
+
+SourceBSS-ToTargetBSS-TransparentContainer		::= OCTET STRING
+
+SRVCCOperationPossible ::= ENUMERATED {
+	possible,
 	...
 }
 
-SecurityInformation-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+SRVCCHOIndication ::= ENUMERATED {
+	pSandCS,
+	cSonly,
 	...
 }
 
-SourceBSS-ToTargetBSS-TransparentContainer		::= OCTET STRING
-
-
 SourceeNodeB-ToTargeteNodeB-TransparentContainer		::= SEQUENCE {
 	rRC-Container					RRC-Container,
-	sAEBearerInformationList		SAEBearerInformationList		OPTIONAL,
+	e-RABInformationList		E-RABInformationList		OPTIONAL,
 	targetCell-ID					EUTRAN-CGI,
 	subscriberProfileIDforRFP				SubscriberProfileIDforRFP		OPTIONAL,
+	uE-HistoryInformation			UE-HistoryInformation,
 	iE-Extensions			ProtocolExtensionContainer { {SourceeNodeB-ToTargeteNodeB-TransparentContainer-ExtIEs} } OPTIONAL,
 	...
 }
@@ -640,7 +799,9 @@ S-TMSI ::= SEQUENCE {
 
 -- T
 
-TAC ::= OCTET STRING
+TAC ::= OCTET STRING (SIZE (2))
+
+TAIListforWarning ::= SEQUENCE (SIZE(1..maxnoofTAIforWarning)) OF TAI
 
 TAI ::= SEQUENCE {
 	pLMNidentity			PLMNidentity,
@@ -652,15 +813,38 @@ TAI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+TAI-Broadcast ::= SEQUENCE (SIZE(1..maxnoofTAIforWarning)) OF TAI-Broadcast-Item
+
+TAI-Broadcast-Item ::= SEQUENCE {
+	tAI					TAI,
+	completedCellinTAI	CompletedCellinTAI
+}
+
+CompletedCellinTAI ::= SEQUENCE (SIZE(0..maxnoofCellinTAI)) OF CompletedCellinTAI-Item
+
+CompletedCellinTAI-Item ::= SEQUENCE{
+	eCGI				EUTRAN-CGI,
+	...
+}
+
 TBCD-STRING ::= OCTET STRING (SIZE (3))
 
 TargetID ::= CHOICE {
-	targeteNB-ID			Global-ENB-ID,
+	targeteNB-ID			TargeteNB-ID,
 	targetRNC-ID			TargetRNC-ID,
 	cGI				CGI,
 	...
 }
 
+TargeteNB-ID ::= SEQUENCE {
+	global-ENB-ID	Global-ENB-ID,
+	selected-TAI	TAI,
+	iE-Extensions	ProtocolExtensionContainer { {TargeteNB-ID-ExtIEs} } OPTIONAL
+}
+
+TargeteNB-ID-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
 TargetRNC-ID ::= SEQUENCE {
 	lAI					LAI,
@@ -680,10 +864,13 @@ TargeteNodeB-ToSourceeNodeB-TransparentContainer-ExtIEs S1AP-PROTOCOL-EXTENSION
 	...
 }
 
+Target-ToSource-TransparentContainer ::= OCTET STRING
 TargetRNC-ToSourceRNC-TransparentContainer		::= OCTET STRING
 TargetBSS-ToSourceBSS-TransparentContainer		::= OCTET STRING
 
-TimeToWait ::= OCTET STRING
+TimeToWait ::= ENUMERATED {v1s, v2s, v5s, v10s, v20s, v60s, ...}
+
+Time-UE-StayedInCell ::= INTEGER (0..4095)
 
 TransportLayerAddress		::= BIT STRING (SIZE(1..160, ...))
 
@@ -753,7 +940,9 @@ UE-associatedLogicalS1-ConnectionItemExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-UEIdentityIndexValue	::=	OCTET STRING
+UEIdentityIndexValue	::=	BIT STRING (SIZE (10))
+
+UE-HistoryInformation ::= SEQUENCE (SIZE(1..maxnoofCells)) OF LastVisitedCell-Item
 
 UEPagingID ::= CHOICE {
 	s-TMSI		S-TMSI,
@@ -763,11 +952,41 @@ UEPagingID ::= CHOICE {
 
 UERadioCapability ::= OCTET STRING
 
+UESecurityCapabilities ::= SEQUENCE {
+	encryptionAlgorithms			EncryptionAlgorithms,
+	integrityProtectionAlgorithms		IntegrityProtectionAlgorithms,
+	iE-Extensions				ProtocolExtensionContainer { { UESecurityCapabilities-ExtIEs} }		OPTIONAL,
+...
+}
+
+UESecurityCapabilities-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
 -- V
 -- W
+
+WarningAreaList ::= CHOICE {
+	cellIDList						ECGIList,
+	trackingAreaListforWarning		TAIListforWarning,
+	emergencyAreaIDList				EmergencyAreaIDList,
+	...
+}
+
+
+WarningType ::= OCTET STRING (SIZE (2))
+
+WarningSecurityInfo ::= OCTET STRING (SIZE (50))
+
+
+WarningMessageContents ::= OCTET STRING
+
+
 -- X
+
+
 -- Y
 -- Z
 
 END
+
diff --git a/asn1/s1ap/S1AP-PDU-Contents.asn b/asn1/s1ap/S1AP-PDU-Contents.asn
index e4c6ce5523..82a929f225 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.3.0 (2008-09)
+-- 3GPP TS 36.413 V8.4.0 (2008-12)
 -- 9.3.3	PDU Definitions
 -- **************************************************************
 --
@@ -32,7 +32,11 @@ IMPORTS
 	Cdma2000PDU,
 	Cdma2000RATType,
 	Cdma2000SectorID,
+	CNDomain,
 	CriticalityDiagnostics,
+	CSFallbackIndicator,
+	CSG-Id,
+	CSG-IdList,
 	Direct-Forwarding-Path-Availability,
 	Global-ENB-ID,
 	EUTRAN-CGI,
@@ -47,24 +51,28 @@ IMPORTS
 	MME-UE-S1AP-ID,
 	NAS-PDU,
 	OverloadResponse,
-	PagingCause,
 	PagingDRX,
 	PLMNidentity,
+	RIMTransfer,
 	RelativeMMECapacity,
 	RequestType,
-	SAE-Bearer-ID,
-	SAE-BearerLevelQoSParameters,
-	SAEBearerList,
-	SecurityInfo,
-	SecurityInformation,
+	E-RAB-ID,
+	E-RABLevelQoSParameters,
+	E-RABList,
+	SecurityKey,
+	SecurityContext,
 	ServedGUMMEIs,
 	ServedPLMNs,
+	Source-ToTarget-TransparentContainer,
 	SourceBSS-ToTargetBSS-TransparentContainer,
 	SourceeNodeB-ToTargeteNodeB-TransparentContainer,
 	SourceRNC-ToTargetRNC-TransparentContainer,
 	SubscriberProfileIDforRFP,
+	SRVCCOperationPossible,
+	SRVCCHOIndication,
 	SupportedTAs,
 	TAI,
+	Target-ToSource-TransparentContainer,
 	TargetBSS-ToSourceBSS-TransparentContainer,	
 	TargeteNodeB-ToSourceeNodeB-TransparentContainer,
 	TargetID,
@@ -78,7 +86,18 @@ IMPORTS
 	UERadioCapability,
 	UE-S1AP-IDs,
 	UE-associatedLogicalS1-ConnectionItem,
-	S-TMSI
+	UESecurityCapabilities,
+	S-TMSI,
+	MessageIdentifier,
+	SerialNumber,
+	WarningAreaList,
+	RepetitionPeriod,
+	NumberofBroadcastRequest,
+	WarningType,
+	WarningSecurityInfo,
+	DataCodingScheme,
+	WarningMessageContents,
+	BroadcastCompletedAreaList
 
 FROM S1AP-IEs
 
@@ -105,7 +124,11 @@ FROM S1AP-Containers
 	id-cdma2000PDU,
 	id-cdma2000RATType,
 	id-cdma2000SectorID,
+	id-CNDomain,
 	id-CriticalityDiagnostics,
+	id-CSFallbackIndicator,
+	id-CSG-Id,
+	id-CSG-IdList,
 	id-Direct-Forwarding-Path-Availability,
 	id-Global-ENB-ID,
 	id-EUTRAN-CGI,
@@ -117,69 +140,69 @@ FROM S1AP-Containers
 	id-HandoverRestrictionList,
 	id-HandoverType,
 	id-InitialContextSetup,
-	id-Intra-LTEHOInformationReq,
-	id-Intra-LTEHOInformationRes,
-	id-LTEtoGERANHOInformationReq,
-	id-LTEtoGERANHOInformationRes,
-	id-LTEtoUTRANHOInformationReq,
-	id-LTEtoUTRANHOInformationRes,
+	id-Inter-SystemInformationTransferTypeEDT,	id-Inter-SystemInformationTransferTypeMDT,
+	id-NAS-DownlinkCount,
 	id-MMEname,
 	id-MME-UE-S1AP-ID,
 	id-NAS-PDU,
 	id-OverloadResponse,
-	id-pagingCause,
 	id-pagingDRX,
 	id-RelativeMMECapacity,
 	id-RequestType,
-	id-SAEBearerAdmittedItem,
-	id-SAEBearerAdmittedList,
-	id-SAEBearerDataForwardingItem,
-	id-SAEBearerFailedToModifyList,
-	id-SAEBearerFailedToReleaseList,
-	id-SAEBearerFailedtoSetupItemHOReqAck,
-	id-SAEBearerFailedToSetupListBearerSURes,
-	id-SAEBearerFailedToSetupListCtxtSURes,
-	id-SAEBearerFailedToSetupListHOReqAck,	id-SAEBearerFailedToSwitchDLList,
-	id-SAEBearerModify,
-	id-SAEBearerModifyItemBearerModRes,
-	id-SAEBearerModifyListBearerModRes,
-	id-SAEBearerRelease,
-	id-SAEBearerReleaseItemBearerRelComp,
-	id-SAEBearerReleaseItemHOCmd,
-	id-SAEBearerReleaseListBearerRelComp,
-	id-SAEBearerReleaseRequest,
-	id-SAEBearerSetup,
-	id-SAEBearerSetupItemBearerSURes,
-	id-SAEBearerSetupItemCtxtSURes,
-	id-SAEBearerSetupListBearerSURes,
-	id-SAEBearerSetupListCtxtSURes,
-	id-SAEBearerSubjecttoDataForwardingList,
-	id-SAEBearerToBeModifiedItemBearerModReq,
-	id-SAEBearerToBeModifiedListBearerModReq,
-	id-SAEBearerToBeReleasedList,
-	id-SAEBearerToBeSetupItemBearerSUReq,
-	id-SAEBearerToBeSetupItemCtxtSUReq,
-	id-SAEBearerToBeSetupItemHOReq,
-	id-SAEBearerToBeSetupListBearerSUReq,
-	id-SAEBearerToBeSetupListCtxtSUReq,
-	id-SAEBearerToBeSetupListHOReq,
-	id-SAEBearerToBeSwitchedDLItem,
-	id-SAEBearerToBeSwitchedDLList,
-	id-SAEBearerToBeSwitchedULList,
-	id-SAEBearerToBeSwitchedULItem,
-	id-SAEBearertoReleaseListHOCmd,
-	id-SecurityInfo,
-	id-Security-Information,
+	id-E-RABAdmittedItem,
+	id-E-RABAdmittedList,
+	id-E-RABDataForwardingItem,
+	id-E-RABFailedToModifyList,
+	id-E-RABFailedToReleaseList,
+	id-E-RABFailedtoSetupItemHOReqAck,
+	id-E-RABFailedToSetupListBearerSURes,
+	id-E-RABFailedToSetupListCtxtSURes,
+	id-E-RABFailedToSetupListHOReqAck,
+	id-E-RABFailedToBeReleasedList,
+	id-E-RABModify,
+	id-E-RABModifyItemBearerModRes,
+	id-E-RABModifyListBearerModRes,
+	id-E-RABRelease,
+	id-E-RABReleaseItemBearerRelComp,
+	id-E-RABReleaseItemHOCmd,
+	id-E-RABReleaseListBearerRelComp,
+	id-E-RABReleaseIndication,
+	id-E-RABSetup,
+	id-E-RABSetupItemBearerSURes,
+	id-E-RABSetupItemCtxtSURes,
+	id-E-RABSetupListBearerSURes,
+	id-E-RABSetupListCtxtSURes,
+	id-E-RABSubjecttoDataForwardingList,
+	id-E-RABToBeModifiedItemBearerModReq,
+	id-E-RABToBeModifiedListBearerModReq,
+	id-E-RABToBeReleasedList,
+	id-E-RABReleasedList,
+	id-E-RABToBeSetupItemBearerSUReq,
+	id-E-RABToBeSetupItemCtxtSUReq,
+	id-E-RABToBeSetupItemHOReq,
+	id-E-RABToBeSetupListBearerSUReq,
+	id-E-RABToBeSetupListCtxtSUReq,
+	id-E-RABToBeSetupListHOReq,
+	id-E-RABToBeSwitchedDLItem,
+	id-E-RABToBeSwitchedDLList,
+	id-E-RABToBeSwitchedULList,
+	id-E-RABToBeSwitchedULItem,
+	id-E-RABtoReleaseListHOCmd,
+	id-SecurityKey,
+	id-SecurityContext,
 	id-ServedGUMMEIs,
 	id-ServedPLMNs,
-	id-SourceeNodeB-ToTargeteNodeB-TransparentContainer,
+	id-Source-ToTarget-TransparentContainer,
 	id-SourceMME-UE-S1AP-ID,
+	id-SRVCCOperationPossible,
+	id-SRVCCHOIndication,
 	id-SubscriberProfileIDforRFP,
 	id-SupportedTAs,
 	id-S-TMSI,
 	id-TAI,
 	id-TAIItem,
 	id-TAIList,
+	id-Target-ToSource-TransparentContainer,
 	id-TargetID,
 	id-TimeToWait,
 	id-TraceActivation,
@@ -190,12 +213,28 @@ FROM S1AP-Containers
 	id-UTRANtoLTEHOInformationRes,
 	id-UE-associatedLogicalS1-ConnectionListResAck,
 	id-UE-associatedLogicalS1-ConnectionItem,
+	id-UESecurityCapabilities,
 	id-UE-S1AP-IDs,
 	id-ResetType,
+	id-MessageIdentifier,
+	id-SerialNumber,
+	id-WarningAreaList,
+	id-RepetitionPeriod,
+	id-NumberofBroadcastRequest,
+	id-WarningType,
+	id-WarningSecurityInfo,
+	id-DataCodingScheme,
+	id-WarningMessageContents,
+	id-BroadcastCompletedAreaList,
 	maxnoofTAI,
 	maxNrOfErrors,
-	maxNrOfSAEBs,
-	maxNrOfIndividualS1ConnectionsToReset
+	maxNrOfE-RABs,
+	maxNrOfIndividualS1ConnectionsToReset,
+	maxnoofEmergencyAreaID,
+	maxnoofCellID,
+	maxnoofTAIforWarning,
+	maxnoofCellinTAI,
+	maxnoofCellinEAI
 
 
 FROM S1AP-Constants;
@@ -206,9 +245,9 @@ FROM S1AP-Constants;
 --
 -- **************************************************************
 
-SAEB-IE-ContainerList                  { S1AP-PROTOCOL-IES      : IEsSetParam }	::= ProtocolIE-ContainerList     { 1, maxNrOfSAEBs,   {IEsSetParam} }
-SAEB-IE-ContainerPairList              { S1AP-PROTOCOL-IES-PAIR : IEsSetParam }	::= ProtocolIE-ContainerPairList { 1, maxNrOfSAEBs,   {IEsSetParam} }
-ProtocolError-IE-ContainerList        { S1AP-PROTOCOL-IES      : IEsSetParam }	::= ProtocolIE-ContainerList     { 1, maxNrOfSAEBs,   {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} }
 
 -- **************************************************************
 --
@@ -233,47 +272,13 @@ HandoverRequiredIEs S1AP-PROTOCOL-IES ::= {
 	{ 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-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” --		} |
-	{ ID id-LTEtoUTRANHOInformationReq			CRITICALITY reject	TYPE LTEtoUTRANHOInformationReq			PRESENCE conditional
-	-- 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” --												},
-	...
-}
-
-Intra-LTEHOInformationReq ::= SEQUENCE {
-	sourceeNodeB-ToTargeteNodeB-TransparentContainer					SourceeNodeB-ToTargeteNodeB-TransparentContainer,
-	iE-Extensions					ProtocolExtensionContainer { {Intra-LTEHOInformationReq-ExtIEs} }			OPTIONAL,
-	...
-}
-
-Intra-LTEHOInformationReq-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-	...
-}
-
-LTEtoUTRANHOInformationReq ::= SEQUENCE {
-	sourceRNC-ToTargetRNC-TransparentContainer					SourceRNC-ToTargetRNC-TransparentContainer,
-	iE-Extensions					ProtocolExtensionContainer { {LTEtoUTRANHOInformationReq-ExtIEs} }			OPTIONAL,
-	...
-}
+	{ ID id-SRVCCHOIndication			CRITICALITY	reject	TYPE	SRVCCHOIndication		PRESENCE optional }|
+	{ ID id-Source-ToTarget-TransparentContainer CRITICALITY reject TYPE Source-ToTarget-TransparentContainer PRESENCE mandatory },
 
-LTEtoUTRANHOInformationReq-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-LTEtoGERANHOInformationReq ::= SEQUENCE {
-	sourceBSS-ToTargetBSS-TransparentContainer					SourceBSS-ToTargetBSS-TransparentContainer,
-	iE-Extensions					ProtocolExtensionContainer { {LTEtoGERANHOInformationReq-ExtIEs} }			OPTIONAL,
-	...
-}
-
-LTEtoGERANHOInformationReq-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-	...
-}
 
 -- **************************************************************
 --
@@ -290,84 +295,39 @@ 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-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” --		} |
-	{ ID id-LTEtoUTRANHOInformationRes			CRITICALITY reject	TYPE LTEtoUTRANHOInformationRes			PRESENCE conditional
-	-- 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” --												}|
+	{ 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	},
 	...
 }
 
-SAEBearerSubjecttoDataForwardingList ::= SAEB-IE-ContainerList { {SAEBearerDataForwardingItemIEs} }
-
-SAEBearerDataForwardingItemIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-SAEBearerDataForwardingItem			CRITICALITY ignore	TYPE SAEBearerDataForwardingItem			PRESENCE mandatory	},
-	...
-}
-
-SAEBearerDataForwardingItem ::= SEQUENCE {
-	sAE-Bearer-ID						SAE-Bearer-ID,
-	dL-transportLayerAddress				TransportLayerAddress,
-	dL-gTP-TEID					GTP-TEID,
-	iE-Extensions					ProtocolExtensionContainer { { SAEBearerDataForwardingItem-ExtIEs} }			OPTIONAL,
-	...
-}
-
-SAEBearerDataForwardingItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-	...
-}
-
-SAEBearertoReleaseListHOCmd					::= SAEB-IE-ContainerList { {SAEBearerReleaseItemHOCmdIEs} }
-
-SAEBearerReleaseItemHOCmdIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-SAEBearerReleaseItemHOCmd			CRITICALITY ignore	TYPE SAEBearerReleaseItemHOCmd			PRESENCE mandatory	},
-	...
-}
-
-SAEBearerReleaseItemHOCmd ::= SEQUENCE {
-	sAE-Bearer-ID						SAE-Bearer-ID,
-	iE-Extensions					ProtocolExtensionContainer { { SAEBearerReleaseItemHOCmd-ExtIEs} }			OPTIONAL,
-	...
-}
+NAS-DownlinkCount ::= BIT STRING (SIZE (4))
 
-SAEBearerReleaseItemHOCmd-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-	...
-}
+E-RABSubjecttoDataForwardingList ::= E-RAB-IE-ContainerList { {E-RABDataForwardingItemIEs} }
 
-Intra-LTEHOInformationRes ::= SEQUENCE {
-	targeteNodeB-ToSourceeNodeB-TransparentContainer					TargeteNodeB-ToSourceeNodeB-TransparentContainer,
-	iE-Extensions					ProtocolExtensionContainer { {Intra-LTEHOInformationRes-ExtIEs} }			OPTIONAL,
+E-RABDataForwardingItemIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-E-RABDataForwardingItem			CRITICALITY ignore	TYPE E-RABDataForwardingItem			PRESENCE mandatory	},
 	...
 }
 
-Intra-LTEHOInformationRes-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+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,
 	...
 }
 
-LTEtoUTRANHOInformationRes ::= SEQUENCE {
-	targetRNC-ToSourceRNC-TransparentContainer					TargetRNC-ToSourceRNC-TransparentContainer,
-	iE-Extensions					ProtocolExtensionContainer { {LTEtoUTRANHOInformationRes-ExtIEs} }			OPTIONAL,
+E-RABDataForwardingItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-LTEtoUTRANHOInformationRes-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-	...
-}
 
-LTEtoGERANHOInformationRes ::= SEQUENCE {
-	targetBSS-ToSourceBSS-TransparentContainer					TargetBSS-ToSourceBSS-TransparentContainer,
-	iE-Extensions					ProtocolExtensionContainer { {LTEtoGERANHOInformationRes-ExtIEs} }			OPTIONAL,
-	...
-}
-
-LTEtoGERANHOInformationRes-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-	...
-}
 
 -- **************************************************************
 --
@@ -381,8 +341,8 @@ 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-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	},
 	...
@@ -410,31 +370,34 @@ HandoverRequestIEs S1AP-PROTOCOL-IES ::= {
 	{ 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-SAEBearerToBeSetupListHOReq					CRITICALITY reject	TYPE SAEBearerToBeSetupListHOReq		 			PRESENCE mandatory	} |
-	{ ID id-SourceeNodeB-ToTargeteNodeB-TransparentContainer		CRITICALITY reject	TYPE SourceeNodeB-ToTargeteNodeB-TransparentContainer		 			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-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},
 	...
 }
 
-SAEBearerToBeSetupListHOReq 					::= SAEB-IE-ContainerList { {SAEBearerToBeSetupItemHOReqIEs} }
+E-RABToBeSetupListHOReq 					::= E-RAB-IE-ContainerList { {E-RABToBeSetupItemHOReqIEs} }
 
-SAEBearerToBeSetupItemHOReqIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-SAEBearerToBeSetupItemHOReq			CRITICALITY reject	TYPE SAEBearerToBeSetupItemHOReq			PRESENCE mandatory	},
+E-RABToBeSetupItemHOReqIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-E-RABToBeSetupItemHOReq			CRITICALITY reject	TYPE E-RABToBeSetupItemHOReq			PRESENCE mandatory	},
 	...
 }
 
-SAEBearerToBeSetupItemHOReq ::= SEQUENCE {
-	sAE-Bearer-ID						SAE-Bearer-ID,
+E-RABToBeSetupItemHOReq ::= SEQUENCE {
+	e-RAB-ID						E-RAB-ID,
 	transportLayerAddress				TransportLayerAddress,
 	gTP-TEID					GTP-TEID,
-	sAE-BearerlevelQosParameters				SAE-BearerLevelQoSParameters,
-	iE-Extensions					ProtocolExtensionContainer { {SAEBearerToBeSetupItemHOReq-ExtIEs} }			OPTIONAL,
+	e-RABlevelQosParameters				E-RABLevelQoSParameters,
+	iE-Extensions					ProtocolExtensionContainer { {E-RABToBeSetupItemHOReq-ExtIEs} }			OPTIONAL,
 	...
 }
 
-SAEBearerToBeSetupItemHOReq-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+E-RABToBeSetupItemHOReq-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -450,78 +413,54 @@ HandoverRequestAcknowledge ::= SEQUENCE {
 }
 
 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 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” --		} |
-	{ ID id-UTRANtoLTEHOInformationRes			CRITICALITY reject	TYPE UTRANtoLTEHOInformationRes			PRESENCE conditional
-	-- 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” --												}|
+	{ 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	},
 	...
 }
 
-SAEBearerAdmittedList 					::= SAEB-IE-ContainerList { {SAEBearerAdmittedItemIEs} }
+E-RABAdmittedList 					::= E-RAB-IE-ContainerList { {E-RABAdmittedItemIEs} }
 
-SAEBearerAdmittedItemIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-SAEBearerAdmittedItem			CRITICALITY ignore	TYPE SAEBearerAdmittedItem			PRESENCE mandatory	},
+E-RABAdmittedItemIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-E-RABAdmittedItem			CRITICALITY ignore	TYPE E-RABAdmittedItem			PRESENCE mandatory	},
 	...
 }
 
-SAEBearerAdmittedItem ::= SEQUENCE {
-	sAE-Bearer-ID						SAE-Bearer-ID,
+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,
-	iE-Extensions					ProtocolExtensionContainer { {SAEBearerAdmittedItem-ExtIEs} }			OPTIONAL,
+	uL-TransportLayerAddress				TransportLayerAddress	OPTIONAL,
+	uL-GTP-TEID								GTP-TEID				OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { {E-RABAdmittedItem-ExtIEs} }			OPTIONAL,
 	...
 }
 
-SAEBearerAdmittedItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+E-RABAdmittedItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-SAEBearerFailedtoSetupListHOReqAck 					::= SAEB-IE-ContainerList { {SAEBearerFailedtoSetupItemHOReqAckIEs} }
+E-RABFailedtoSetupListHOReqAck 					::= E-RAB-IE-ContainerList { {E-RABFailedtoSetupItemHOReqAckIEs} }
 
-SAEBearerFailedtoSetupItemHOReqAckIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-SAEBearerFailedtoSetupItemHOReqAck			CRITICALITY ignore	TYPE SAEBearerFailedToSetupItemHOReqAck			PRESENCE mandatory	},
+E-RABFailedtoSetupItemHOReqAckIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-E-RABFailedtoSetupItemHOReqAck			CRITICALITY ignore	TYPE E-RABFailedToSetupItemHOReqAck			PRESENCE mandatory	},
 	...
 }
 
-SAEBearerFailedToSetupItemHOReqAck ::= SEQUENCE {
-	sAE-Bearer-ID						SAE-Bearer-ID,
+E-RABFailedToSetupItemHOReqAck ::= SEQUENCE {
+	e-RAB-ID						E-RAB-ID,
 	cause				Cause,
-	iE-Extensions					ProtocolExtensionContainer { { SAEBearerFailedToSetupItemHOReqAckExtIEs} }			OPTIONAL,
-	...
-}
-
-SAEBearerFailedToSetupItemHOReqAckExtIEs S1AP-PROTOCOL-EXTENSION ::= {
-	...
-}
-
-UTRANtoLTEHOInformationRes ::= SEQUENCE {
-	targetRNC-ToSourceRNC-TransparentContainer					TargetRNC-ToSourceRNC-TransparentContainer,
-	iE-Extensions					ProtocolExtensionContainer { {UTRANtoLTEHOInformationRes-ExtIEs} }			OPTIONAL,
-	...
-}
-
-UTRANtoLTEHOInformationRes-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	iE-Extensions					ProtocolExtensionContainer { { E-RABFailedToSetupItemHOReqAckExtIEs} }			OPTIONAL,
 	...
 }
 
-GERANtoLTEHOInformationRes ::= SEQUENCE {
-	targetBSS-ToSourceBSS-TransparentContainer					TargetBSS-ToSourceBSS-TransparentContainer,
-	iE-Extensions					ProtocolExtensionContainer { {GERANtoLTEHOInformationRes-ExtIEs} }			OPTIONAL,
-	...
-}
-
-GERANtoLTEHOInformationRes-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+E-RABFailedToSetupItemHOReqAckExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -538,7 +477,7 @@ HandoverFailure ::= SEQUENCE {
 }
 
 HandoverFailureIEs S1AP-PROTOCOL-IES ::= {	
-	{ ID id-MME-UE-S1AP-ID					CRITICALITY reject	TYPE MME-UE-S1AP-ID		 			PRESENCE mandatory	} |
+	{ 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	},
 	...
@@ -564,7 +503,9 @@ 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-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	},
 	...
 }
 
@@ -587,28 +528,30 @@ 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-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-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	},
 	...
 }
 
-SAEBearerToBeSwitchedDLList 					::= SAEB-IE-ContainerList { {SAEBearerToBeSwitchedDLItemIEs} }
+E-RABToBeSwitchedDLList 					::= E-RAB-IE-ContainerList { {E-RABToBeSwitchedDLItemIEs} }
 
-SAEBearerToBeSwitchedDLItemIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-SAEBearerToBeSwitchedDLItem			CRITICALITY reject	TYPE SAEBearerToBeSwitchedDLItem			PRESENCE mandatory	},
+E-RABToBeSwitchedDLItemIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-E-RABToBeSwitchedDLItem			CRITICALITY reject	TYPE E-RABToBeSwitchedDLItem			PRESENCE mandatory	},
 	...
 }
 
-SAEBearerToBeSwitchedDLItem ::= SEQUENCE {
-	sAE-Bearer-ID						SAE-Bearer-ID,
+E-RABToBeSwitchedDLItem ::= SEQUENCE {
+	e-RAB-ID						E-RAB-ID,
 	transportLayerAddress				TransportLayerAddress,
 	gTP-TEID					GTP-TEID,
-	iE-Extensions					ProtocolExtensionContainer { { SAEBearerToBeSwitchedDLItem-ExtIEs} }			OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { { E-RABToBeSwitchedDLItem-ExtIEs} }			OPTIONAL,
 	...
 }
 
-SAEBearerToBeSwitchedDLItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+E-RABToBeSwitchedDLItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -624,31 +567,32 @@ 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-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-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-uEaggregateMaximumBitrate		CRITICALITY ignore	TYPE UEAggregateMaximumBitrate		PRESENCE optional	}|
+	{ ID id-E-RABToBeSwitchedULList		CRITICALITY ignore	TYPE E-RABToBeSwitchedULList	PRESENCE optional }|
+	{ ID id-E-RABToBeReleasedList		CRITICALITY ignore	TYPE E-RABList				PRESENCE optional	}|
+	{ ID id-SecurityContext				CRITICALITY reject	TYPE	SecurityContext			PRESENCE mandatory}|
 	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
 
-SAEBearerToBeSwitchedULList ::= SAEB-IE-ContainerList { {SAEBearerToBeSwitchedULItemIEs} }
+E-RABToBeSwitchedULList ::= E-RAB-IE-ContainerList { {E-RABToBeSwitchedULItemIEs} }
 
-SAEBearerToBeSwitchedULItemIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-SAEBearerToBeSwitchedULItem		CRITICALITY ignore	TYPE SAEBearerToBeSwitchedULItem	PRESENCE mandatory	},
+E-RABToBeSwitchedULItemIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-E-RABToBeSwitchedULItem		CRITICALITY ignore	TYPE E-RABToBeSwitchedULItem	PRESENCE mandatory	},
 	...
 }
 
-SAEBearerToBeSwitchedULItem ::= SEQUENCE {
-	sAE-Bearer-ID						SAE-Bearer-ID,
+E-RABToBeSwitchedULItem ::= SEQUENCE {
+	e-RAB-ID						E-RAB-ID,
 	transportLayerAddress				TransportLayerAddress,
 	gTP-TEID							GTP-TEID,
-	iE-Extensions						ProtocolExtensionContainer { { SAEBearerToBeSwitchedULItem-ExtIEs} }			OPTIONAL,
+	iE-Extensions						ProtocolExtensionContainer { { E-RABToBeSwitchedULItem-ExtIEs} }			OPTIONAL,
 	...
 }
 
-SAEBearerToBeSwitchedULItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+E-RABToBeSwitchedULItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -665,8 +609,8 @@ 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-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	},
 	...
@@ -708,98 +652,98 @@ HandoverCancelAcknowledge ::= SEQUENCE {
 }
 
 HandoverCancelAcknowledgeIEs 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-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-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
 
 -- **************************************************************
 --
--- SAE BEARER SETUP ELEMENTARY PROCEDURE
+-- E-RAB SETUP ELEMENTARY PROCEDURE
 --
 -- **************************************************************
 
 -- **************************************************************
 --
--- SAE Bearer Setup Request
+-- E-RAB Setup Request
 --
 -- **************************************************************
 
-SAEBearerSetupRequest ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {SAEBearerSetupRequestIEs} },
+E-RABSetupRequest ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {E-RABSetupRequestIEs} },
 	...
 }
 
-SAEBearerSetupRequestIEs S1AP-PROTOCOL-IES ::= {
+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-SAEBearerToBeSetupListBearerSUReq			CRITICALITY reject	TYPE SAEBearerToBeSetupListBearerSUReq	 	PRESENCE mandatory	}|
-	{ ID id-NAS-PDU				CRITICALITY ignore	TYPE NAS-PDU	 		PRESENCE mandatory},
+	{ ID id-E-RABToBeSetupListBearerSUReq			CRITICALITY reject	TYPE E-RABToBeSetupListBearerSUReq	 	PRESENCE mandatory	},
 	...
 }
 
-SAEBearerToBeSetupListBearerSUReq ::= SEQUENCE (SIZE(1.. maxNrOfSAEBs)) OF ProtocolIE-SingleContainer { {SAEBearerToBeSetupItemBearerSUReqIEs} }
+E-RABToBeSetupListBearerSUReq ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { {E-RABToBeSetupItemBearerSUReqIEs} }
 
-SAEBearerToBeSetupItemBearerSUReqIEs 	S1AP-PROTOCOL-IES ::= {
-	{ ID id-SAEBearerToBeSetupItemBearerSUReq	 CRITICALITY reject 	TYPE SAEBearerToBeSetupItemBearerSUReq 	PRESENCE mandatory },
+E-RABToBeSetupItemBearerSUReqIEs 	S1AP-PROTOCOL-IES ::= {
+	{ ID id-E-RABToBeSetupItemBearerSUReq	 CRITICALITY reject 	TYPE E-RABToBeSetupItemBearerSUReq 	PRESENCE mandatory },
 	...
 }
 
-SAEBearerToBeSetupItemBearerSUReq ::= SEQUENCE {
-	sAE-Bearer-ID					SAE-Bearer-ID,
-	sAE-BearerlevelQoSParameters					SAE-BearerLevelQoSParameters,		
+E-RABToBeSetupItemBearerSUReq ::= SEQUENCE {
+	e-RAB-ID					E-RAB-ID,
+	e-RABlevelQoSParameters					E-RABLevelQoSParameters,		
 	transportLayerAddress 			TransportLayerAddress,
 	gTP-TEID					GTP-TEID,
-	iE-Extensions					ProtocolExtensionContainer { {SAEBearerToBeSetupItemBearerSUReqExtIEs} } OPTIONAL,
+	nAS-PDU							NAS-PDU,
+	iE-Extensions					ProtocolExtensionContainer { {E-RABToBeSetupItemBearerSUReqExtIEs} } OPTIONAL,
 	...
 }
 
 
-SAEBearerToBeSetupItemBearerSUReqExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+E-RABToBeSetupItemBearerSUReqExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
 
 -- **************************************************************
 --
--- SAE Bearer Setup Response
+-- E-RAB Setup Response
 --
 -- **************************************************************
 
-SAEBearerSetupResponse ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {SAEBearerSetupResponseIEs} },
+E-RABSetupResponse ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {E-RABSetupResponseIEs} },
 	...
 }
 
-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 ignore	TYPE SAEBearerSetupListBearerSURes			PRESENCE optional	}|
-	{ ID id-SAEBearerFailedToSetupListBearerSURes		CRITICALITY ignore	TYPE SAEBearerList					PRESENCE optional	}|
+E-RABSetupResponseIEs 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-E-RABSetupListBearerSURes				CRITICALITY ignore	TYPE E-RABSetupListBearerSURes			PRESENCE optional	}|
+	{ ID id-E-RABFailedToSetupListBearerSURes		CRITICALITY ignore	TYPE E-RABList					PRESENCE optional	}|
 	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
 
 
-SAEBearerSetupListBearerSURes ::= SEQUENCE (SIZE(1.. maxNrOfSAEBs)) OF ProtocolIE-SingleContainer { {SAEBearerSetupItemBearerSUResIEs} }
+E-RABSetupListBearerSURes ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { {E-RABSetupItemBearerSUResIEs} }
 
-SAEBearerSetupItemBearerSUResIEs 	S1AP-PROTOCOL-IES ::= {
-	{ ID id-SAEBearerSetupItemBearerSURes	 CRITICALITY ignore 	TYPE SAEBearerSetupItemBearerSURes 	PRESENCE mandatory },
+E-RABSetupItemBearerSUResIEs 	S1AP-PROTOCOL-IES ::= {
+	{ ID id-E-RABSetupItemBearerSURes	 CRITICALITY ignore 	TYPE E-RABSetupItemBearerSURes 	PRESENCE mandatory },
 	...
 }
 
-SAEBearerSetupItemBearerSURes ::= SEQUENCE {
-	sAE-Bearer-ID					SAE-Bearer-ID,
+E-RABSetupItemBearerSURes ::= SEQUENCE {
+	e-RAB-ID					E-RAB-ID,
 	transportLayerAddress 			TransportLayerAddress,
 	gTP-TEID					GTP-TEID,
-	iE-Extensions					ProtocolExtensionContainer { {SAEBearerSetupItemBearerSUResExtIEs} } OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { {E-RABSetupItemBearerSUResExtIEs} } OPTIONAL,
 	...
 }
 
 
-SAEBearerSetupItemBearerSUResExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+E-RABSetupItemBearerSUResExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -807,46 +751,46 @@ SAEBearerSetupItemBearerSUResExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 
 -- **************************************************************
 --
--- SAE BEARER MODIFY ELEMENTARY PROCEDURE
+-- E-RAB MODIFY ELEMENTARY PROCEDURE
 --
 -- **************************************************************
 
 -- **************************************************************
 --
--- SAE Bearer Modify Request
+-- E-RAB Modify Request
 --
 -- **************************************************************
 
-SAEBearerModifyRequest ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {SAEBearerModifyRequestIEs} },
+E-RABModifyRequest ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {E-RABModifyRequestIEs} },
 	...
 }
 
-SAEBearerModifyRequestIEs S1AP-PROTOCOL-IES ::= {
+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-SAEBearerToBeModifiedListBearerModReq		CRITICALITY reject	TYPE SAEBearerToBeModifiedListBearerModReq	 	PRESENCE mandatory	}|
-	{ ID id-NAS-PDU				CRITICALITY ignore	TYPE NAS-PDU	 		PRESENCE mandatory},
+	{ ID id-E-RABToBeModifiedListBearerModReq		CRITICALITY reject	TYPE E-RABToBeModifiedListBearerModReq	 	PRESENCE mandatory	},
 	...
 }
 
-SAEBearerToBeModifiedListBearerModReq ::= SEQUENCE (SIZE(1.. maxNrOfSAEBs)) OF ProtocolIE-SingleContainer { {SAEBearerToBeModifiedItemBearerModReqIEs} }
+E-RABToBeModifiedListBearerModReq ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { {E-RABToBeModifiedItemBearerModReqIEs} }
 
-SAEBearerToBeModifiedItemBearerModReqIEs 	S1AP-PROTOCOL-IES ::= {
-	{ ID id-SAEBearerToBeModifiedItemBearerModReq	 CRITICALITY reject 	TYPE SAEBearerToBeModifiedItemBearerModReq 	PRESENCE mandatory },
+E-RABToBeModifiedItemBearerModReqIEs 	S1AP-PROTOCOL-IES ::= {
+	{ ID id-E-RABToBeModifiedItemBearerModReq	 CRITICALITY reject 	TYPE E-RABToBeModifiedItemBearerModReq 	PRESENCE mandatory },
 	...
 }
 
-SAEBearerToBeModifiedItemBearerModReq ::= SEQUENCE {
-	sAE-Bearer-ID					SAE-Bearer-ID,
-	sAE-BearerLevelQoSParameters					SAE-BearerLevelQoSParameters,		
-	iE-Extensions					ProtocolExtensionContainer { {SAEBearerToBeModifyItemBearerModReqExtIEs} } OPTIONAL,
+E-RABToBeModifiedItemBearerModReq ::= SEQUENCE {
+	e-RAB-ID					E-RAB-ID,
+	e-RABLevelQoSParameters					E-RABLevelQoSParameters,		
+	nAS-PDU							NAS-PDU,
+	iE-Extensions					ProtocolExtensionContainer { {E-RABToBeModifyItemBearerModReqExtIEs} } OPTIONAL,
 	...
 }
 
 
-SAEBearerToBeModifyItemBearerModReqExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+E-RABToBeModifyItemBearerModReqExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -854,40 +798,40 @@ SAEBearerToBeModifyItemBearerModReqExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 
 -- **************************************************************
 --
--- SAE Bearer Modify Response
+-- E-RAB Modify Response
 --
 -- **************************************************************
 
-SAEBearerModifyResponse ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {SAEBearerModifyResponseIEs} },
+E-RABModifyResponse ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {E-RABModifyResponseIEs} },
 	...
 }
 
-SAEBearerModifyResponseIEs 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-SAEBearerModifyListBearerModRes				CRITICALITY ignore	TYPE SAEBearerModifyListBearerModRes		PRESENCE optional	}|
-	{ ID id-SAEBearerFailedToModifyList		CRITICALITY ignore	TYPE SAEBearerList				PRESENCE optional	}|
+E-RABModifyResponseIEs 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-E-RABModifyListBearerModRes				CRITICALITY ignore	TYPE E-RABModifyListBearerModRes		PRESENCE optional	}|
+	{ ID id-E-RABFailedToModifyList		CRITICALITY ignore	TYPE E-RABList				PRESENCE optional	}|
 	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
 
 
-SAEBearerModifyListBearerModRes ::= SEQUENCE (SIZE(1.. maxNrOfSAEBs)) OF ProtocolIE-SingleContainer { {SAEBearerModifyItemBearerModResIEs} }
+E-RABModifyListBearerModRes ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { {E-RABModifyItemBearerModResIEs} }
 
-SAEBearerModifyItemBearerModResIEs 	S1AP-PROTOCOL-IES ::= {
-	{ ID id-SAEBearerModifyItemBearerModRes	 CRITICALITY ignore 	TYPE SAEBearerModifyItemBearerModRes 	PRESENCE mandatory },
+E-RABModifyItemBearerModResIEs 	S1AP-PROTOCOL-IES ::= {
+	{ ID id-E-RABModifyItemBearerModRes	 CRITICALITY ignore 	TYPE E-RABModifyItemBearerModRes 	PRESENCE mandatory },
 	...
 }
 
-SAEBearerModifyItemBearerModRes ::= SEQUENCE {
-	sAE-Bearer-ID					SAE-Bearer-ID,
-	iE-Extensions					ProtocolExtensionContainer { {SAEBearerModifyItemBearerModResExtIEs} } OPTIONAL,
+E-RABModifyItemBearerModRes ::= SEQUENCE {
+	e-RAB-ID					E-RAB-ID,
+	iE-Extensions					ProtocolExtensionContainer { {E-RABModifyItemBearerModResExtIEs} } OPTIONAL,
 	...
 }
 
 
-SAEBearerModifyItemBearerModResExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+E-RABModifyItemBearerModResExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -896,66 +840,67 @@ SAEBearerModifyItemBearerModResExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 
 -- **************************************************************
 --
--- SAE BEARER RELEASE ELEMENTARY PROCEDURE
+-- E-RAB RELEASE ELEMENTARY PROCEDURE
 --
 -- **************************************************************
 
 -- **************************************************************
 --
--- SAE Bearer Release Command
+-- E-RAB Release Command
 --
 -- **************************************************************
 
-SAEBearerReleaseCommand ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {SAEBearerReleaseCommandIEs} },
+E-RABReleaseCommand ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {E-RABReleaseCommandIEs} },
 	...
 }
 
-SAEBearerReleaseCommandIEs S1AP-PROTOCOL-IES ::= {
+E-RABReleaseCommandIEs 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-SAEBearerToBeReleasedList		CRITICALITY ignore	TYPE SAEBearerList					PRESENCE mandatory	},
+	{ ID id-E-RABToBeReleasedList		CRITICALITY ignore	TYPE E-RABList					PRESENCE mandatory	}|
+	{ ID id-NAS-PDU							CRITICALITY ignore	TYPE NAS-PDU						PRESENCE optional	},
 	...
 }
 
 
 -- **************************************************************
 --
--- SAE Bearer Release Response
+-- E-RAB Release Response
 --
 -- **************************************************************
 
-SAEBearerReleaseResponse ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { { SAEBearerReleaseResponseIEs } },
+E-RABReleaseResponse ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { { E-RABReleaseResponseIEs } },
 	...
 }
 
-SAEBearerReleaseResponseIEs 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-SAEBearerReleaseListBearerRelComp				CRITICALITY ignore	TYPE SAEBearerReleaseListBearerRelComp		PRESENCE optional	}|
-	{ ID id-SAEBearerFailedToReleaseList		CRITICALITY ignore	TYPE SAEBearerList				PRESENCE optional	}|
+E-RABReleaseResponseIEs 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-E-RABReleaseListBearerRelComp				CRITICALITY ignore	TYPE E-RABReleaseListBearerRelComp		PRESENCE optional	}|
+	{ ID id-E-RABFailedToReleaseList		CRITICALITY ignore	TYPE E-RABList				PRESENCE optional	}|
 	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
 
 
-SAEBearerReleaseListBearerRelComp ::= SEQUENCE (SIZE(1.. maxNrOfSAEBs)) OF ProtocolIE-SingleContainer { {SAEBearerReleaseItemBearerRelCompIEs} }
+E-RABReleaseListBearerRelComp ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { {E-RABReleaseItemBearerRelCompIEs} }
 
-SAEBearerReleaseItemBearerRelCompIEs 	S1AP-PROTOCOL-IES ::= {
-	{ ID id-SAEBearerReleaseItemBearerRelComp	 CRITICALITY ignore 	TYPE SAEBearerReleaseItemBearerRelComp 	PRESENCE mandatory },
+E-RABReleaseItemBearerRelCompIEs 	S1AP-PROTOCOL-IES ::= {
+	{ ID id-E-RABReleaseItemBearerRelComp	 CRITICALITY ignore 	TYPE E-RABReleaseItemBearerRelComp 	PRESENCE mandatory },
 	...
 }
 
-SAEBearerReleaseItemBearerRelComp ::= SEQUENCE {
-	sAE-Bearer-ID					SAE-Bearer-ID,
-	iE-Extensions					ProtocolExtensionContainer { {SAEBearerReleaseItemBearerRelCompExtIEs} } OPTIONAL,
+E-RABReleaseItemBearerRelComp ::= SEQUENCE {
+	e-RAB-ID					E-RAB-ID,
+	iE-Extensions					ProtocolExtensionContainer { {E-RABReleaseItemBearerRelCompExtIEs} } OPTIONAL,
 	...
 }
 
 
-SAEBearerReleaseItemBearerRelCompExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+E-RABReleaseItemBearerRelCompExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -963,25 +908,25 @@ SAEBearerReleaseItemBearerRelCompExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 
 -- **************************************************************
 --
--- SAE BEARER RELEASE REQUEST ELEMENTARY PROCEDURE
+-- E-RAB RELEASE REQUEST ELEMENTARY PROCEDURE
 --
 -- **************************************************************
 
 -- **************************************************************
 --
--- SAE Bearer Release Request
+-- E-RAB Release Indication
 --
 -- **************************************************************
 
-SAEBearerReleaseRequest ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {SAEBearerReleaseRequestIEs} },
+E-RABReleaseIndication ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {E-RABReleaseIndicationIEs} },
 	...
 }
 
-SAEBearerReleaseRequestIEs S1AP-PROTOCOL-IES ::= {
+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-SAEBearerToBeReleasedList		CRITICALITY ignore	TYPE SAEBearerList					PRESENCE mandatory	},
+	{ ID id-E-RABReleasedList		CRITICALITY ignore	TYPE E-RABList					PRESENCE mandatory	},
 	...
 }
 -- **************************************************************
@@ -1005,37 +950,40 @@ 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-uEaggregateMaximumBitrate		CRITICALITY reject	TYPE UEAggregateMaximumBitrate		PRESENCE mandatory	}|
-	{ ID id-SAEBearerToBeSetupListCtxtSUReq			CRITICALITY reject	TYPE SAEBearerToBeSetupListCtxtSUReq	 	PRESENCE mandatory	}|
-	{ ID id-Security-Information		CRITICALITY reject	TYPE SecurityInformation			PRESENCE mandatory	}|
+	{ ID id-E-RABToBeSetupListCtxtSUReq			CRITICALITY reject	TYPE E-RABToBeSetupListCtxtSUReq	 	PRESENCE mandatory	}|
+	{ ID id-UESecurityCapabilities		CRITICALITY reject	TYPE UESecurityCapabilities			PRESENCE mandatory	}|
+	{ ID id-SecurityKey		CRITICALITY reject	TYPE SecurityKey			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	},
+	{ ID id-SubscriberProfileIDforRFP	CRITICALITY ignore	TYPE SubscriberProfileIDforRFP	PRESENCE optional	}|
+	{ ID id-CSFallbackIndicator			CRITICALITY reject		TYPE CSFallbackIndicator		PRESENCE optional	}|
+	{ ID id-SRVCCOperationPossible			CRITICALITY ignore	TYPE SRVCCOperationPossible		PRESENCE optional	},
 	...
 }
 
 
 
 
-SAEBearerToBeSetupListCtxtSUReq ::= SEQUENCE (SIZE(1.. maxNrOfSAEBs)) OF ProtocolIE-SingleContainer { {SAEBearerToBeSetupItemCtxtSUReqIEs} }
+E-RABToBeSetupListCtxtSUReq ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { {E-RABToBeSetupItemCtxtSUReqIEs} }
 
-SAEBearerToBeSetupItemCtxtSUReqIEs 	S1AP-PROTOCOL-IES ::= {
-	{ ID id-SAEBearerToBeSetupItemCtxtSUReq	 CRITICALITY reject 	TYPE SAEBearerToBeSetupItemCtxtSUReq 	PRESENCE mandatory },
+E-RABToBeSetupItemCtxtSUReqIEs 	S1AP-PROTOCOL-IES ::= {
+	{ ID id-E-RABToBeSetupItemCtxtSUReq	 CRITICALITY reject 	TYPE E-RABToBeSetupItemCtxtSUReq 	PRESENCE mandatory },
 	...
 }
 
-SAEBearerToBeSetupItemCtxtSUReq ::= SEQUENCE {
-	sAE-Bearer-ID					SAE-Bearer-ID,
-	sAE-BearerlevelQoSParameters					SAE-BearerLevelQoSParameters,		
+E-RABToBeSetupItemCtxtSUReq ::= SEQUENCE {
+	e-RAB-ID					E-RAB-ID,
+	e-RABlevelQoSParameters					E-RABLevelQoSParameters,		
 	transportLayerAddress 			TransportLayerAddress,
 	gTP-TEID			GTP-TEID,
-	iE-Extensions					ProtocolExtensionContainer { {SAEBearerToBeSetupItemCtxtSUReqExtIEs} } OPTIONAL,
+	nAS-PDU				NAS-PDU,
+	iE-Extensions					ProtocolExtensionContainer { {E-RABToBeSetupItemCtxtSUReqExtIEs} } OPTIONAL,
 	...
 }
 
 
-SAEBearerToBeSetupItemCtxtSUReqExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+E-RABToBeSetupItemCtxtSUReqExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -1052,32 +1000,32 @@ 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 ignore	TYPE SAEBearerSetupListCtxtSURes			PRESENCE optional	}|
-	{ ID id-SAEBearerFailedToSetupListCtxtSURes		CRITICALITY ignore	TYPE SAEBearerList					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-RABSetupListCtxtSURes				CRITICALITY ignore	TYPE E-RABSetupListCtxtSURes			PRESENCE mandatory	}|
+	{ ID id-E-RABFailedToSetupListCtxtSURes		CRITICALITY ignore	TYPE E-RABList					PRESENCE optional	}|
 	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
 
 
-SAEBearerSetupListCtxtSURes ::= SEQUENCE (SIZE(1.. maxNrOfSAEBs)) OF ProtocolIE-SingleContainer { {SAEBearerSetupItemCtxtSUResIEs} }
+E-RABSetupListCtxtSURes ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { {E-RABSetupItemCtxtSUResIEs} }
 
-SAEBearerSetupItemCtxtSUResIEs 	S1AP-PROTOCOL-IES ::= {
-	{ ID id-SAEBearerSetupItemCtxtSURes	 CRITICALITY ignore 	TYPE SAEBearerSetupItemCtxtSURes 	PRESENCE mandatory },
+E-RABSetupItemCtxtSUResIEs 	S1AP-PROTOCOL-IES ::= {
+	{ ID id-E-RABSetupItemCtxtSURes	 CRITICALITY ignore 	TYPE E-RABSetupItemCtxtSURes 	PRESENCE mandatory },
 	...
 }
 
-SAEBearerSetupItemCtxtSURes ::= SEQUENCE {
-	sAE-Bearer-ID					SAE-Bearer-ID,
+E-RABSetupItemCtxtSURes ::= SEQUENCE {
+	e-RAB-ID					E-RAB-ID,
 	transportLayerAddress 			TransportLayerAddress,
 	gTP-TEID			GTP-TEID,
-	iE-Extensions					ProtocolExtensionContainer { {SAEBearerSetupItemCtxtSUResExtIEs} } OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { {E-RABSetupItemCtxtSUResExtIEs} } OPTIONAL,
 	...
 }
 
 
-SAEBearerSetupItemCtxtSUResExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+E-RABSetupItemCtxtSUResExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -1094,8 +1042,8 @@ InitialContextSetupFailure ::= SEQUENCE {
 }
 
 InitialContextSetupFailureIEs 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-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	},
 	...
@@ -1116,7 +1064,7 @@ 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 optional	} |
-	{ ID id-pagingCause					CRITICALITY ignore	TYPE PagingCause		PRESENCE mandatory	} |
+	{ ID id-CNDomain					CRITICALITY ignore		TYPE CNDomain		PRESENCE mandatory	} |
 	{ ID id-TAIList					CRITICALITY ignore	TYPE TAIList		 	PRESENCE mandatory	},
 	...
 }
@@ -1193,8 +1141,8 @@ UEContextReleaseComplete ::= SEQUENCE {
 }
 
 UEContextReleaseComplete-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-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-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
@@ -1220,8 +1168,10 @@ 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-SubscriberProfileIDforRFP		CRITICALITY ignore	TYPE SubscriberProfileIDforRFP	PRESENCE optional	},
+	{ ID id-SecurityKey					CRITICALITY reject	TYPE SecurityKey		 			PRESENCE optional	}|
+	{ ID id-SubscriberProfileIDforRFP		CRITICALITY ignore	TYPE SubscriberProfileIDforRFP	PRESENCE optional	}|
+	{ ID id-uEaggregateMaximumBitrate		CRITICALITY ignore	TYPE UEAggregateMaximumBitrate		PRESENCE optional	}|
+	{ ID id-CSFallbackIndicator				CRITICALITY reject		TYPE CSFallbackIndicator		PRESENCE optional	},
 	...
 }
 -- **************************************************************
@@ -1236,8 +1186,8 @@ UEContextModificationResponse ::= SEQUENCE {
 }
 
 UEContextModificationResponseIEs 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-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-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }-- **************************************************************
@@ -1252,8 +1202,8 @@ UEContextModificationFailure ::= SEQUENCE {
 }
 
 UEContextModificationFailureIEs 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-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	},
 	...
@@ -1295,7 +1245,8 @@ InitialUEMessage-IEs S1AP-PROTOCOL-IES ::= {
 	{ 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-S-TMSI					CRITICALITY reject	TYPE S-TMSI				PRESENCE optional}|
+	{ ID id-CSG-Id					CRITICALITY reject	TYPE CSG-Id				PRESENCE optional},
 	...
 }
 
@@ -1314,7 +1265,9 @@ UplinkNASTransport ::= SEQUENCE {
 UplinkNASTransport-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-NAS-PDU					CRITICALITY reject	TYPE NAS-PDU				PRESENCE mandatory} ,
+	{ ID id-NAS-PDU					CRITICALITY reject	TYPE NAS-PDU				PRESENCE mandatory} |	
+	{ ID id-EUTRAN-CGI			CRITICALITY ignore	TYPE EUTRAN-CGI			PRESENCE mandatory}|
+	{ ID id-TAI					CRITICALITY ignore	TYPE TAI						PRESENCE mandatory},
 	...
 }
 -- **************************************************************
@@ -1449,7 +1402,8 @@ 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-SupportedTAs		CRITICALITY reject	TYPE SupportedTAs	 	PRESENCE mandatory	}|
+	{ ID id-CSG-IdList					CRITICALITY reject	TYPE CSG-IdList				PRESENCE optional},
 	...
 }
 
@@ -1467,9 +1421,9 @@ 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-ServedGUMMEIs				CRITICALITY reject	TYPE ServedGUMMEIs				PRESENCE mandatory	}|
-	{ ID id-RelativeMMECapacity					CRITICALITY reject	TYPE RelativeMMECapacity		 			PRESENCE mandatory	}|
+	{ ID id-ServedPLMNs			CRITICALITY ignore	TYPE ServedPLMNs		PRESENCE mandatory	}|
+	{ ID id-ServedGUMMEIs				CRITICALITY ignore	TYPE ServedGUMMEIs				PRESENCE mandatory	}|
+	{ ID id-RelativeMMECapacity					CRITICALITY ignore	TYPE RelativeMMECapacity		 			PRESENCE mandatory	}|
 	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
@@ -1511,7 +1465,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-SupportedTAs		CRITICALITY reject	TYPE SupportedTAs	 	PRESENCE optional	}|
+	{ ID id-CSG-IdList					CRITICALITY reject	TYPE CSG-IdList				PRESENCE optional},
 	...
 }
 
@@ -1631,7 +1586,7 @@ DownlinkS1cdma2000tunneling ::= SEQUENCE {
 DownlinkS1cdma2000tunnelingIEs 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 optional	} |
+	{ ID id-E-RABSubjecttoDataForwardingList					CRITICALITY ignore	TYPE E-RABSubjecttoDataForwardingList		 			PRESENCE optional	} |
 	{ ID id-cdma2000HOStatus				CRITICALITY ignore	TYPE Cdma2000HOStatus 			PRESENCE optional	} |
 	{ ID id-cdma2000RATType				CRITICALITY reject	TYPE Cdma2000RATType 			PRESENCE mandatory	} |
 	{ ID id-cdma2000PDU					CRITICALITY reject	TYPE Cdma2000PDU	 			PRESENCE mandatory	},
@@ -1858,6 +1813,7 @@ 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				CRITICALITY ignore	TYPE EUTRAN-CGI				PRESENCE mandatory} |
+	{ ID id-TAI						CRITICALITY ignore	TYPE TAI						PRESENCE mandatory} |
 	{ ID id-RequestType				CRITICALITY ignore	TYPE RequestType				PRESENCE mandatory} ,
 	...
 }
@@ -1891,5 +1847,124 @@ OverloadStop ::= SEQUENCE {
 OverloadStopIEs S1AP-PROTOCOL-IES ::= {	
 	...
 }
+-- **************************************************************
+--
+-- WRITE-REPLACE WARNING PROCEDURE 
+--
+-- **************************************************************
+
+-- **************************************************************
+--
+-- Write-Replace Warning Request
+--
+-- **************************************************************
+
+
+WriteReplaceWarningRequest ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {WriteReplaceWarningRequestIEs} },
+	...
+}
+
+WriteReplaceWarningRequestIEs S1AP-PROTOCOL-IES ::= {	
+	{ ID id-MessageIdentifier			CRITICALITY reject	TYPE MessageIdentifier		PRESENCE mandatory		}|
+	{ ID id-SerialNumber				CRITICALITY reject	TYPE SerialNumber		PRESENCE mandatory		}|
+	{ ID id-WarningAreaList				CRITICALITY ignore	TYPE WarningAreaList		PRESENCE optional		}|
+	{ ID id-RepetitionPeriod			CRITICALITY reject	TYPE RepetitionPeriod		PRESENCE mandatory		}|
+	{ 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		},
+	...
+}
+-- **************************************************************
+--
+-- Write-Replace Warning Response
+--
+-- **************************************************************
+
+WriteReplaceWarningResponse ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container		{ {WriteReplaceWarningResponseIEs} },
+	...
+}
+
+WriteReplaceWarningResponseIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-MessageIdentifier			CRITICALITY reject	TYPE MessageIdentifier		PRESENCE mandatory		}|
+	{ ID id-SerialNumber				CRITICALITY reject	TYPE SerialNumber		PRESENCE mandatory		}|
+	{ ID id-BroadcastCompletedAreaList		CRITICALITY reject	TYPE BroadcastCompletedAreaList		PRESENCE mandatory	}|
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics				PRESENCE optional},
+	...
+}
+
+-- **************************************************************
+--
+-- eNB DIRECT INFORMATION TRANSFER ELEMENTARY PROCEDURE
+--
+-- **************************************************************
+
+-- **************************************************************
+--
+-- eNB Direct Information Transfer
+--
+-- **************************************************************
+
+ENBDirectInformationTransfer ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       {{ ENBDirectInformationTransferIEs}},
+	...
+}
+
+ENBDirectInformationTransferIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-Inter-SystemInformationTransferTypeEDT		CRITICALITY reject	TYPE Inter-SystemInformationTransferType				PRESENCE mandatory}  ,
+	...
+}
+
+Inter-SystemInformationTransferType ::= CHOICE {
+	rIMTransfer		RIMTransfer,
+	...
+}
+
+-- **************************************************************
+--
+-- MME DIRECT INFORMATION TRANSFER ELEMENTARY PROCEDURE
+--
+-- **************************************************************
+
+-- **************************************************************
+--
+-- MME Direct Information Transfer
+--
+-- **************************************************************
+
+MMEDirectInformationTransfer ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       {{ MMEDirectInformationTransferIEs}},
+	...
+}
+
+MMEDirectInformationTransferIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-Inter-SystemInformationTransferTypeMDT		CRITICALITY reject	TYPE Inter-SystemInformationTransferType				PRESENCE mandatory}  ,
+	...
+}
+
+
+-- **************************************************************
+--
+-- PRIVATE MESSAGE ELEMENTARY PROCEDURE
+--
+-- **************************************************************
+
+-- **************************************************************
+--
+-- Private Message
+--
+-- **************************************************************
+
+PrivateMessage ::= SEQUENCE {
+	privateIEs			PrivateIE-Container       {{PrivateMessageIEs}},
+	...
+}
+
+PrivateMessageIEs S1AP-PRIVATE-IES ::= {
+	...
+}
 
-END
\ No newline at end of file
+END
diff --git a/asn1/s1ap/S1AP-PDU-Descriptions.asn b/asn1/s1ap/S1AP-PDU-Descriptions.asn
index 0502e66139..897fc9c1ba 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.3.0 (2008-09)
+-- 3GPP TS 36.413 V8.4.0 (2008-12)
 -- 9.3.2	Elementary Procedure Definitions
 -- **************************************************************
 --
@@ -29,6 +29,7 @@ FROM S1AP-CommonDataTypes
 	DeactivateTrace,
 	DownlinkNASTransport,
 	DownlinkS1cdma2000tunneling,
+	ENBDirectInformationTransfer,
 	ENBStatusTransfer,
 	ENBConfigurationUpdate,
 	ENBConfigurationUpdateAcknowledge,
@@ -53,6 +54,7 @@ FROM S1AP-CommonDataTypes
 	MMEConfigurationUpdate,
 	MMEConfigurationUpdateAcknowledge,
 	MMEConfigurationUpdateFailure,
+	MMEDirectInformationTransfer,
 	MMEStatusTransfer,
 	NASNonDeliveryIndication,
 	OverloadStart,
@@ -61,18 +63,19 @@ FROM S1AP-CommonDataTypes
 	PathSwitchRequest,
 	PathSwitchRequestAcknowledge,
 	PathSwitchRequestFailure,	
+	PrivateMessage,
 	Reset,
 	ResetAcknowledge,
 	S1SetupFailure,
 	S1SetupRequest,
 	S1SetupResponse,
-	SAEBearerModifyRequest,
-	SAEBearerModifyResponse,
-	SAEBearerReleaseCommand,
-	SAEBearerReleaseResponse,
-	SAEBearerReleaseRequest,
-	SAEBearerSetupRequest,
-	SAEBearerSetupResponse,
+	E-RABModifyRequest,
+	E-RABModifyResponse,
+	E-RABReleaseCommand,
+	E-RABReleaseResponse,
+	E-RABReleaseIndication,
+	E-RABSetupRequest,
+	E-RABSetupResponse,
 	TraceFailureIndication,
 	TraceStart,
 	UECapabilityInfoIndication,
@@ -83,7 +86,10 @@ FROM S1AP-CommonDataTypes
 	UEContextReleaseComplete,
 	UEContextReleaseRequest,
 	UplinkNASTransport,
-	UplinkS1cdma2000tunneling
+	UplinkS1cdma2000tunneling,
+	WriteReplaceWarningRequest,
+	WriteReplaceWarningResponse
+
 
 FROM S1AP-PDU-Contents
 	
@@ -102,19 +108,22 @@ FROM S1AP-PDU-Contents
 	id-LocationReportingControl,
 	id-LocationReportingFailureIndication,
 	id-LocationReport,
+	id-eNBDirectInformationTransfer,
 	id-MMEConfigurationUpdate,
+	id-MMEDirectInformationTransfer,
 	id-MMEStatusTransfer,
 	id-NASNonDeliveryIndication,
 	id-OverloadStart,
 	id-OverloadStop,
 	id-Paging,
 	id-PathSwitchRequest,
+	id-PrivateMessage,
 	id-Reset,
 	id-S1Setup,
-	id-SAEBearerModify,
-	id-SAEBearerRelease,
-	id-SAEBearerReleaseRequest,
-	id-SAEBearerSetup,
+	id-E-RABModify,
+	id-E-RABRelease,
+	id-E-RABReleaseIndication,
+	id-E-RABSetup,
 	id-TraceFailureIndication,
 	id-TraceStart,
 	id-UECapabilityInfoIndication,
@@ -122,7 +131,8 @@ FROM S1AP-PDU-Contents
 	id-UEContextRelease,
 	id-UEContextReleaseRequest,
 	id-uplinkNASTransport,
-	id-UplinkS1cdma2000tunneling
+	id-UplinkS1cdma2000tunneling,
+	id-WriteReplaceWarning
 FROM S1AP-Constants;
 
 
@@ -195,9 +205,9 @@ S1AP-ELEMENTARY-PROCEDURES-CLASS-1 S1AP-ELEMENTARY-PROCEDURE ::= {
 	handoverPreparation				|
 	handoverResourceAllocation		|
 	pathSwitchRequest 				|
-	sAEbearerSetup					|
-	sAEbearerModify					|
-	sAEbearerRelease				|
+	e-RABSetup					|
+	e-RABModify					|
+	e-RABRelease				|
 	initialContextSetup				|
 	handoverCancel					|
 	reset							|
@@ -205,13 +215,14 @@ S1AP-ELEMENTARY-PROCEDURES-CLASS-1 S1AP-ELEMENTARY-PROCEDURE ::= {
 	uEContextModification			|
 	uEContextRelease				|
 	eNBConfigurationUpdate			|
-	mMEConfigurationUpdate			,
+	mMEConfigurationUpdate			|
+	writeReplaceWarning				,
 	...
 }
 
 S1AP-ELEMENTARY-PROCEDURES-CLASS-2 S1AP-ELEMENTARY-PROCEDURE ::= {	
 	handoverNotification			|
-	sAEbearerReleaseRequest			|
+	e-RABReleaseIndication			|
 	paging 							|
 	downlinkNASTransport						|
 	initialUEMessage							|
@@ -231,7 +242,10 @@ S1AP-ELEMENTARY-PROCEDURES-CLASS-2 S1AP-ELEMENTARY-PROCEDURE ::= {
 	locationReportingFailureIndication		|
 	locationReport					|
 	overloadStart					|
-	overloadStop					,
+	overloadStop					|
+	eNBDirectInformationTransfer	|
+	mMEDirectInformationTransfer	|
+	privateMessage					,
 	...
 }
 
@@ -271,30 +285,30 @@ pathSwitchRequest S1AP-ELEMENTARY-PROCEDURE ::= {
 	CRITICALITY		reject
 }
 
-sAEbearerSetup S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE	SAEBearerSetupRequest
-	SUCCESSFUL OUTCOME	SAEBearerSetupResponse
-	PROCEDURE CODE		id-SAEBearerSetup
+e-RABSetup S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE	E-RABSetupRequest
+	SUCCESSFUL OUTCOME	E-RABSetupResponse
+	PROCEDURE CODE		id-E-RABSetup
 	CRITICALITY		reject
 }
 
-sAEbearerModify S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE	SAEBearerModifyRequest
-	SUCCESSFUL OUTCOME	SAEBearerModifyResponse
-	PROCEDURE CODE		id-SAEBearerModify
+e-RABModify S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE	E-RABModifyRequest
+	SUCCESSFUL OUTCOME	E-RABModifyResponse
+	PROCEDURE CODE		id-E-RABModify
 	CRITICALITY		reject
 }
 
-sAEbearerRelease S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE	SAEBearerReleaseCommand
-	SUCCESSFUL OUTCOME	SAEBearerReleaseResponse
-	PROCEDURE CODE		id-SAEBearerRelease
+e-RABRelease S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE	E-RABReleaseCommand
+	SUCCESSFUL OUTCOME	E-RABReleaseResponse
+	PROCEDURE CODE		id-E-RABRelease
 	CRITICALITY		reject
 }
 
-sAEbearerReleaseRequest S1AP-ELEMENTARY-PROCEDURE ::= {
-	INITIATING MESSAGE	SAEBearerReleaseRequest
-	PROCEDURE CODE		id-SAEBearerReleaseRequest
+e-RABReleaseIndication S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE	E-RABReleaseIndication
+	PROCEDURE CODE		id-E-RABReleaseIndication
 	CRITICALITY		ignore
 }
 
@@ -479,5 +493,31 @@ overloadStop S1AP-ELEMENTARY-PROCEDURE ::= {
 	CRITICALITY		reject
 }
 
+writeReplaceWarning S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE	WriteReplaceWarningRequest
+	SUCCESSFUL OUTCOME	WriteReplaceWarningResponse
+	PROCEDURE CODE		id-WriteReplaceWarning
+	CRITICALITY			reject
+}
+
+eNBDirectInformationTransfer S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE	ENBDirectInformationTransfer
+	PROCEDURE CODE		id-eNBDirectInformationTransfer
+	CRITICALITY			ignore
+}
+
+mMEDirectInformationTransfer S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE	MMEDirectInformationTransfer
+	PROCEDURE CODE		id-MMEDirectInformationTransfer
+	CRITICALITY			ignore
+}
+
+privateMessage S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE	PrivateMessage
+	PROCEDURE CODE		id-PrivateMessage
+	CRITICALITY			ignore
+}
+
 END
 
+
diff --git a/asn1/s1ap/packet-s1ap-template.c b/asn1/s1ap/packet-s1ap-template.c
index bbd4a76df8..01e02d400f 100644
--- a/asn1/s1ap/packet-s1ap-template.c
+++ b/asn1/s1ap/packet-s1ap-template.c
@@ -60,7 +60,7 @@
 /* No SCTP port registered with IANA for S1AP yet */
 #define SCTP_PORT_S1AP	0
 
-static dissector_handle_t nas_eps_handle;
+static dissector_handle_t nas_eps_handle=NULL;
 
 #include "packet-s1ap-val.h"
 
@@ -179,7 +179,7 @@ proto_reg_handoff_s1ap(void)
 		dissector_add("sctp.port", SctpPort, s1ap_handle);
 	}
 
-	nas_eps_handle = find_dissector("nas_eps");
+	nas_eps_handle = find_dissector("nas-eps");
 }
 
 /*--- proto_register_s1ap -------------------------------------------*/
diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf
index 6f2511eada..d4de743192 100644
--- a/asn1/s1ap/s1ap.cnf
+++ b/asn1/s1ap/s1ap.cnf
@@ -26,14 +26,7 @@ ProtocolIE-FieldPair
 ProtocolIE-ContainerPair
 ProtocolIE-ContainerPairList
 ProtocolError-IE-ContainerList
-PrivateIE-Container
-PrivateIE-Field
-PrivateIE-ID 
-SAEB-IE-ContainerPairList
-
-UEPagingID
-IMSI
-Presence
+E-RAB-IE-ContainerPairList
 #.END
 
 
@@ -122,31 +115,31 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
 #  asn1_stack_frame_check(actx, "ProtocolIE-ContainerPairList", ProtocolIE_ContainerPairList_pars);
 # END
 
-#SAEB-IE-ContainerList                  { S1AP-PROTOCOL-IES      : IEsSetParam }	::= ProtocolIE-ContainerList     { 1, maxNrOfSAEBs,   {IEsSetParam} }
-#.FN_BODY SAEB-IE-ContainerList
+#E-RAB-IE-ContainerList                  { S1AP-PROTOCOL-IES      : IEsSetParam }	::= ProtocolIE-ContainerList     { 1, maxNrOfE-RABs,   {IEsSetParam} }
+#.FN_BODY E-RAB-IE-ContainerList
   asn1_stack_frame_push(%(ACTX)s, "ProtocolIE-ContainerList");
   asn1_param_push_integer(%(ACTX)s, 1);
-  asn1_param_push_integer(%(ACTX)s, maxNrOfSAEBs);
+  asn1_param_push_integer(%(ACTX)s, maxNrOfE_RABs);
 %(DEFAULT_BODY)s
   asn1_stack_frame_pop(%(ACTX)s, "ProtocolIE-ContainerList");
 #.END
 
-# SAEB-IE-ContainerPairList              { S1AP-PROTOCOL-IES-PAIR : IEsSetParam }	::= ProtocolIE-ContainerPairList { 1, maxNrOfSAEBs,   {IEsSetParam} }
+# E-RAB-IE-ContainerPairList              { S1AP-PROTOCOL-IES-PAIR : IEsSetParam }	::= ProtocolIE-ContainerPairList { 1, maxNrOfE-RABs,   {IEsSetParam} }
 # Currently not used
 # FN_BODY SAEB-IE-ContainerPairList
 #  asn1_stack_frame_push(%(ACTX)s, "ProtocolIE-ContainerPairList");
 #  asn1_param_push_integer(%(ACTX)s, 1);
-#  asn1_param_push_integer(%(ACTX)s, maxNrOfSAEBs);
+#  asn1_param_push_integer(%(ACTX)s, maxNrOfE_RABs);
 #%(DEFAULT_BODY)s
 #  asn1_stack_frame_pop(%(ACTX)s, "ProtocolIE-ContainerPairList");
-#.END
+# END
 
 # Currently not used
-# ProtocolError-IE-ContainerList        { S1AP-PROTOCOL-IES      : IEsSetParam }	::= ProtocolIE-ContainerList     { 1, maxNrOfSAEBs,   {IEsSetParam} }
+# ProtocolError-IE-ContainerList        { S1AP-PROTOCOL-IES      : IEsSetParam }	::= ProtocolIE-ContainerList     { 1, maxNrOfE-RABs,   {IEsSetParam} }
 # FN_BODY ProtocolError-IE-ContainerList
 #  asn1_stack_frame_push(%(ACTX)s, "ProtocolIE-ContainerList");
 #  asn1_param_push_integer(%(ACTX)s, 1);
-#  asn1_param_push_integer(%(ACTX)s, maxNrOfSAEBs);
+#  asn1_param_push_integer(%(ACTX)s, maxNrOfE_RABs);
 #%(DEFAULT_BODY)s
 #  asn1_stack_frame_pop(%(ACTX)s, "ProtocolIE-ContainerList");
 # END
@@ -217,10 +210,10 @@ id-HandoverResourceAllocation 			ProcedureCode
 id-HandoverNotification 				ProcedureCode
 id-PathSwitchRequest 					ProcedureCode
 id-HandoverCancel 						ProcedureCode
-id-SAEBearerSetup						ProcedureCode
-id-SAEBearerModify 						ProcedureCode
-id-SAEBearerRelease						ProcedureCode
-id-SAEBearerReleaseRequest				ProcedureCode
+id-E-RABSetup							ProcedureCode
+id-E-RABModify 							ProcedureCode
+id-E-RABRelease							ProcedureCode
+id-E-RABReleaseIndication				ProcedureCode
 id-InitialContextSetup					ProcedureCode
 id-Paging								ProcedureCode
 id-downlinkNASTransport					ProcedureCode
@@ -248,59 +241,57 @@ id-LocationReportingFailureIndication	ProcedureCode
 id-LocationReport						ProcedureCode
 id-OverloadStart						ProcedureCode
 id-OverloadStop							ProcedureCode
+id-WriteReplaceWarning					ProcedureCode
+id-eNBDirectInformationTransfer			ProcedureCode
+id-MMEDirectInformationTransfer			ProcedureCode
+id-PrivateMessage						ProcedureCode
+
 
 # ProtocolIE-ID
 id-MME-UE-S1AP-ID									ProtocolIE-ID
 id-HandoverType										ProtocolIE-ID
 id-Cause											ProtocolIE-ID
 id-TargetID											ProtocolIE-ID
-id-Intra-LTEHOInformationReq						ProtocolIE-ID
-id-LTEtoUTRANHOInformationReq						ProtocolIE-ID
-id-LTEtoGERANHOInformationReq						ProtocolIE-ID
 id-eNB-UE-S1AP-ID									ProtocolIE-ID
-id-Intra-LTEHOInformationRes						ProtocolIE-ID
-id-LTEtoUTRANHOInformationRes						ProtocolIE-ID
-id-LTEtoGERANHOInformationRes						ProtocolIE-ID
-id-SAEBearerSubjecttoDataForwardingList				ProtocolIE-ID
-id-SAEBearertoReleaseListHOCmd						ProtocolIE-ID
-id-SAEBearerDataForwardingItem						ProtocolIE-ID
-id-SAEBearerReleaseItemBearerRelComp				ProtocolIE-ID
-id-SAEBearerToBeSetupListBearerSUReq				ProtocolIE-ID
-id-SAEBearerToBeSetupItemBearerSUReq				ProtocolIE-ID
-id-SAEBearerAdmittedList							ProtocolIE-ID
-id-SAEBearerFailedToSetupListHOReqAck				ProtocolIE-ID
-id-SAEBearerAdmittedItem							ProtocolIE-ID
-id-SAEBearerFailedtoSetupItemHOReqAck				ProtocolIE-ID
-id-SAEBearerToBeSwitchedDLList						ProtocolIE-ID
-id-SAEBearerToBeSwitchedDLItem						ProtocolIE-ID
-id-SAEBearerToBeSetupListCtxtSUReq					ProtocolIE-ID
+id-E-RABSubjecttoDataForwardingList					ProtocolIE-ID
+id-E-RABtoReleaseListHOCmd							ProtocolIE-ID
+id-E-RABDataForwardingItem							ProtocolIE-ID
+id-E-RABReleaseItemBearerRelComp					ProtocolIE-ID
+id-E-RABToBeSetupListBearerSUReq					ProtocolIE-ID
+id-E-RABToBeSetupItemBearerSUReq					ProtocolIE-ID
+id-E-RABAdmittedList								ProtocolIE-ID
+id-E-RABFailedToSetupListHOReqAck					ProtocolIE-ID
+id-E-RABAdmittedItem								ProtocolIE-ID
+id-E-RABFailedtoSetupItemHOReqAck					ProtocolIE-ID
+id-E-RABToBeSwitchedDLList							ProtocolIE-ID
+id-E-RABToBeSwitchedDLItem							ProtocolIE-ID
+id-E-RABToBeSetupListCtxtSUReq						ProtocolIE-ID
 id-TraceActivation									ProtocolIE-ID
 id-NAS-PDU											ProtocolIE-ID
-id-SAEBearerToBeSetupItemHOReq						ProtocolIE-ID
-id-SAEBearerSetupListBearerSURes					ProtocolIE-ID
-id-SAEBearerFailedToSetupListBearerSURes			ProtocolIE-ID
-id-SAEBearerToBeModifiedListBearerModReq			ProtocolIE-ID
-id-SAEBearerModifyListBearerModRes					ProtocolIE-ID
-#id-SAEBearerFailedToModifyList						ProtocolIE-ID
-id-SAEBearerToBeReleasedList						ProtocolIE-ID
-id-SAEBearerFailedToReleaseList						ProtocolIE-ID
-id-SAEBearerItem									ProtocolIE-ID
-id-SAEBearerToBeModifiedItemBearerModReq			ProtocolIE-ID
-id-SAEBearerModifyItemBearerModRes					ProtocolIE-ID
-id-SAEBearerReleaseItem								ProtocolIE-ID
-id-SAEBearerSetupItemBearerSURes					ProtocolIE-ID
-id-Security-Information								ProtocolIE-ID
+id-E-RABToBeSetupItemHOReq							ProtocolIE-ID
+id-E-RABSetupListBearerSURes						ProtocolIE-ID
+id-E-RABFailedToSetupListBearerSURes				ProtocolIE-ID
+id-E-RABToBeModifiedListBearerModReq				ProtocolIE-ID
+id-E-RABModifyListBearerModRes						ProtocolIE-ID
+id-E-RABFailedToModifyList							ProtocolIE-ID
+id-E-RABToBeReleasedList							ProtocolIE-ID
+id-E-RABFailedToReleaseList							ProtocolIE-ID
+id-E-RABItem										ProtocolIE-ID
+id-E-RABToBeModifiedItemBearerModReq				ProtocolIE-ID
+id-E-RABModifyItemBearerModRes						ProtocolIE-ID
+id-E-RABReleaseItem									ProtocolIE-ID
+id-E-RABSetupItemBearerSURes						ProtocolIE-ID
+id-SecurityContext									ProtocolIE-ID
 id-HandoverRestrictionList							ProtocolIE-ID
 id-pagingDRX 										ProtocolIE-ID
-id-pagingCause										ProtocolIE-ID
 id-TAIList											ProtocolIE-ID
 id-TAIItem											ProtocolIE-ID
-id-SAEBearerFailedToSetupListCtxtSURes				ProtocolIE-ID
-id-SAEBearerReleaseItemHOCmd						ProtocolIE-ID
-id-SAEBearerSetupItemCtxtSURes						ProtocolIE-ID
-id-SAEBearerSetupListCtxtSURes						ProtocolIE-ID
-id-SAEBearerToBeSetupItemCtxtSUReq					ProtocolIE-ID
-id-SAEBearerToBeSetupListHOReq						ProtocolIE-ID
+id-E-RABFailedToSetupListCtxtSURes					ProtocolIE-ID
+id-E-RABReleaseItemHOCmd							ProtocolIE-ID
+id-E-RABSetupItemCtxtSURes							ProtocolIE-ID
+id-E-RABSetupListCtxtSURes							ProtocolIE-ID
+id-E-RABToBeSetupItemCtxtSUReq						ProtocolIE-ID
+id-E-RABToBeSetupListHOReq							ProtocolIE-ID
 id-GERANtoLTEHOInformationRes						ProtocolIE-ID
 id-UTRANtoLTEHOInformationRes						ProtocolIE-ID
 id-CriticalityDiagnostics 							ProtocolIE-ID
@@ -312,14 +303,14 @@ id-SupportedTAs										ProtocolIE-ID
 id-TimeToWait										ProtocolIE-ID
 id-uEaggregateMaximumBitrate						ProtocolIE-ID
 id-TAI												ProtocolIE-ID
-id-SAEBearerReleaseListBearerRelComp				ProtocolIE-ID
+id-E-RABReleaseListBearerRelComp					ProtocolIE-ID
 id-cdma2000PDU										ProtocolIE-ID
 id-cdma2000RATType									ProtocolIE-ID
 id-cdma2000SectorID									ProtocolIE-ID
-id-SecurityInfo										ProtocolIE-ID
+id-SecurityKey										ProtocolIE-ID
 id-UERadioCapability								ProtocolIE-ID
 id-GUMMEI-ID										ProtocolIE-ID
-id-SAEBearerInformationListItem						ProtocolIE-ID
+id-E-RABInformationListItem							ProtocolIE-ID
 id-Direct-Forwarding-Path-Availability				ProtocolIE-ID
 id-UEIdentityIndexValue								ProtocolIE-ID
 id-cdma2000HOStatus									ProtocolIE-ID
@@ -332,8 +323,8 @@ id-eNB-StatusTransfer-TransparentContainer			ProtocolIE-ID
 id-UE-associatedLogicalS1-ConnectionItem			ProtocolIE-ID
 id-ResetType										ProtocolIE-ID
 id-UE-associatedLogicalS1-ConnectionListResAck		ProtocolIE-ID
-id-SAEBearerToBeSwitchedULItem						ProtocolIE-ID
-id-SAEBearerToBeSwitchedULList						ProtocolIE-ID
+id-E-RABToBeSwitchedULItem							ProtocolIE-ID
+id-E-RABToBeSwitchedULList							ProtocolIE-ID
 id-S-TMSI											ProtocolIE-ID
 id-cdma2000OneXRAND									ProtocolIE-ID
 id-RequestType										ProtocolIE-ID
@@ -341,10 +332,34 @@ id-UE-S1AP-IDs										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-E-RABFailedToBeReleasedList						ProtocolIE-ID
+id-Source-ToTarget-TransparentContainer				ProtocolIE-ID
 id-ServedGUMMEIs									ProtocolIE-ID
 id-SubscriberProfileIDforRFP						ProtocolIE-ID
+
+id-UESecurityCapabilities							ProtocolIE-ID
+id-CSFallbackIndicator								ProtocolIE-ID
+id-CNDomain											ProtocolIE-ID
+id-E-RABReleasedList								ProtocolIE-ID
+id-MessageIdentifier								ProtocolIE-ID
+id-SerialNumber										ProtocolIE-ID
+id-WarningAreaList									ProtocolIE-ID
+id-RepetitionPeriod									ProtocolIE-ID
+id-NumberofBroadcastRequest							ProtocolIE-ID
+id-WarningType										ProtocolIE-ID
+id-WarningSecurityInfo								ProtocolIE-ID
+id-DataCodingScheme									ProtocolIE-ID
+id-WarningMessageContents							ProtocolIE-ID
+id-BroadcastCompletedAreaList						ProtocolIE-ID
+id-Inter-SystemInformationTransferTypeEDT			ProtocolIE-ID
+id-Inter-SystemInformationTransferTypeMDT			ProtocolIE-ID
+id-Target-ToSource-TransparentContainer				ProtocolIE-ID
+id-SRVCCOperationPossible							ProtocolIE-ID
+id-SRVCCHOIndication								ProtocolIE-ID
+id-NAS-DownlinkCount								ProtocolIE-ID
+id-CSG-Id											ProtocolIE-ID
+id-CSG-IdList										ProtocolIE-ID
+
 #.END
 
 #.REGISTER_NEW
@@ -354,55 +369,47 @@ MME-UE-S1AP-ID							N s1ap.ies id-MME-UE-S1AP-ID
 HandoverType							N s1ap.ies id-HandoverType
 Cause									N s1ap.ies id-Cause
 TargetID								N s1ap.ies id-TargetID
-Intra-LTEHOInformationReq				N s1ap.ies id-Intra-LTEHOInformationReq
-LTEtoUTRANHOInformationReq				N s1ap.ies id-LTEtoUTRANHOInformationReq
-LTEtoGERANHOInformationReq				N s1ap.ies id-LTEtoGERANHOInformationReq
 ENB-UE-S1AP-ID							N s1ap.ies id-eNB-UE-S1AP-ID
-Intra-LTEHOInformationRes				N s1ap.ies id-Intra-LTEHOInformationRes
-LTEtoUTRANHOInformationRes				N s1ap.ies id-LTEtoUTRANHOInformationRes
-LTEtoGERANHOInformationRes				N s1ap.ies id-LTEtoGERANHOInformationRes
-SAEBearerSubjecttoDataForwardingList	N s1ap.ies id-SAEBearerSubjecttoDataForwardingList
-SAEBearertoReleaseListHOCmd				N s1ap.ies id-SAEBearertoReleaseListHOCmd
-SAEBearerDataForwardingItem				N s1ap.ies id-SAEBearerDataForwardingItem
-SAEBearerReleaseItemBearerRelComp		N s1ap.ies id-SAEBearerReleaseItemBearerRelComp
-SAEBearerToBeSetupListBearerSUReq		N s1ap.ies id-SAEBearerToBeSetupListBearerSUReq
-SAEBearerToBeSetupItemBearerSUReq		N s1ap.ies id-SAEBearerToBeSetupItemBearerSUReq
-SAEBearerAdmittedList					N s1ap.ies id-SAEBearerAdmittedList
-SAEBearerFailedtoSetupListHOReqAck		N s1ap.ies id-SAEBearerFailedToSetupListHOReqAck
-SAEBearerAdmittedItem					N s1ap.ies id-SAEBearerAdmittedItem
-SAEBearerFailedToSetupItemHOReqAck		N s1ap.ies id-SAEBearerFailedtoSetupItemHOReqAck
-SAEBearerToBeSwitchedDLList				N s1ap.ies id-SAEBearerToBeSwitchedDLList
-SAEBearerToBeSwitchedDLItem				N s1ap.ies id-SAEBearerToBeSwitchedDLItem
-SAEBearerToBeSetupListCtxtSUReq			N s1ap.ies id-SAEBearerToBeSetupListCtxtSUReq
+E-RABSubjecttoDataForwardingList		N s1ap.ies id-E-RABSubjecttoDataForwardingList
+E-RABList								N s1ap.ies id-E-RABtoReleaseListHOCmd
+E-RABDataForwardingItem					N s1ap.ies id-E-RABDataForwardingItem
+E-RABReleaseItemBearerRelComp			N s1ap.ies id-E-RABReleaseItemBearerRelComp
+E-RABToBeSetupListBearerSUReq			N s1ap.ies id-E-RABToBeSetupListBearerSUReq
+E-RABToBeSetupItemBearerSUReq			N s1ap.ies id-E-RABToBeSetupItemBearerSUReq
+E-RABAdmittedList						N s1ap.ies id-E-RABAdmittedList
+#E-RABFailedtoSetupListHOReqAck			N s1ap.ies id-E-RABFailedToSetupListHOReqAck
+E-RABAdmittedItem						N s1ap.ies id-E-RABAdmittedItem
+E-RABFailedToSetupItemHOReqAck			N s1ap.ies id-E-RABFailedtoSetupItemHOReqAck
+E-RABToBeSwitchedDLList					N s1ap.ies id-E-RABToBeSwitchedDLList
+E-RABToBeSwitchedDLItem					N s1ap.ies id-E-RABToBeSwitchedDLItem
+E-RABToBeSetupListCtxtSUReq				N s1ap.ies id-E-RABToBeSetupListCtxtSUReq
 TraceActivation							N s1ap.ies id-TraceActivation
 NAS-PDU									N s1ap.ies id-NAS-PDU
-SAEBearerToBeSetupItemHOReq				N s1ap.ies id-SAEBearerToBeSetupItemHOReq
-SAEBearerSetupListBearerSURes			N s1ap.ies id-SAEBearerSetupListBearerSURes
-SAEBearerList							N s1ap.ies id-SAEBearerFailedToSetupListBearerSURes
-SAEBearerToBeModifiedListBearerModReq	N s1ap.ies id-SAEBearerToBeModifiedListBearerModReq
-SAEBearerModifyListBearerModRes			N s1ap.ies id-SAEBearerModifyListBearerModRes
-SAEBearerList							N s1ap.ies id-SAEBearerFailedToModifyList
-SAEBearerList							N s1ap.ies id-SAEBearerToBeReleasedList
-SAEBearerList							N s1ap.ies id-SAEBearerFailedToReleaseList
-SAEBearerItem							N s1ap.ies id-SAEBearerItem
-SAEBearerToBeModifiedItemBearerModReq	N s1ap.ies id-SAEBearerToBeModifiedItemBearerModReq
-SAEBearerModifyItemBearerModRes			N s1ap.ies id-SAEBearerModifyItemBearerModRes
-#SAEBearerReleaseItem					N s1ap.ies id-SAEBearerReleaseItem
-SAEBearerSetupItemBearerSURes			N s1ap.ies id-SAEBearerSetupItemBearerSURes
-SecurityInformation						N s1ap.ies id-Security-Information
+E-RABToBeSetupItemHOReq					N s1ap.ies id-E-RABToBeSetupItemHOReq
+E-RABSetupListBearerSURes				N s1ap.ies id-E-RABSetupListBearerSURes
+E-RABList								N s1ap.ies id-E-RABFailedToSetupListBearerSURes
+E-RABList								N s1ap.ies id-E-RABToBeModifiedListBearerModReq
+E-RABModifyListBearerModRes				N s1ap.ies id-E-RABModifyListBearerModRes
+E-RABList								N s1ap.ies id-E-RABFailedToModifyList
+E-RABList								N s1ap.ies id-E-RABToBeReleasedList
+E-RABList								N s1ap.ies id-E-RABFailedToReleaseList
+E-RABItem								N s1ap.ies id-E-RABItem
+E-RABToBeModifiedItemBearerModReq		N s1ap.ies id-E-RABToBeModifiedItemBearerModReq
+E-RABModifyItemBearerModRes				N s1ap.ies id-E-RABModifyItemBearerModRes
+#SAEBearerReleaseItem					N s1ap.ies id-E-RABReleaseItem
+E-RABSetupItemBearerSURes				N s1ap.ies id-E-RABSetupItemBearerSURes
+SecurityContext							N s1ap.ies id-SecurityContext
 HandoverRestrictionList					N s1ap.ies id-HandoverRestrictionList
 PagingDRX								N s1ap.ies id-pagingDRX
-PagingCause								N s1ap.ies id-pagingCause
 TAIList									N s1ap.ies id-TAIList
 TAIItem									N s1ap.ies id-TAIItem
-SAEBearerList							N s1ap.ies id-SAEBearerFailedToSetupListCtxtSURes
-SAEBearerReleaseItemHOCmd				N s1ap.ies id-SAEBearerReleaseItemHOCmd
-SAEBearerSetupItemCtxtSURes				N s1ap.ies id-SAEBearerSetupItemCtxtSURes
-SAEBearerSetupListCtxtSURes				N s1ap.ies id-SAEBearerSetupListCtxtSURes
-SAEBearerToBeSetupItemCtxtSUReq			N s1ap.ies id-SAEBearerToBeSetupItemCtxtSUReq
-SAEBearerToBeSetupListHOReq				N s1ap.ies id-SAEBearerToBeSetupListHOReq
-GERANtoLTEHOInformationRes				N s1ap.ies id-GERANtoLTEHOInformationRes
-UTRANtoLTEHOInformationRes				N s1ap.ies id-UTRANtoLTEHOInformationRes
+E-RABList								N s1ap.ies id-E-RABFailedToSetupListCtxtSURes
+#E-RABReleaseItemHOCmd					N s1ap.ies id-E-RABReleaseItemHOCmd
+E-RABSetupItemCtxtSURes					N s1ap.ies id-E-RABSetupItemCtxtSURes
+E-RABSetupListCtxtSURes					N s1ap.ies id-E-RABSetupListCtxtSURes
+E-RABToBeSetupItemCtxtSUReq				N s1ap.ies id-E-RABToBeSetupItemCtxtSUReq
+E-RABToBeSetupListHOReq					N s1ap.ies id-E-RABToBeSetupListHOReq
+#UTRANtoLTEHOInformationRes				N s1ap.ies id-UTRANtoLTEHOInformationRes
 CriticalityDiagnostics					N s1ap.ies id-CriticalityDiagnostics
 Global-ENB-ID							N s1ap.ies id-Global-ENB-ID
 ENBname									N s1ap.ies id-eNBname
@@ -412,14 +419,14 @@ SupportedTAs							N s1ap.ies id-SupportedTAs
 TimeToWait								N s1ap.ies id-TimeToWait
 UEAggregateMaximumBitrate				N s1ap.ies id-uEaggregateMaximumBitrate
 TAI										N s1ap.ies id-TAI
-SAEBearerReleaseListBearerRelComp		N s1ap.ies id-SAEBearerReleaseListBearerRelComp				
+E-RABReleaseListBearerRelComp			N s1ap.ies id-E-RABReleaseListBearerRelComp				
 Cdma2000PDU								N s1ap.ies id-cdma2000PDU										
 Cdma2000RATType							N s1ap.ies id-cdma2000RATType									
 Cdma2000SectorID						N s1ap.ies id-cdma2000SectorID									
-SecurityInfo							N s1ap.ies id-SecurityInfo										
+SecurityKey								N s1ap.ies id-SecurityKey										
 UERadioCapability						N s1ap.ies id-UERadioCapability								
 GUMMEI									N s1ap.ies id-GUMMEI-ID										
-SAEBearerInformationListItem			N s1ap.ies id-SAEBearerInformationListItem						
+E-RABInformationListItem				N s1ap.ies id-E-RABInformationListItem						
 Direct-Forwarding-Path-Availability		N s1ap.ies id-Direct-Forwarding-Path-Availability				
 UEIdentityIndexValue					N s1ap.ies id-UEIdentityIndexValue								
 Cdma2000HOStatus						N s1ap.ies id-cdma2000HOStatus
@@ -432,8 +439,8 @@ ENB-StatusTransfer-TransparentContainer	N s1ap.ies id-eNB-StatusTransfer-Transpa
 UE-associatedLogicalS1-ConnectionItem	N s1ap.ies id-UE-associatedLogicalS1-ConnectionItem
 ResetType								N s1ap.ies id-ResetType
 UE-associatedLogicalS1-ConnectionListResAck	N s1ap.ies id-UE-associatedLogicalS1-ConnectionListResAck
-SAEBearerToBeSwitchedULItem				N s1ap.ies id-SAEBearerToBeSwitchedULItem
-SAEBearerToBeSwitchedULList				N s1ap.ies id-SAEBearerToBeSwitchedULList
+E-RABToBeSwitchedULItem					N s1ap.ies id-E-RABToBeSwitchedULItem
+E-RABToBeSwitchedULList					N s1ap.ies id-E-RABToBeSwitchedULList
 S-TMSI									N s1ap.ies id-S-TMSI
 Cdma2000OneXRAND						N s1ap.ies id-cdma2000OneXRAND
 RequestType								N s1ap.ies id-RequestType
@@ -441,10 +448,32 @@ UE-S1AP-IDs								N s1ap.ies id-UE-S1AP-IDs
 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
+#SAEBearerList							N s1ap.ies id-E-RABFailedToBeReleasedList
+Source-ToTarget-TransparentContainer	N s1ap.ies id-Source-ToTarget-TransparentContainer
 ServedGUMMEIs							N s1ap.ies id-ServedGUMMEIs
 SubscriberProfileIDforRFP				N s1ap.ies id-SubscriberProfileIDforRFP
+UESecurityCapabilities					N s1ap.ies id-UESecurityCapabilities
+CSFallbackIndicator						N s1ap.ies id-CSFallbackIndicator
+CNDomain								N s1ap.ies id-CNDomain
+E-RABList								N s1ap.ies id-E-RABReleasedList
+MessageIdentifier						N s1ap.ies id-MessageIdentifier
+SerialNumber							N s1ap.ies id-SerialNumber
+WarningAreaList							N s1ap.ies id-WarningAreaList
+RepetitionPeriod						N s1ap.ies id-RepetitionPeriod
+NumberofBroadcastRequest				N s1ap.ies id-NumberofBroadcastRequest
+WarningType								N s1ap.ies id-WarningType
+WarningSecurityInfo						N s1ap.ies id-WarningSecurityInfo
+DataCodingScheme						N s1ap.ies id-DataCodingScheme
+WarningMessageContents					N s1ap.ies id-WarningMessageContents
+BroadcastCompletedAreaList				N s1ap.ies id-BroadcastCompletedAreaList
+Inter-SystemInformationTransferType		N s1ap.ies id-Inter-SystemInformationTransferTypeEDT
+Inter-SystemInformationTransferType		N s1ap.ies id-Inter-SystemInformationTransferTypeMDT
+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
 
 #S1AP-PROTOCOL-IES-PAIR
 #RAB-SetupOrModifyItemFirst         N s1ap.ies.pair.first id-RAB-SetupOrModifyItem
@@ -469,16 +498,16 @@ PathSwitchRequest						N s1ap.proc.imsg id-PathSwitchRequest
 PathSwitchRequestAcknowledge			N s1ap.proc.sout id-PathSwitchRequest
 PathSwitchRequestFailure				N s1ap.proc.uout id-PathSwitchRequest
 
-SAEBearerSetupRequest					N s1ap.proc.imsg id-SAEBearerSetup
-SAEBearerSetupResponse					N s1ap.proc.sout id-SAEBearerSetup
+E-RABSetupRequest						N s1ap.proc.imsg id-E-RABSetup
+E-RABSetupResponse						N s1ap.proc.sout id-E-RABSetup
 
-SAEBearerModifyRequest					N s1ap.proc.imsg id-SAEBearerModify
-SAEBearerModifyResponse					N s1ap.proc.sout id-SAEBearerModify
+E-RABModifyRequest						N s1ap.proc.imsg id-E-RABModify
+E-RABModifyResponse						N s1ap.proc.sout id-E-RABModify
 
-SAEBearerReleaseCommand					N s1ap.proc.imsg id-SAEBearerRelease
-SAEBearerReleaseResponse				N s1ap.proc.sout id-SAEBearerRelease
+E-RABReleaseCommand						N s1ap.proc.imsg id-E-RABRelease
+E-RABReleaseResponse					N s1ap.proc.sout id-E-RABRelease
 
-SAEBearerReleaseRequest					N s1ap.proc.imsg id-SAEBearerReleaseRequest
+E-RABReleaseIndication					N s1ap.proc.imsg id-E-RABReleaseIndication
 
 InitialContextSetupRequest				N s1ap.proc.imsg id-InitialContextSetup
 InitialContextSetupResponse				N s1ap.proc.sout id-InitialContextSetup
@@ -549,6 +578,15 @@ OverloadStart							N s1ap.proc.imsg id-OverloadStart
 
 OverloadStop							N s1ap.proc.imsg id-OverloadStop
 
+WriteReplaceWarningRequest				N s1ap.proc.imsg id-WriteReplaceWarning
+WriteReplaceWarningResponse				N s1ap.proc.sout id-WriteReplaceWarning
+
+ENBDirectInformationTransfer			N s1ap.proc.imsg id-eNBDirectInformationTransfer
+
+MMEDirectInformationTransfer			N s1ap.proc.imsg id-MMEDirectInformationTransfer
+
+PrivateMessage							N s1ap.proc.imsg id-PrivateMessage
+
 #.TYPE_ATTR
 BitRate TYPE = FT_UINT64 DISPLAY = BASE_DEC STRINGS = NULL
 #.END