Update to latest spec.

svn path=/trunk/; revision=24849

6 files changed, 699 insertions, 152 deletions

diff --git a/asn1/s1ap/S1AP-CommonDataTypes.asn b/asn1/s1ap/S1AP-CommonDataTypes.asn
index de5fcfd342..fcc04543e1 100644
--- a/asn1/s1ap/S1AP-CommonDataTypes.asn
+++ b/asn1/s1ap/S1AP-CommonDataTypes.asn
@@ -32,3 +32,4 @@ ProtocolIE-ID		::= INTEGER (0..65535)
 TriggeringMessage	::= ENUMERATED { initiating-message, successful-outcome, unsuccessfull-outcome }
 
 END
+
diff --git a/asn1/s1ap/S1AP-Constants.asn b/asn1/s1ap/S1AP-Constants.asn
index 5239d1911d..4cec21140c 100644
--- a/asn1/s1ap/S1AP-Constants.asn
+++ b/asn1/s1ap/S1AP-Constants.asn
@@ -16,29 +16,49 @@ BEGIN
 
 -- **************************************************************
 --
+-- IE parameter types from other modules.
+--
+-- **************************************************************
+
+IMPORTS
+	ProcedureCode,
+	ProtocolIE-ID
+
+FROM S1AP-CommonDataTypes;
+
+
+-- **************************************************************
+--
 -- Elementary Procedures
 --
 -- **************************************************************
 
-id-HandoverPreparation 				INTEGER ::= 0
-id-HandoverResourceAllocation 		INTEGER ::= 1
-id-HandoverNotification 			INTEGER ::= 2
-id-PathSwitchRequest 				INTEGER ::= 3
-id-HandoverCancel 					INTEGER ::= 4
-id-SAEBearerSetup						INTEGER ::= 5
-id-SAEBearerModify 					INTEGER ::= 6
-id-SAEBearerRelease					INTEGER ::= 7
-id-SAEBearerReleaseRequest				INTEGER ::= 8
-id-InitialContextSetup						INTEGER ::= 9
-id-Paging							INTEGER ::= 10
-id-downlinkNASTransport				INTEGER ::= 11
-id-initialUEMessage					INTEGER ::= 12
-id-uplinkNASTransport				INTEGER ::= 13
-id-Reset							INTEGER ::= 14
-id-ErrorIndication					INTEGER ::= 15
-id-NASNonDeliveryIndication			INTEGER ::= 16
-id-S1Setup							INTEGER ::= 17
-id-UEContextReleaseRequest			INTEGER ::= 18
+id-HandoverPreparation 				ProcedureCode ::= 0
+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-Paging							ProcedureCode ::= 10
+id-downlinkNASTransport				ProcedureCode ::= 11
+id-initialUEMessage					ProcedureCode ::= 12
+id-uplinkNASTransport				ProcedureCode ::= 13
+id-Reset							ProcedureCode::= 14
+id-ErrorIndication					ProcedureCode ::= 15
+id-NASNonDeliveryIndication			ProcedureCode ::= 16
+id-S1Setup							ProcedureCode ::= 17
+id-UEContextReleaseRequest			ProcedureCode ::= 18
+id-DownlinkS1cdma2000tunneling		ProcedureCode ::= 19
+id-UplinkS1cdma2000tunneling		ProcedureCode ::= 20
+id-UEContextModification			ProcedureCode ::= 21
+id-UECapabilityInfoIndication		ProcedureCode ::= 22
+id-UEContextRelease					ProcedureCode ::= 23
+id-eNBStatusTransfer				ProcedureCode ::= 24
+id-MMEStatusTransfer				ProcedureCode ::= 25
 
 
 -- **************************************************************
@@ -61,7 +81,6 @@ maxNrOfInterfaces						INTEGER ::= 3   --FFS
 maxnoofTAI								INTEGER ::= 256 --FFS
 maxNrOfErrors							INTEGER ::= 256
 maxnoofBPLMNs							INTEGER ::= 6
-maxnoofNRIs								INTEGER ::= 512 -- FFS
 maxnoofPLMNsPerMME						INTEGER ::= 32 -- FFS
 maxnoofTAIs								INTEGER ::= 256  -- FFS 
 maxnoofEPLMNs							INTEGER ::= 15
@@ -77,77 +96,87 @@ maxnoofForbTAIs							INTEGER ::= 256		-- FFS Value to be checked
 --
 -- **************************************************************
 
-id-MME-UE-S1AP-ID									INTEGER ::= 0
-id-HandoverType									INTEGER ::= 1
-id-Cause										INTEGER ::= 2
-id-SourceID										INTEGER ::= 3
-id-TargetID										INTEGER ::= 4
-id-Intra-LTEHOInformationReq					INTEGER ::= 5
-id-LTEtoUTRANHOInformationReq					INTEGER ::= 6
-id-LTEtoGERANHOInformationReq					INTEGER ::= 7
-id-eNB-UE-S1AP-ID								INTEGER ::= 8
-id-Intra-LTEHOInformationRes					INTEGER ::= 9
-id-LTEtoUTRANHOInformationRes					INTEGER ::= 10
-id-LTEtoGERANHOInformationRes					INTEGER ::= 11
-id-SAEBearerSubjecttoDataForwardingList		INTEGER ::= 12
-id-SAEBearertoReleaseListHOCmd				INTEGER ::= 13
-id-SAEBearerDataForwardingItem				INTEGER ::= 14
-id-SAEBearerReleaseItemBearerRelComp			INTEGER ::= 15
-id-SAEBearerToBeSetupListBearerSUReq			INTEGER ::= 16
-id-SAEBearerToBeSetupItemBearerSUReq			INTEGER ::= 17
-id-SAEBearerAdmittedList						INTEGER ::= 18
-id-SAEBearerFailedToSetupListHOReqAck		INTEGER ::= 19
-id-SAEBearerAdmittedItem						INTEGER ::= 20
-id-SAEBearerFailedtoSetupItemHOReqAck				INTEGER ::= 21
-id-SAEBearerToBeSwitchedDLList					INTEGER ::= 22
-id-SAEBearerToBeSwitchedDLItem				INTEGER ::= 23
-id-SAEBearerToBeSetupListCtxtSUReq				INTEGER::= 24
-id-TraceActivation								INTEGER::= 25
-id-NAS-PDU								INTEGER ::= 26
-id-SAEBearerToBeSetupItemHOReq						INTEGER ::= 27
-id-SAEBearerSetupListBearerSURes					INTEGER ::= 28
-id-SAEBearerFailedToSetupListBearerSURes			INTEGER ::= 29
-id-SAEBearerToBeModifiedListBearerModReq			INTEGER ::= 30
-id-SAEBearerModifyListBearerModRes					INTEGER ::= 31
-id-SAEBearerFailedToModifyList						INTEGER ::= 32
-id-SAEBearerToBeReleasedList						INTEGER ::= 33
-id-SAEBearerReleaseListBearerRelComp				INTEGER ::= 33
-id-SAEBearerFailedToReleaseList					INTEGER ::= 34
-id-SAEBearerItem									INTEGER ::= 35
-id-SAEBearerToBeModifiedItemBearerModReq		INTEGER ::= 36
-id-SAEBearerModifyItemBearerModRes				INTEGER ::= 37
-id-SAEBearerReleaseItem							INTEGER ::= 38
-id-SAEBearerSetupItemBearerSURes					INTEGER ::= 39
-id-Security-Information							INTEGER ::= 40
-id-HandoverRestrictionList						INTEGER ::= 41
-id-s-TMSI 										INTEGER ::= 43
-id-pagingDRX 									INTEGER ::= 44
-id-pagingCause									INTEGER ::= 45
-id-TAIdList										INTEGER ::= 46
-id-TAIdItem										INTEGER ::= 47
-id-SAEBearerFailedToSetupListCtxtSURes			INTEGER ::= 48
-id-SAEBearerReleaseItemHOCmd					INTEGER ::= 49
-id-SAEBearerSetupItemCtxtSURes					INTEGER ::= 50
-id-SAEBearerSetupListCtxtSURes					INTEGER ::= 51
-id-SAEBearerToBeSetupItemCtxtSUReq				INTEGER ::= 52
-id-SAEBearerToBeSetupListHOReq				INTEGER ::= 53
-id-GERANtoLTEHOInformationReq				INTEGER ::= 54
-id-GERANtoLTEHOInformationRes				INTEGER ::= 55
-id-UTRANtoLTEHOInformationReq				INTEGER ::= 56
-id-UTRANtoLTEHOInformationRes				INTEGER ::= 57
-id-CriticalityDiagnostics 					INTEGER ::= 58
-id-ENB-ID									INTEGER ::= 59
-id-eNBname									INTEGER ::= 60
-id-MMEname									INTEGER ::= 61
-id-NRIs										INTEGER ::= 62
-id-ServedPLMNs								INTEGER ::= 63
-id-SupportedTAIs							INTEGER ::= 64
-id-TimeToWait								INTEGER ::= 65
-id-aggregateMaximumBitrate					INTEGER ::= 66
-id-TAId										INTEGER ::= 67
-id-ServingPLMN								INTEGER ::= 68
-
-
-
+id-MME-UE-S1AP-ID									ProtocolIE-ID ::= 0
+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-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-HandoverRestrictionList						ProtocolIE-ID ::= 41
+id-UEPagingID 									ProtocolIE-ID ::= 43
+id-pagingDRX 									ProtocolIE-ID ::= 44
+id-pagingCause									ProtocolIE-ID ::= 45
+id-TAIdList										ProtocolIE-ID ::= 46
+id-TAIdItem										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-GERANtoLTEHOInformationReq					ProtocolIE-ID ::= 54
+id-GERANtoLTEHOInformationRes					ProtocolIE-ID ::= 55
+id-UTRANtoLTEHOInformationReq					ProtocolIE-ID ::= 56
+id-UTRANtoLTEHOInformationRes					ProtocolIE-ID ::= 57
+id-CriticalityDiagnostics 						ProtocolIE-ID ::= 58
+id-ENB-Global-ID								ProtocolIE-ID ::= 59
+id-eNBname										ProtocolIE-ID ::= 60
+id-MMEname										ProtocolIE-ID ::= 61
+id-ServedPLMNs									ProtocolIE-ID ::= 63
+id-SupportedTAIs								ProtocolIE-ID ::= 64
+id-TimeToWait									ProtocolIE-ID ::= 65
+id-aggregateMaximumBitrate						ProtocolIE-ID ::= 66
+id-TAId											ProtocolIE-ID ::= 67
+id-ServingPLMN									ProtocolIE-ID ::= 68
+id-SAEBearerReleaseListBearerRelComp			ProtocolIE-ID ::= 69
+id-cdma2000PDU									ProtocolIE-ID ::= 70
+id-cdma2000RATType								ProtocolIE-ID ::= 71
+id-cdma2000SectorID								ProtocolIE-ID ::= 72
+id-SecurityInfo									ProtocolIE-ID ::= 73
+id-UERadioCapability							ProtocolIE-ID ::= 74
+id-GUMMEI-ID									ProtocolIE-ID ::= 75
+id-Bearers-SubjectToStatusTransferENB-List		ProtocolIE-ID ::= 76
+id-Bearers-SubjectToStatusTransferENB-Item		ProtocolIE-ID ::= 77
+id-SAEBearerInformationListItem					ProtocolIE-ID ::= 78
+id-Direct-Forwarding-Path-Availability			ProtocolIE-ID ::= 79
+id-UEIdentityIndexValue							ProtocolIE-ID ::= 80
+id-Bearers-SubjectToStatusTransferMME-List		ProtocolIE-ID ::= 80
+id-Bearers-SubjectToStatusTransferMME-Item		ProtocolIE-ID ::= 81
 
 END
+
diff --git a/asn1/s1ap/S1AP-IEs.asn b/asn1/s1ap/S1AP-IEs.asn
index 26d0ab77ae..7d7e2ad67e 100644
--- a/asn1/s1ap/S1AP-IEs.asn
+++ b/asn1/s1ap/S1AP-IEs.asn
@@ -15,13 +15,13 @@ DEFINITIONS AUTOMATIC TAGS ::=
 BEGIN
 
 IMPORTS
+	id-SAEBearerInformationListItem,
 	id-SAEBearerItem,
 	maxNrOfSAEBs,
 	maxNrOfInterfaces,
 	
 	maxNrOfErrors,
 	maxnoofBPLMNs,
-	maxnoofNRIs,
 	maxnoofPLMNsPerMME,
 	maxnoofTAIs,
 	maxnoofEPLMNs,
@@ -77,6 +77,7 @@ BPLMNs ::= SEQUENCE (SIZE(1.. maxnoofBPLMNs)) OF PLMNidentity
 Cause ::= CHOICE {
 	radioNetwork		CauseRadioNetwork,
 	transport			CauseTransport,
+	nas					CauseNas,
 	protocol			CauseProtocol,
 	misc				CauseMisc,
 	...
@@ -106,6 +107,9 @@ CauseRadioNetwork ::= ENUMERATED {
 	unspecified,
 	handover-triggered,
 	tx2relocoverall-expiry,
+	successful-handover,
+	release-due-to-eutran-generated-reason,
+	handover-cancelled,	
 	...
 
 }
@@ -116,6 +120,24 @@ CauseTransport ::= ENUMERATED {
 	...
 }
 
+CauseNas ::= ENUMERATED {
+	normal-release,
+	authentication-failure,
+	detach,
+	unspecified,
+	...
+}
+
+
+Cdma2000PDU	::= OCTET STRING
+
+Cdma2000RATType ::= ENUMERATED {
+	hRPD,
+	onexRTT,
+	...
+}
+
+Cdma2000SectorID ::= OCTET STRING
 
 CGI ::= SEQUENCE {
 	pLMNidentity				PLMNidentity,
@@ -139,25 +161,37 @@ CriticalityDiagnostics-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
-CriticalityDiagnostics-IE-List ::= SEQUENCE (SIZE (1..maxNrOfErrors)) OF
-	SEQUENCE {
-		iECriticality			Criticality,
-		iE-ID					ProtocolIE-ID,
-		typeOfError 			TypeOfError				OPTIONAL,
-		iE-Extensions			ProtocolExtensionContainer {{CriticalityDiagnostics-IE-List-ExtIEs}} OPTIONAL,
-		...
-	}
+CriticalityDiagnostics-IE-List ::= SEQUENCE (SIZE (1..maxNrOfErrors)) OF CriticalityDiagnostics-IE-Item
 
-CriticalityDiagnostics-IE-List-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+CriticalityDiagnostics-IE-Item ::= 	SEQUENCE {
+	iECriticality			Criticality,
+	iE-ID					ProtocolIE-ID,
+	typeOfError 			TypeOfError				OPTIONAL,
+	iE-Extensions			ProtocolExtensionContainer {{CriticalityDiagnostics-IE-Item-ExtIEs}} OPTIONAL,
+	...
+}
+
+CriticalityDiagnostics-IE-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
 
 -- D
+
+DL-Forwarding ::= ENUMERATED {
+	dL-Forwarding-proposed,
+	...
+}
+
+Direct-Forwarding-Path-Availability ::= ENUMERATED {
+	directPathAvailable,
+	...
+}
+
 -- E
 
-ENB-UE-S1AP-ID				::= TBCD-STRING (SIZE (3))
-ENB-ID							::= INTEGER (0..65535)
+ENB-UE-S1AP-ID				::= TBCD-STRING 
+ENB-Global-ID							::= INTEGER (0..65535)
 
 ENBname ::= OCTET STRING
 
@@ -196,6 +230,17 @@ ForbiddenLACs ::= SEQUENCE (SIZE(1..maxnoofForbLACs)) OF LAC
 
 GTP-TEID					::= OCTET STRING (SIZE (4))
 
+GUMMEI			::= SEQUENCE {
+	pLMN-Identity		PLMNidentity,
+	mME-Group-ID		MME-Group-ID,
+	mMME-Code			MME-Code,
+	iE-Extensions					ProtocolExtensionContainer { {GUMMEI-ExtIEs} } OPTIONAL,
+	...
+}
+
+GUMMEI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
 -- H
 
@@ -223,6 +268,8 @@ HandoverType ::= ENUMERATED {
 
 -- I
 
+IMSI	::=	OCTET STRING (SIZE (3..8))
+
 InterfacesToTraceList ::= SEQUENCE (SIZE (1..maxNrOfInterfaces)) OF InterfacesToTraceItem
 
 InterfacesToTraceItem ::= SEQUENCE {
@@ -265,15 +312,18 @@ LAI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 
 MMEname ::= OCTET STRING
 
-MME-UE-S1AP-ID				::= TBCD-STRING (SIZE (3))
+MME-Group-ID	::= OCTET STRING (SIZE (2))
+
+MME-Code		::= OCTET STRING (SIZE (1))
+
+MME-UE-S1AP-ID				::= TBCD-STRING 
+M-TMSI			::= OCTET STRING (SIZE (4))
+
 
 -- N
 
 NAS-PDU ::=  OCTET STRING
 
-NRIs ::= SEQUENCE (SIZE(1..maxnoofNRIs)) OF NRI
-
-NRI ::= OCTET STRING
 
 -- O
 -- P
@@ -289,7 +339,9 @@ PagingCause ::= ENUMERATED {
 	..., 
 	terminating-high-priority-signalling
 }
-PLMNidentity 				::= TBCD-STRING (SIZE (3))
+PDCP-SN ::= INTEGER  -- FFS
+
+PLMNidentity 				::= TBCD-STRING 
 
 PriorityLevel				::= INTEGER (0..15)
 
@@ -302,10 +354,30 @@ RAC					::= OCTET STRING (SIZE (1))
 
 RNC-ID					::= INTEGER (0..4095)
 
+RRC-Container	::= OCTET STRING
+
 -- S
 
 SAE-Bearer-ID		::= OCTET STRING
 
+SAEBearerInformationList	::= SEQUENCE (SIZE (1.. maxNrOfSAEBs)) OF ProtocolIE-SingleContainer { { SAEBearerInformationListIEs } }
+
+SAEBearerInformationListIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-SAEBearerInformationListItem			CRITICALITY ignore	TYPE SAEBearerInformationListItem			PRESENCE mandatory	},
+	...
+}
+
+SAEBearerInformationListItem ::= SEQUENCE {
+	sAE-Bearer-ID					SAE-Bearer-ID,
+	dL-Forwarding					DL-Forwarding,
+	iE-Extensions					ProtocolExtensionContainer { {SAEBearerInformationListItem-ExtIEs} }			OPTIONAL,
+	...
+}
+
+SAEBearerInformationListItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 SAEBearerList ::= SEQUENCE (SIZE(0.. maxNrOfSAEBs)) OF ProtocolIE-SingleContainer { {SAEBearerItemIEs} }
 
 SAEBearerItemIEs 	S1AP-PROTOCOL-IES ::= {
@@ -360,20 +432,42 @@ SAE-GBR-Bearer-Parameters-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 
 
 SAE-non-GBR-Bearer ::= SEQUENCE {
-	sAE-non-GBR-Bearer-Type			ENUMERATED {non-GBR-Bearer,...},
+	sAE-non-GBR-Bearer-Type			SAE-non-GBR-Bearer-Type,
 	iE-Extensions						ProtocolExtensionContainer { {SAE-non-GBR-Bearer-Parameters-ExtIEs} } OPTIONAL,
 	...
 }
 
+SAE-non-GBR-Bearer-Type	::= ENUMERATED {
+	non-GBR-Bearer,
+	...
+}
+
 SAE-non-GBR-Bearer-Parameters-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+SecurityInfo ::= SEQUENCE {
+	securityKey		SecurityKey,
+	iE-Extensions			ProtocolExtensionContainer { { SecurityInfo-ExtIEs} } OPTIONAL,
+	...
+}
+
+SecurityKey	::= BIT STRING (SIZE(128))
+
+
+SecurityInfo-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
 SecurityInformation ::= SEQUENCE {
-	securityPlaceHolder		ENUMERATED {whatever},
-	iE-Extensions			ProtocolExtensionContainer { { SecurityInformation-ExtIEs} } OPTIONAL
+	securityPlaceHolder		SecurityPlaceHolder,
+	iE-Extensions			ProtocolExtensionContainer { { SecurityInformation-ExtIEs} } OPTIONAL,
+	...
+}
 
+SecurityPlaceHolder	::= ENUMERATED {
+	whatever,
+	...
 }
 
 SecurityInformation-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
@@ -389,10 +483,20 @@ SourceID ::= SEQUENCE {
 
 SourceeNB-ID ::= SEQUENCE {
 	pLMNidentity				PLMNidentity,
-	eNB-ID				ENB-ID
+	eNB-Global-ID				ENB-Global-ID -- FFS
+}
+
+SourceeNodeB-ToTargeteNodeB-TransparentContainer		::= SEQUENCE {
+	rRC-Container					RRC-Container,
+	sAEBearerInformationList		SAEBearerInformationList		OPTIONAL,
+	iE-Extensions			ProtocolExtensionContainer { {SourceeNodeB-ToTargeteNodeB-TransparentContainer-ExtIEs} } OPTIONAL,
+	...
+}
+
+SourceeNodeB-ToTargeteNodeB-TransparentContainer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
 }
 
-SourceeNodeB-ToTargeteNodeB-TransparentContainer		::= OCTET STRING
 
 SourceRNC-ToTargetRNC-TransparentContainer		::= OCTET STRING
 
@@ -407,7 +511,11 @@ SupportedTAs-Item ::=	SEQUENCE  {
 	...
 }
 
-S-TMSI ::= OCTET STRING
+S-TMSI ::= SEQUENCE {
+	mMEC	MME-Code,
+	m-TMSI	M-TMSI,
+	...
+}
 
 
 -- T
@@ -416,7 +524,7 @@ TAI ::= OCTET STRING
 
 TAId ::= OCTET STRING
 
-TBCD-STRING 				::= OCTET STRING
+TBCD-STRING ::= OCTET STRING (SIZE (3))
 
 TargetID ::= CHOICE {
 	targeteNB-ID			TargeteNB-ID,
@@ -427,7 +535,7 @@ TargetID ::= CHOICE {
 
 TargeteNB-ID ::= SEQUENCE {
 	pLMNidentity				PLMNidentity,
-	eNB-ID				ENB-ID
+	eNB-Global-ID				ENB-Global-ID -- FFS
 }
 
 TargetRNC-ID ::= SEQUENCE {
@@ -459,6 +567,9 @@ TraceDepth ::= ENUMERATED {
 	minimum,
 	medium,
 	maximum,
+	vendorMinimum,
+	vendorMedium,
+	vendorMaximum,
 	...
 }
 
@@ -472,8 +583,16 @@ TypeOfError ::= ENUMERATED {
 
 -- U
 
-UserDataType ::= INTEGER
--- Editors note: FFS (ENUMERATED?)
+UEIdentityIndexValue	::=	OCTET STRING
+
+UEPagingID ::= CHOICE {
+	s-TMSI		S-TMSI,
+	iMSI		IMSI,
+	...
+	}
+
+UERadioCapability ::= OCTET STRING
+
 
 -- V
 -- W
@@ -482,5 +601,3 @@ UserDataType ::= INTEGER
 -- Z
 
 END
-
-
diff --git a/asn1/s1ap/S1AP-PDU-Contents.asn b/asn1/s1ap/S1AP-PDU-Contents.asn
index 7482d5404c..312eee132e 100644
--- a/asn1/s1ap/S1AP-PDU-Contents.asn
+++ b/asn1/s1ap/S1AP-PDU-Contents.asn
@@ -36,27 +36,36 @@ IMPORTS
 	SAE-Bearer-ID,
 	TransportLayerAddress,
 	GTP-TEID,
+	GUMMEI,
 	SAE-BearerLevelQoSParameters,
 	SAEBearerList,
 	Cause,
 	TraceActivation,
 	NAS-PDU,
-	UserDataType,
+	
 	SecurityInformation,
-	S-TMSI,
+	UEPagingID,
 	PagingDRX,
 	PagingCause,
 	TAId,
 	CriticalityDiagnostics,
-	ENB-ID,
+	ENB-Global-ID,
 	ENBname,
 	MMEname,
-	NRIs,
 	ServedPLMNs,
 	SupportedTAIs,
 	TimeToWait,
 	HandoverRestrictionList,
-	PLMNidentity
+	PLMNidentity,
+	Cdma2000PDU,
+	Cdma2000RATType,
+	Cdma2000SectorID,
+	SecurityInfo,
+	UERadioCapability,
+	PDCP-SN,
+	Direct-Forwarding-Path-Availability,
+	UEIdentityIndexValue
+
 
 
 FROM S1AP-IEs
@@ -76,9 +85,14 @@ FROM S1AP-Containers
 
 
 	id-aggregateMaximumBitrate,
+	id-Bearers-SubjectToStatusTransferENB-List,
+	id-Bearers-SubjectToStatusTransferENB-Item,
+	id-Bearers-SubjectToStatusTransferMME-List,
+	id-Bearers-SubjectToStatusTransferMME-Item,
 	id-Cause,
 	id-CriticalityDiagnostics,
-	id-ENB-ID,
+	id-Direct-Forwarding-Path-Availability,
+	id-ENB-Global-ID,
 	id-eNBname,
 	id-eNB-UE-S1AP-ID, 
 	id-GERANtoLTEHOInformationReq,
@@ -95,7 +109,6 @@ FROM S1AP-Containers
 	id-MMEname,
 	id-MME-UE-S1AP-ID,
 	id-NAS-PDU,
-	id-NRIs,
 	id-pagingCause,
 	id-pagingDRX,
 	id-ServingPLMN,
@@ -137,7 +150,7 @@ FROM S1AP-Containers
 	id-Security-Information,
 	id-ServedPLMNs,
 	id-SourceID,
-	id-s-TMSI,
+	id-UEPagingID,
 	id-SupportedTAIs,
 	id-TAId,
 	id-TAIdItem,
@@ -147,6 +160,13 @@ FROM S1AP-Containers
 	id-TraceActivation,
 	id-UTRANtoLTEHOInformationReq,
 	id-UTRANtoLTEHOInformationRes,
+	id-cdma2000PDU,
+	id-cdma2000RATType,
+	id-cdma2000SectorID,
+	id-SecurityInfo,
+	id-UERadioCapability,
+	id-UEIdentityIndexValue,
+	id-GUMMEI-ID,
 	maxnoofTAI,
 	maxNrOfErrors,
 	maxNrOfSAEBs
@@ -187,6 +207,7 @@ HandoverRequiredIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-Cause					CRITICALITY ignore	TYPE Cause		 			PRESENCE mandatory	} |
 	{ ID id-SourceID				CRITICALITY ignore	TYPE SourceID	 				PRESENCE mandatory	} |
 	{ ID id-TargetID				CRITICALITY reject	TYPE TargetID	 				PRESENCE mandatory	} |
+	{ ID id-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
@@ -261,8 +282,8 @@ SAEBearerDataForwardingItemIEs S1AP-PROTOCOL-IES ::= {
 
 SAEBearerDataForwardingItem ::= SEQUENCE {
 	sAE-Bearer-ID						SAE-Bearer-ID,
-	transportLayerAddress				TransportLayerAddress,
-	gTP-TEID					GTP-TEID,
+	dL-transportLayerAddress				TransportLayerAddress,
+	dL-gTP-TEID					GTP-TEID,
 	iE-Extensions					ProtocolExtensionContainer { { SAEBearerDataForwardingItem-ExtIEs} }			OPTIONAL,
 	...
 }
@@ -423,15 +444,16 @@ HandoverRequestAcknowledge ::= SEQUENCE {
 
 HandoverRequestAcknowledgeIEs S1AP-PROTOCOL-IES ::= {	
 	{ ID id-MME-UE-S1AP-ID					CRITICALITY reject	TYPE MME-UE-S1AP-ID		 			PRESENCE mandatory	} |
-	{ ID id-Cause					CRITICALITY ignore	TYPE Cause		 			PRESENCE mandatory	} |
+	{ ID id-eNB-UE-S1AP-ID					CRITICALITY reject	TYPE ENB-UE-S1AP-ID		 			PRESENCE mandatory	} |
+	{ ID id-HandoverType					CRITICALITY reject	TYPE HandoverType		 			PRESENCE mandatory	} |
 	{ ID id-SAEBearerAdmittedList					CRITICALITY reject	TYPE SAEBearerAdmittedList		 			PRESENCE mandatory	} |
 	{ ID id-SAEBearerFailedToSetupListHOReqAck					CRITICALITY ignore	TYPE SAEBearerFailedtoSetupListHOReqAck		 			PRESENCE mandatory	} |
 	{ ID id-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 LTEtoUTRANHOInformationRes			PRESENCE conditional
+	{ 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 LTEtoGERANHOInformationRes PRESENCE conditional
+							CRITICALITY reject	TYPE GERANtoLTEHOInformationRes PRESENCE conditional
 	-- This IE shall be present if the Handover Type IE is set to value "GERANtoLTE" --												},
 	...
 }
@@ -447,6 +469,8 @@ SAEBearerAdmittedItem ::= SEQUENCE {
 	sAE-Bearer-ID						SAE-Bearer-ID,
 	transportLayerAddress				TransportLayerAddress,
 	gTP-TEID					GTP-TEID,
+	dL-transportLayerAddress				TransportLayerAddress	OPTIONAL,
+	dL-gTP-TEID								GTP-TEID	OPTIONAL,
 	iE-Extensions					ProtocolExtensionContainer { {SAEBearerAdmittedItem-ExtIEs} }			OPTIONAL,
 	...
 }
@@ -692,7 +716,6 @@ SAEBearerToBeSetupItemBearerSUReq ::= SEQUENCE {
 	sAE-BearerlevelQoSParameters					SAE-BearerLevelQoSParameters,		
 	transportLayerAddress 			TransportLayerAddress,
 	gTP-TEID					GTP-TEID,
-	userDataType 					UserDataType,	-- FFS
 	iE-Extensions					ProtocolExtensionContainer { {SAEBearerToBeSetupItemBearerSUReqExtIEs} } OPTIONAL,
 	...
 }
@@ -948,7 +971,8 @@ InitialContextSetupRequestIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-TraceActivation				CRITICALITY ignore	TYPE TraceActivation	 		PRESENCE optional	}|
 	{ ID id-ServingPLMN					CRITICALITY reject	TYPE PLMNidentity	PRESENCE optional } |
 	{ ID id-HandoverRestrictionList		CRITICALITY ignore	TYPE HandoverRestrictionList	PRESENCE optional	}|
-	{ ID id-NAS-PDU				CRITICALITY ignore	TYPE NAS-PDU	 		PRESENCE optional},
+	{ ID id-NAS-PDU				CRITICALITY ignore	TYPE NAS-PDU	 		PRESENCE optional}|
+	{ ID id-UERadioCapability			CRITICALITY ignore	TYPE UERadioCapability				PRESENCE optional	},
 	...
 }
 -- **************************************************************
@@ -1065,7 +1089,8 @@ Paging ::= SEQUENCE {
 }
 
 PagingIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-s-TMSI						CRITICALITY ignore	TYPE S-TMSI				PRESENCE mandatory	} |
+	{ ID id-UEIdentityIndexValue		CRITICALITY ignore	TYPE UEIdentityIndexValue	PRESENCE mandatory	} |
+	{ ID id-UEPagingID						CRITICALITY ignore	TYPE UEPagingID				PRESENCE mandatory	} |
 	{ ID id-pagingDRX					CRITICALITY ignore	TYPE PagingDRX			PRESENCE mandatory	} |
 	{ ID id-pagingCause					CRITICALITY ignore	TYPE PagingCause		PRESENCE mandatory	} |
 	{ ID id-TAIdList					CRITICALITY ignore	TYPE TAIdList		 	PRESENCE mandatory	},
@@ -1092,6 +1117,104 @@ TAIdItemExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 
 -- **************************************************************
 --
+-- UE CONTEXT RELEASE ELEMENTARY PROCEDURE
+--
+-- **************************************************************
+
+
+-- **************************************************************
+--
+-- UE Context Release Command
+--
+-- **************************************************************
+
+UEContextReleaseCommand ::= SEQUENCE {
+	protocolIEs                     ProtocolIE-Container       {{UEContextReleaseCommand-IEs}},
+	...
+}
+
+UEContextReleaseCommand-IEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-MME-UE-S1AP-ID			CRITICALITY reject	TYPE MME-UE-S1AP-ID				PRESENCE mandatory} |
+	{ ID id-eNB-UE-S1AP-ID			CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory} |
+	{ ID id-Cause					CRITICALITY ignore	TYPE Cause						PRESENCE mandatory} ,
+	...
+}
+
+-- **************************************************************
+--
+-- UE Context Release Complete
+--
+-- **************************************************************
+
+UEContextReleaseComplete ::= SEQUENCE {
+	protocolIEs                     ProtocolIE-Container       {{UEContextReleaseComplete-IEs}},
+	...
+}
+
+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} ,
+	...
+}
+
+
+-- **************************************************************
+--
+-- UE Context Modification
+--
+-- **************************************************************
+
+-- **************************************************************
+--
+-- UE Context Modification Request
+--
+-- **************************************************************
+
+UEContextModificationRequest ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { { UEContextModificationRequestIEs} },
+	...
+}
+
+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	},	...
+}
+-- **************************************************************
+--
+-- UE Context Modification Response
+--
+-- **************************************************************
+
+UEContextModificationResponse ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { { UEContextModificationResponseIEs} },
+	...
+}
+
+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	},
+	...
+}-- **************************************************************
+--
+-- UE Context Modification Failure
+--
+-- **************************************************************
+
+UEContextModificationFailure ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { { UEContextModificationFailureIEs} },
+	...
+}
+
+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-Cause				CRITICALITY ignore	TYPE Cause				PRESENCE mandatory	},
+	...
+}
+
+-- **************************************************************
+--
 -- DOWNLINK NAS TRANSPORT
 --
 -- **************************************************************
@@ -1249,7 +1372,7 @@ S1SetupRequest ::= SEQUENCE {
 }
 
 S1SetupRequestIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-ENB-ID				CRITICALITY reject	TYPE ENB-ID	 			PRESENCE mandatory	}|
+	{ ID id-ENB-Global-ID				CRITICALITY reject	TYPE ENB-Global-ID	 			PRESENCE mandatory	}|
 	{ ID id-eNBname				CRITICALITY ignore	TYPE ENBname			PRESENCE mandatory	}|
 	{ ID id-SupportedTAIs		CRITICALITY reject	TYPE SupportedTAIs	 	PRESENCE mandatory	},
 	...
@@ -1270,7 +1393,7 @@ S1SetupResponse ::= SEQUENCE {
 S1SetupResponseIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-MMEname				CRITICALITY ignore	TYPE MMEname	 		PRESENCE mandatory	}|
 	{ ID id-ServedPLMNs			CRITICALITY reject	TYPE ServedPLMNs		PRESENCE mandatory	}|
-	{ ID id-NRIs				CRITICALITY reject	TYPE NRIs				PRESENCE mandatory	},
+	{ ID id-GUMMEI-ID				CRITICALITY reject	TYPE GUMMEI				PRESENCE mandatory	},
 	...
 }
 
@@ -1291,5 +1414,167 @@ S1SetupFailureIEs S1AP-PROTOCOL-IES ::= {
 	...
 }
 
+-- **************************************************************
+--
+-- DOWNLINK S1 CDMA2000 TUNNELING ELEMTARY PROCEDURE
+--
+-- **************************************************************
+
+-- **************************************************************
+--
+-- Downlink S1 CDMA2000 Tunneling
+--
+-- **************************************************************
+
+DownlinkS1cdma2000tunneling ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {DownlinkS1cdma2000tunnelingIEs} },
+	...
+}
+
+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-cdma2000PDU					CRITICALITY reject	TYPE Cdma2000PDU	 			PRESENCE mandatory	},
+	...
+}
+
+-- **************************************************************
+--
+-- UPLINK S1 CDMA2000 TUNNELING ELEMTARY PROCEDURE
+--
+-- **************************************************************
+
+-- **************************************************************
+--
+-- Uplink S1 CDMA2000 Tunneling
+--
+-- **************************************************************
+
+UplinkS1cdma2000tunneling ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {UplinkS1cdma2000tunnelingIEs} },
+	...
+}
+
+UplinkS1cdma2000tunnelingIEs 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-cdma2000RATType				CRITICALITY reject	TYPE Cdma2000RATType 			PRESENCE mandatory	} |
+	{ ID id-cdma2000SectorID			CRITICALITY reject	TYPE Cdma2000SectorID 			PRESENCE mandatory	} |
+	{ ID id-cdma2000PDU					CRITICALITY reject	TYPE Cdma2000PDU	 			PRESENCE mandatory	},
+	...
+}
+
+-- **************************************************************
+--
+-- UE CAPABILITY INFO INDICATION PROCEDURE
+--
+-- **************************************************************
+
+-- **************************************************************
+--
+-- UE Capability Info Indication
+--
+-- **************************************************************
+
+UECapabilityInfoIndication ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { { UECapabilityInfoIndicationIEs} },
+	...
+}
+
+UECapabilityInfoIndicationIEs 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-UERadioCapability			CRITICALITY ignore	TYPE UERadioCapability				PRESENCE mandatory	} ,
+	...
+}
+
+-- **************************************************************
+--
+-- eNB STATUS TRANSFER
+--
+-- **************************************************************
+
+-- **************************************************************
+--
+-- eNB Status Transfer
+--
+-- **************************************************************
+
+ENBStatusTransfer ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {ENBStatusTransferIEs} },
+	...
+}
+
+ENBStatusTransferIEs 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-Bearers-SubjectToStatusTransferENB-List	CRITICALITY ignore	TYPE Bearers-SubjectToStatusTransferENB-List		PRESENCE mandatory} ,
+	...
+}
+
+Bearers-SubjectToStatusTransferENB-List 					::= SAEB-IE-ContainerList { { Bearers-SubjectToStatusTransferENB-ItemIEs } }
+
+Bearers-SubjectToStatusTransferENB-ItemIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-Bearers-SubjectToStatusTransferENB-Item	CRITICALITY ignore	TYPE Bearers-SubjectToStatusTransferENB-Item 	PRESENCE mandatory	}
+}
+
+Bearers-SubjectToStatusTransferENB-Item ::= SEQUENCE {
+	sAE-Bearer-ID								SAE-Bearer-ID,
+	lIS-HFN					PDCP-SN,
+	lIS					PDCP-SN,
+	dL-PDCP-HFN-NextToAssign					PDCP-SN,
+	dL-PDCP-SN-NextToAssign					PDCP-SN,
+	iE-Extensions							ProtocolExtensionContainer { {Bearers-SubjectToStatusTransferENB-ItemExtIEs} } OPTIONAL,
+	...
+}
+
+Bearers-SubjectToStatusTransferENB-ItemExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+-- **************************************************************
+--
+-- MME STATUS TRANSFER
+--
+-- **************************************************************
+
+-- **************************************************************
+--
+-- MME Status Transfer
+--
+-- **************************************************************
+
+MMEStatusTransfer ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {MMEStatusTransferIEs} },
+	...
+}
+
+MMEStatusTransferIEs 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-Bearers-SubjectToStatusTransferMME-List	CRITICALITY ignore	TYPE Bearers-SubjectToStatusTransferMME-List		PRESENCE mandatory} ,
+	...
+}
+
+Bearers-SubjectToStatusTransferMME-List 					::= SAEB-IE-ContainerList { { Bearers-SubjectToStatusTransferMME-ItemIEs } }
+
+Bearers-SubjectToStatusTransferMME-ItemIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-Bearers-SubjectToStatusTransferMME-Item	CRITICALITY ignore	TYPE Bearers-SubjectToStatusTransferMME-Item 	PRESENCE mandatory	}
+}
+
+Bearers-SubjectToStatusTransferMME-Item ::= SEQUENCE {
+	sAE-Bearer-ID								SAE-Bearer-ID,
+	lIS-HFN					PDCP-SN,
+	lIS					PDCP-SN,
+	dL-PDCP-HFN-NextToAssign					PDCP-SN,
+	dL-PDCP-SN-NextToAssign					PDCP-SN,
+	iE-Extensions							ProtocolExtensionContainer { {Bearers-SubjectToStatusTransferMME-ItemExtIEs} } OPTIONAL,
+	...
+}
+
+Bearers-SubjectToStatusTransferMME-ItemExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 
 END
diff --git a/asn1/s1ap/S1AP-PDU-Descriptions.asn b/asn1/s1ap/S1AP-PDU-Descriptions.asn
index 98bf0d9134..31151a06f5 100644
--- a/asn1/s1ap/S1AP-PDU-Descriptions.asn
+++ b/asn1/s1ap/S1AP-PDU-Descriptions.asn
@@ -58,7 +58,17 @@ FROM S1AP-CommonDataTypes
 	S1SetupRequest,
 	S1SetupResponse,
 	S1SetupFailure,
-	UEContextReleaseRequest
+	UEContextReleaseRequest,
+	UplinkS1cdma2000tunneling,
+	DownlinkS1cdma2000tunneling,
+	UEContextModificationRequest,
+	UEContextModificationResponse,
+	UEContextModificationFailure,
+	UECapabilityInfoIndication,
+	UEContextReleaseCommand,
+	UEContextReleaseComplete,
+	ENBStatusTransfer,
+	MMEStatusTransfer
 
 FROM S1AP-PDU-Contents
 	
@@ -80,7 +90,14 @@ FROM S1AP-PDU-Contents
 	id-ErrorIndication,
 	id-NASNonDeliveryIndication,
 	id-S1Setup,
-	id-UEContextReleaseRequest
+	id-UEContextReleaseRequest,
+	id-UplinkS1cdma2000tunneling,
+	id-DownlinkS1cdma2000tunneling,
+	id-UEContextModification,
+	id-UECapabilityInfoIndication,
+	id-UEContextRelease,
+	id-eNBStatusTransfer,
+	id-MMEStatusTransfer
 FROM S1AP-Constants;
 
 
@@ -159,7 +176,9 @@ S1AP-ELEMENTARY-PROCEDURES-CLASS-1 S1AP-ELEMENTARY-PROCEDURE ::= {
 	initialContextSetup				|
 	handoverCancel					|
 	reset							|
-	s1Setup,
+	s1Setup							|
+	uEContextModification			|
+	uEContextRelease				,
 	...
 }
 
@@ -172,7 +191,12 @@ S1AP-ELEMENTARY-PROCEDURES-CLASS-2 S1AP-ELEMENTARY-PROCEDURE ::= {
 	uplinkNASTransport				|
 	errorIndication					|
 	nASNonDeliveryIndication		|
-	uEContextReleaseRequest			,
+	uEContextReleaseRequest			|
+	downlinkS1cdma2000tunneling		|
+	uplinkS1cdma2000tunneling		|
+	uECapabilityInfoIndication		|
+	eNBStatusTransfer				|
+	mMEStatusTransfer				,
 	...
 }
 
@@ -201,7 +225,7 @@ handoverResourceAllocation S1AP-ELEMENTARY-PROCEDURE ::= {
 handoverNotification S1AP-ELEMENTARY-PROCEDURE ::= {
 	INITIATING MESSAGE	HandoverNotify
 	PROCEDURE CODE			id-HandoverNotification
-	CRITICALITY		reject
+	CRITICALITY		ignore
 }
 
 pathSwitchRequest S1AP-ELEMENTARY-PROCEDURE ::= {
@@ -310,4 +334,50 @@ s1Setup S1AP-ELEMENTARY-PROCEDURE ::= {
 	CRITICALITY				reject
 }
 
+downlinkS1cdma2000tunneling S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		DownlinkS1cdma2000tunneling
+	PROCEDURE CODE			id-DownlinkS1cdma2000tunneling
+	CRITICALITY				ignore
+}
+
+uplinkS1cdma2000tunneling S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		UplinkS1cdma2000tunneling
+	PROCEDURE CODE			id-UplinkS1cdma2000tunneling
+	CRITICALITY				ignore
+}
+
+uEContextModification S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		UEContextModificationRequest
+	SUCCESSFUL OUTCOME		UEContextModificationResponse
+	UNSUCCESSFUL OUTCOME 	UEContextModificationFailure
+
+	PROCEDURE CODE		id-UEContextModification
+	CRITICALITY		reject
+}
+
+uECapabilityInfoIndication S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		UECapabilityInfoIndication
+	PROCEDURE CODE			id-UECapabilityInfoIndication
+	CRITICALITY				ignore
+}
+
+uEContextRelease S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		UEContextReleaseCommand
+	SUCCESSFUL OUTCOME		UEContextReleaseComplete
+	PROCEDURE CODE			id-UEContextRelease
+	CRITICALITY				reject
+}
+
+eNBStatusTransfer S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		ENBStatusTransfer
+	PROCEDURE CODE			id-eNBStatusTransfer
+	CRITICALITY				ignore
+}
+
+mMEStatusTransfer S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		MMEStatusTransfer
+	PROCEDURE CODE			id-MMEStatusTransfer
+	CRITICALITY				ignore
+}
+
 END
diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf
index eabfcbd825..2181c22777 100644
--- a/asn1/s1ap/s1ap.cnf
+++ b/asn1/s1ap/s1ap.cnf
@@ -153,6 +153,13 @@ id-ErrorIndication					ProcedureCode
 id-NASNonDeliveryIndication			ProcedureCode
 id-S1Setup							ProcedureCode
 id-UEContextReleaseRequest			ProcedureCode
+id-DownlinkS1cdma2000tunneling		ProcedureCode
+id-UplinkS1cdma2000tunneling		ProcedureCode
+id-UEContextModification			ProcedureCode
+id-UECapabilityInfoIndication		ProcedureCode
+id-UEContextRelease					ProcedureCode
+id-eNBStatusTransfer				ProcedureCode
+id-MMEStatusTransfer				ProcedureCode
 
 # ProtocolIE-ID
 id-MME-UE-S1AP-ID									ProtocolIE-ID
@@ -189,7 +196,6 @@ id-SAEBearerToBeModifiedListBearerModReq			ProtocolIE-ID
 id-SAEBearerModifyListBearerModRes					ProtocolIE-ID
 #id-SAEBearerFailedToModifyList						ProtocolIE-ID
 id-SAEBearerToBeReleasedList						ProtocolIE-ID
-id-SAEBearerReleaseListBearerRelComp				ProtocolIE-ID
 id-SAEBearerFailedToReleaseList						ProtocolIE-ID
 id-SAEBearerItem									ProtocolIE-ID
 id-SAEBearerToBeModifiedItemBearerModReq			ProtocolIE-ID
@@ -198,7 +204,6 @@ id-SAEBearerReleaseItem								ProtocolIE-ID
 id-SAEBearerSetupItemBearerSURes					ProtocolIE-ID
 id-Security-Information								ProtocolIE-ID
 id-HandoverRestrictionList							ProtocolIE-ID
-id-s-TMSI 											ProtocolIE-ID
 id-pagingDRX 										ProtocolIE-ID
 id-pagingCause										ProtocolIE-ID
 id-TAIdList											ProtocolIE-ID
@@ -214,16 +219,29 @@ id-GERANtoLTEHOInformationRes						ProtocolIE-ID
 id-UTRANtoLTEHOInformationReq						ProtocolIE-ID
 id-UTRANtoLTEHOInformationRes						ProtocolIE-ID
 id-CriticalityDiagnostics 							ProtocolIE-ID
-id-ENB-ID											ProtocolIE-ID
 id-eNBname											ProtocolIE-ID
 id-MMEname											ProtocolIE-ID
-id-NRIs												ProtocolIE-ID
 id-ServedPLMNs										ProtocolIE-ID
 id-SupportedTAIs									ProtocolIE-ID
 id-TimeToWait										ProtocolIE-ID
 id-aggregateMaximumBitrate							ProtocolIE-ID
 id-TAId												ProtocolIE-ID
 id-ServingPLMN										ProtocolIE-ID
+id-SAEBearerReleaseListBearerRelComp				ProtocolIE-ID
+id-cdma2000PDU										ProtocolIE-ID
+id-cdma2000RATType									ProtocolIE-ID
+id-cdma2000SectorID									ProtocolIE-ID
+id-SecurityInfo										ProtocolIE-ID
+id-UERadioCapability								ProtocolIE-ID
+id-GUMMEI-ID										ProtocolIE-ID
+id-Bearers-SubjectToStatusTransferENB-List			ProtocolIE-ID
+id-Bearers-SubjectToStatusTransferENB-Item			ProtocolIE-ID
+id-SAEBearerInformationListItem						ProtocolIE-ID
+id-Direct-Forwarding-Path-Availability				ProtocolIE-ID
+id-UEIdentityIndexValue								ProtocolIE-ID
+id-Bearers-SubjectToStatusTransferMME-List			ProtocolIE-ID
+id-Bearers-SubjectToStatusTransferMME-Item			ProtocolIE-ID
+
 #.END
 
 #.REGISTER_NEW
@@ -263,7 +281,6 @@ SAEBearerToBeModifiedListBearerModReq	N s1ap.ies id-SAEBearerToBeModifiedListBea
 SAEBearerModifyListBearerModRes			N s1ap.ies id-SAEBearerModifyListBearerModRes
 SAEBearerList							N s1ap.ies id-SAEBearerFailedToModifyList
 SAEBearerList							N s1ap.ies id-SAEBearerToBeReleasedList
-SAEBearerReleaseListBearerRelComp		N s1ap.ies id-SAEBearerReleaseListBearerRelComp
 SAEBearerList							N s1ap.ies id-SAEBearerFailedToReleaseList
 SAEBearerItem							N s1ap.ies id-SAEBearerItem
 SAEBearerToBeModifiedItemBearerModReq	N s1ap.ies id-SAEBearerToBeModifiedItemBearerModReq
@@ -272,7 +289,6 @@ SAEBearerModifyItemBearerModRes			N s1ap.ies id-SAEBearerModifyItemBearerModRes
 SAEBearerSetupItemBearerSURes			N s1ap.ies id-SAEBearerSetupItemBearerSURes
 SecurityInformation						N s1ap.ies id-Security-Information
 HandoverRestrictionList					N s1ap.ies id-HandoverRestrictionList
-S-TMSI									N s1ap.ies id-s-TMSI
 PagingDRX								N s1ap.ies id-pagingDRX
 PagingCause								N s1ap.ies id-pagingCause
 TAIdList								N s1ap.ies id-TAIdList
@@ -288,16 +304,28 @@ GERANtoLTEHOInformationRes				N s1ap.ies id-GERANtoLTEHOInformationRes
 UTRANtoLTEHOInformationReq				N s1ap.ies id-UTRANtoLTEHOInformationReq
 UTRANtoLTEHOInformationRes				N s1ap.ies id-UTRANtoLTEHOInformationRes
 CriticalityDiagnostics					N s1ap.ies id-CriticalityDiagnostics
-ENB-ID									N s1ap.ies id-ENB-ID
 ENBname									N s1ap.ies id-eNBname
 MMEname									N s1ap.ies id-MMEname
-NRIs									N s1ap.ies id-NRIs
 ServedPLMNs								N s1ap.ies id-ServedPLMNs
 SupportedTAIs							N s1ap.ies id-SupportedTAIs
 TimeToWait								N s1ap.ies id-TimeToWait
 AggregateMaximumBitrate					N s1ap.ies id-aggregateMaximumBitrate
 TAId									N s1ap.ies id-TAId
 PLMNidentity							N s1ap.ies id-ServingPLMN
+SAEBearerReleaseListBearerRelComp		N s1ap.ies id-SAEBearerReleaseListBearerRelComp				
+Cdma2000PDU								N s1ap.ies id-cdma2000PDU										
+Cdma2000RATType							N s1ap.ies id-cdma2000RATType									
+Cdma2000SectorID						N s1ap.ies id-cdma2000SectorID									
+SecurityInfo							N s1ap.ies id-SecurityInfo										
+UERadioCapability						N s1ap.ies id-UERadioCapability								
+GUMMEI									N s1ap.ies id-GUMMEI-ID										
+Bearers-SubjectToStatusTransferENB-List	N s1ap.ies id-Bearers-SubjectToStatusTransferENB-List			
+Bearers-SubjectToStatusTransferENB-Item	N s1ap.ies id-Bearers-SubjectToStatusTransferENB-Item			
+#N s1ap.ies id-SAEBearerInformationListItem						
+Direct-Forwarding-Path-Availability		N s1ap.ies id-Direct-Forwarding-Path-Availability				
+UEIdentityIndexValue					N s1ap.ies id-UEIdentityIndexValue								
+Bearers-SubjectToStatusTransferMME-List	N s1ap.ies id-Bearers-SubjectToStatusTransferMME-List			
+Bearers-SubjectToStatusTransferMME-Item	N s1ap.ies id-Bearers-SubjectToStatusTransferMME-Item			
 
 #S1AP-PROTOCOL-IES-PAIR
 #RAB-SetupOrModifyItemFirst         N s1ap.ies.pair.first id-RAB-SetupOrModifyItem
@@ -360,4 +388,21 @@ ErrorIndication							N s1ap.proc.imsg id-ErrorIndication
 S1SetupRequest							N s1ap.proc.imsg id-S1Setup
 S1SetupResponse							N s1ap.proc.sout id-S1Setup
 S1SetupFailure							N s1ap.proc.uout id-S1Setup
+
+DownlinkS1cdma2000tunneling				N s1ap.proc.imsg id-DownlinkS1cdma2000tunneling
+
+UplinkS1cdma2000tunneling				N s1ap.proc.imsg id-UplinkS1cdma2000tunneling
+
+UEContextModificationRequest			N s1ap.proc.imsg id-UEContextModification 
+UEContextModificationResponse			N s1ap.proc.sout id-UEContextModification
+UEContextModificationFailure			N s1ap.proc.uout id-UEContextModification
+
+UECapabilityInfoIndication				N s1ap.proc.imsg id-UECapabilityInfoIndication
+
+UEContextReleaseCommand					N s1ap.proc.imsg id-UEContextRelease
+UEContextReleaseComplete				N s1ap.proc.sout id-UEContextRelease
+
+ENBStatusTransfer						N s1ap.proc.imsg id-eNBStatusTransfer
+
+MMEStatusTransfer						N s1ap.proc.imsg id-MMEStatusTransfer
 #.END
\ No newline at end of file