Update to 3GPP TS 36.413 V8.2.0 (2008-06)

svn path=/trunk/; revision=25447

8 files changed, 845 insertions, 255 deletions

diff --git a/asn1/s1ap/S1AP-CommonDataTypes.asn b/asn1/s1ap/S1AP-CommonDataTypes.asn
index fcc04543e1..923b7506a4 100644
--- a/asn1/s1ap/S1AP-CommonDataTypes.asn
+++ b/asn1/s1ap/S1AP-CommonDataTypes.asn
@@ -1,4 +1,5 @@
 -- $Id$
+-- 3GPP TS 36.413 V8.2.0 (2008-06)
 -- 9.3.5	Common Definitions
 -- **************************************************************
 --
diff --git a/asn1/s1ap/S1AP-Constants.asn b/asn1/s1ap/S1AP-Constants.asn
index 4cec21140c..45360c97ad 100644
--- a/asn1/s1ap/S1AP-Constants.asn
+++ b/asn1/s1ap/S1AP-Constants.asn
@@ -1,4 +1,5 @@
 -- $Id$
+-- 3GPP TS 36.413 V8.2.0 (2008-06)
 -- 9.3.6	Constant Definitions
 -- **************************************************************
 --
@@ -59,7 +60,14 @@ id-UECapabilityInfoIndication		ProcedureCode ::= 22
 id-UEContextRelease					ProcedureCode ::= 23
 id-eNBStatusTransfer				ProcedureCode ::= 24
 id-MMEStatusTransfer				ProcedureCode ::= 25
-
+id-DeactivateTrace					ProcedureCode ::= 26
+id-TraceStart						ProcedureCode ::= 27
+id-TraceFailureIndication			ProcedureCode ::= 28
+id-ENBConfigurationUpdate			ProcedureCode ::= 29
+id-MMEConfigurationUpdate			ProcedureCode ::= 30
+id-LocationReportingControl			ProcedureCode ::= 31
+id-LocationReportingFailureIndication	ProcedureCode ::= 32
+id-LocationReport					ProcedureCode ::= 33
 
 -- **************************************************************
 --
@@ -79,14 +87,16 @@ maxProtocolIEs						INTEGER ::= 65535
 maxNrOfSAEBs							INTEGER ::= 256
 maxNrOfInterfaces						INTEGER ::= 3   --FFS
 maxnoofTAI								INTEGER ::= 256 --FFS
+maxnoofTACs								INTEGER ::= 256 --FFS
 maxNrOfErrors							INTEGER ::= 256
 maxnoofBPLMNs							INTEGER ::= 6
 maxnoofPLMNsPerMME						INTEGER ::= 32 -- FFS
-maxnoofTAIs								INTEGER ::= 256  -- FFS 
 maxnoofEPLMNs							INTEGER ::= 15
 maxnoofEPLMNsPlusOne					INTEGER ::= 16
 maxnoofForbLACs							INTEGER ::= 256		-- FFS Value to be checked
-maxnoofForbTAIs							INTEGER ::= 256		-- FFS Value to be checked
+maxnoofForbTACs							INTEGER ::= 256		-- FFS Value to be checked
+maxNrOfIndividualS1ConnectionsToReset	INTEGER ::= 256
+
 
 
 
@@ -141,8 +151,8 @@ 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-TAIList										ProtocolIE-ID ::= 46
+id-TAIItem										ProtocolIE-ID ::= 47
 id-SAEBearerFailedToSetupListCtxtSURes			ProtocolIE-ID ::= 48
 id-SAEBearerReleaseItemHOCmd					ProtocolIE-ID ::= 49
 id-SAEBearerSetupItemCtxtSURes					ProtocolIE-ID ::= 50
@@ -158,11 +168,10 @@ 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-SupportedTAs									ProtocolIE-ID ::= 64
 id-TimeToWait									ProtocolIE-ID ::= 65
 id-aggregateMaximumBitrate						ProtocolIE-ID ::= 66
-id-TAId											ProtocolIE-ID ::= 67
-id-ServingPLMN									ProtocolIE-ID ::= 68
+id-TAI											ProtocolIE-ID ::= 67
 id-SAEBearerReleaseListBearerRelComp			ProtocolIE-ID ::= 69
 id-cdma2000PDU									ProtocolIE-ID ::= 70
 id-cdma2000RATType								ProtocolIE-ID ::= 71
@@ -170,13 +179,28 @@ 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
+id-cdma2000HOStatus								ProtocolIE-ID ::= 83
+id-cdma2000HORequiredIndication					ProtocolIE-ID ::= 84
+id-cdma2000OneXMEID								ProtocolIE-ID ::= 85
+id-TraceReference								ProtocolIE-ID ::= 86
+id-RelativeMMECapacity							ProtocolIE-ID ::= 87
+id-SourceMME-UE-S1AP-ID							ProtocolIE-ID ::= 88
+id-Bearers-SubjectToStatusTransfer-Item			ProtocolIE-ID ::= 89
+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-S-TMSI										ProtocolIE-ID ::= 96
+id-cdma2000OneXRAND								ProtocolIE-ID ::= 97
+id-RequestType									ProtocolIE-ID ::= 98
+id-UE-S1AP-IDs									ProtocolIE-ID ::= 99
+id-EUTRAN-CGI-ID								ProtocolIE-ID ::= 100
 
 END
 
+
diff --git a/asn1/s1ap/S1AP-Containers.asn b/asn1/s1ap/S1AP-Containers.asn
index c75c7ffc0e..b84a31ed5d 100644
--- a/asn1/s1ap/S1AP-Containers.asn
+++ b/asn1/s1ap/S1AP-Containers.asn
@@ -1,4 +1,5 @@
 -- $Id$
+-- 3GPP TS 36.413 V8.2.0 (2008-06)
 -- 9.3.7	Container Definitions
 -- **************************************************************
 --
@@ -198,3 +199,4 @@ PrivateIE-Field {S1AP-PRIVATE-IES : IEsSetParam} ::= SEQUENCE {
 }
 
 END
+
diff --git a/asn1/s1ap/S1AP-IEs.asn b/asn1/s1ap/S1AP-IEs.asn
index 7d7e2ad67e..6205383d87 100644
--- a/asn1/s1ap/S1AP-IEs.asn
+++ b/asn1/s1ap/S1AP-IEs.asn
@@ -1,4 +1,5 @@
 -- $Id$
+-- 3GPP TS 36.413 V8.2.0 (2008-06)
 -- 9.3.4	Information Element Definitions
 -- **************************************************************
 --
@@ -17,17 +18,19 @@ BEGIN
 IMPORTS
 	id-SAEBearerInformationListItem,
 	id-SAEBearerItem,
+	id-Bearers-SubjectToStatusTransfer-Item,
 	maxNrOfSAEBs,
 	maxNrOfInterfaces,
 	
 	maxNrOfErrors,
 	maxnoofBPLMNs,
 	maxnoofPLMNsPerMME,
-	maxnoofTAIs,
+	maxnoofTACs,
 	maxnoofEPLMNs,
 	maxnoofEPLMNsPlusOne,
 	maxnoofForbLACs,
-	maxnoofForbTAIs
+	maxnoofForbTACs,
+	maxnoofTACs
 
 FROM S1AP-Constants
 
@@ -69,6 +72,25 @@ Aggregate-MaximumBitrates-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 
 -- B
 
+Bearers-SubjectToStatusTransferList ::= SEQUENCE (SIZE(0.. maxNrOfSAEBs)) OF ProtocolIE-SingleContainer { { Bearers-SubjectToStatusTransfer-ItemIEs } }
+
+Bearers-SubjectToStatusTransfer-ItemIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-Bearers-SubjectToStatusTransfer-Item	CRITICALITY ignore	TYPE Bearers-SubjectToStatusTransfer-Item 	PRESENCE mandatory	},
+	...
+}
+
+Bearers-SubjectToStatusTransfer-Item ::= SEQUENCE {
+	sAE-Bearer-ID								SAE-Bearer-ID,
+	uL-COUNTvalue								COUNTvalue,
+	dL-COUNTvalue								COUNTvalue,
+	iE-Extensions							ProtocolExtensionContainer { {Bearers-SubjectToStatusTransfer-ItemExtIEs} } OPTIONAL,
+	...
+}
+
+Bearers-SubjectToStatusTransfer-ItemExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 BPLMNs ::= SEQUENCE (SIZE(1.. maxnoofBPLMNs)) OF PLMNidentity
 
 
@@ -89,7 +111,8 @@ CauseMisc ::= ENUMERATED {
 	hardware-failure,
 	om-intervention,
 	unspecified,
-	...
+	unknown-PLMN,
+...
 }
 
 CauseProtocol ::= ENUMERATED {
@@ -110,6 +133,17 @@ CauseRadioNetwork ::= ENUMERATED {
 	successful-handover,
 	release-due-to-eutran-generated-reason,
 	handover-cancelled,	
+	partial-handover,	
+	ho-failure-in-target-EPC-eNB-or-target-system,
+	ho-target-not-allowed,
+	tS1relocoverall-expiry,
+	tS1relocprep-expiry,
+	cell-not-available,
+	unknown-targetID,
+	no-radio-resources-available-in-target-cell,
+	unknown-mme-ue-s1ap-id,
+	unknown-enb-ue-s1ap-id,
+	unknown-pair-ue-s1ap-id,
 	...
 
 }
@@ -139,6 +173,21 @@ Cdma2000RATType ::= ENUMERATED {
 
 Cdma2000SectorID ::= OCTET STRING
 
+Cdma2000HOStatus ::= ENUMERATED {
+	hOSuccess,
+	hOFailure,
+	...
+}
+
+Cdma2000HORequiredIndication ::= ENUMERATED {
+	true,
+	...
+}
+
+Cdma2000OneXMEID ::= OCTET STRING
+
+Cdma2000OneXRAND ::= OCTET STRING
+
 CGI ::= SEQUENCE {
 	pLMNidentity				PLMNidentity,
 	lAC				LAC,
@@ -148,6 +197,12 @@ CGI ::= SEQUENCE {
 
 CI					::= OCTET STRING (SIZE (2))
 
+COUNTvalue ::= SEQUENCE {
+	pDCP-SN			PDCP-SN,
+	hFN				HFN,
+	...
+}
+
 CriticalityDiagnostics ::= SEQUENCE {
 	procedureCode					ProcedureCode					OPTIONAL,
 	triggeringMessage				TriggeringMessage				OPTIONAL,
@@ -190,13 +245,30 @@ Direct-Forwarding-Path-Availability ::= ENUMERATED {
 
 -- E
 
-ENB-UE-S1AP-ID				::= TBCD-STRING 
+ENB-StatusTransfer-TransparentContainer		::= SEQUENCE {
+	bearers-SubjectToStatusTransferList		Bearers-SubjectToStatusTransferList		OPTIONAL,
+	iE-Extensions			ProtocolExtensionContainer { {ENB-StatusTransfer-TransparentContainer-ExtIEs} } OPTIONAL,
+	...
+}
+
+ENB-StatusTransfer-TransparentContainer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+ENB-UE-S1AP-ID				::= INTEGER (0..16777215)
 ENB-Global-ID							::= INTEGER (0..65535)
 
 ENBname ::= OCTET STRING
 
 EPLMNs ::= SEQUENCE (SIZE(1..maxnoofEPLMNs)) OF PLMNidentity
+EventType	::= ENUMERATED {
+	direct,
+	change-of-serve-cell,
+	stop-change-of-serve-cell,
+	...
+}
 
+EUTRAN-CGI-ID ::= OCTET STRING
 ExtendedRNC-ID					::= INTEGER (4096..65535)
 
 -- F
@@ -212,10 +284,10 @@ ForbiddenTAs ::= SEQUENCE (SIZE(1.. maxnoofEPLMNsPlusOne)) OF ForbiddenTAs-Item
 
 ForbiddenTAs-Item ::= SEQUENCE {
 	pLMN-Identity		PLMNidentity,
-	forbiddenTAIs		ForbiddenTAIs
+	forbiddenTACs		ForbiddenTACs
 }
 
-ForbiddenTAIs ::= SEQUENCE (SIZE(1..maxnoofForbTAIs)) OF TAI
+ForbiddenTACs ::= SEQUENCE (SIZE(1..maxnoofForbTACs)) OF TAC
 
 ForbiddenLAs ::= SEQUENCE (SIZE(1..maxnoofEPLMNsPlusOne)) OF ForbiddenLAs-Item
 
@@ -233,7 +305,7 @@ GTP-TEID					::= OCTET STRING (SIZE (4))
 GUMMEI			::= SEQUENCE {
 	pLMN-Identity		PLMNidentity,
 	mME-Group-ID		MME-Group-ID,
-	mMME-Code			MME-Code,
+	mME-Code			MME-Code,
 	iE-Extensions					ProtocolExtensionContainer { {GUMMEI-ExtIEs} } OPTIONAL,
 	...
 }
@@ -245,6 +317,7 @@ GUMMEI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 -- H
 
 HandoverRestrictionList ::= SEQUENCE {
+	servingPLMN					PLMNidentity,
 	equivalentPLMNs				EPLMNs					OPTIONAL,
 	forbiddenTAs				ForbiddenTAs			OPTIONAL,
 	forbiddenLAs				ForbiddenLAs			OPTIONAL,
@@ -266,6 +339,8 @@ HandoverType ::= ENUMERATED {
 	...
 }
 
+HFN ::= INTEGER (0..1048575)
+
 -- I
 
 IMSI	::=	OCTET STRING (SIZE (3..8))
@@ -294,7 +369,6 @@ InterfaceType ::= ENUMERATED {
 -- K
 -- L
 
-Label						::= INTEGER (1..256)
 
 LAC	::= OCTET STRING (SIZE (2))
 
@@ -316,7 +390,7 @@ MME-Group-ID	::= OCTET STRING (SIZE (2))
 
 MME-Code		::= OCTET STRING (SIZE (1))
 
-MME-UE-S1AP-ID				::= TBCD-STRING 
+MME-UE-S1AP-ID				::= INTEGER (0..4294967295)
 M-TMSI			::= OCTET STRING (SIZE (4))
 
 
@@ -339,7 +413,7 @@ PagingCause ::= ENUMERATED {
 	..., 
 	terminating-high-priority-signalling
 }
-PDCP-SN ::= INTEGER  -- FFS
+PDCP-SN ::= INTEGER (0..4095) 
 
 PLMNidentity 				::= TBCD-STRING 
 
@@ -347,11 +421,31 @@ PriorityLevel				::= INTEGER (0..15)
 
 
 -- Q
+
+QCI						::= INTEGER (1..256)
+
 -- R
 
+RelativeMMECapacity				::= INTEGER (0..255)
+
 RAC					::= OCTET STRING (SIZE (1))
 
 
+RequestType	::= SEQUENCE {
+	eventType 				EventType,
+	reportArea 				ReportArea,
+	iE-Extensions			ProtocolExtensionContainer { { RequestType-ExtIEs} }	OPTIONAL,
+	...
+}
+
+
+RequestType-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+ReportArea	::= OCTET STRING
+
+
 RNC-ID					::= INTEGER (0..4095)
 
 RRC-Container	::= OCTET STRING
@@ -396,11 +490,12 @@ SAEBearerItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+
 SAE-Bearer-BitRate	::= INTEGER (0..10000000) 
 
 
 SAE-BearerLevelQoSParameters ::= SEQUENCE {
-	label			Label,
+	qCI			QCI,
 	allocationRetentionPriority			AllocationRetentionPriority OPTIONAL,
 	sAE-BearerType						SAE-Bearer-Type,	
 	iE-Extensions						ProtocolExtensionContainer { {SAE-Bearer-QoSParameters-ExtIEs} } OPTIONAL,
@@ -503,10 +598,10 @@ SourceRNC-ToTargetRNC-TransparentContainer		::= OCTET STRING
 
 ServedPLMNs ::= SEQUENCE (SIZE(1.. maxnoofPLMNsPerMME)) OF PLMNidentity
 
-SupportedTAIs ::= SEQUENCE (SIZE(1.. maxnoofTAIs)) OF SupportedTAs-Item
+SupportedTAs ::= SEQUENCE (SIZE(1.. maxnoofTACs)) OF SupportedTAs-Item
 
 SupportedTAs-Item ::=	SEQUENCE  {
-	tAI					TAId,
+	tAC					TAC,
 	broadcastPLMNs		BPLMNs,
 	...
 }
@@ -520,9 +615,17 @@ S-TMSI ::= SEQUENCE {
 
 -- T
 
-TAI ::= OCTET STRING
+TAC ::= OCTET STRING
+
+TAI ::= SEQUENCE {
+	pLMNidentity			PLMNidentity,
+	tAC						TAC,
+	iE-Extensions			ProtocolExtensionContainer { {TAI-ExtIEs} } OPTIONAL
+}
 
-TAId ::= OCTET STRING
+TAI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
 TBCD-STRING ::= OCTET STRING (SIZE (3))
 
@@ -545,7 +648,16 @@ TargetRNC-ID ::= SEQUENCE {
 	}
 
 
-TargeteNodeB-ToSourceeNodeB-TransparentContainer		::= OCTET STRING
+TargeteNodeB-ToSourceeNodeB-TransparentContainer		::= SEQUENCE {
+	rRC-Container					RRC-Container,
+	iE-Extensions			ProtocolExtensionContainer { {TargeteNodeB-ToSourceeNodeB-TransparentContainer-ExtIEs} } OPTIONAL,
+	...
+}
+
+TargeteNodeB-ToSourceeNodeB-TransparentContainer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 TargetRNC-ToSourceRNC-TransparentContainer		::= OCTET STRING
 TargetBSS-ToSourceBSS-TransparentContainer		::= OCTET STRING
 
@@ -573,7 +685,7 @@ TraceDepth ::= ENUMERATED {
 	...
 }
 
-TraceReference ::=  OCTET STRING (SIZE (3))
+TraceReference ::=  OCTET STRING (SIZE (8))
 
 TypeOfError ::= ENUMERATED {
 	not-understood,
@@ -583,6 +695,31 @@ TypeOfError ::= ENUMERATED {
 
 -- U
 
+
+UE-S1AP-IDs ::= CHOICE{
+	uE-S1AP-ID-pair		UE-S1AP-ID-pair,
+	mME-UE-S1AP-ID		MME-UE-S1AP-ID,
+	eNB-UE-S1AP-ID		ENB-UE-S1AP-ID,
+	...
+}
+
+UE-S1AP-ID-pair ::= SEQUENCE{
+	mME-UE-S1AP-ID		MME-UE-S1AP-ID,
+	eNB-UE-S1AP-ID		ENB-UE-S1AP-ID
+}
+
+UE-associatedLogicalS1-ConnectionItem ::= SEQUENCE {
+	mME-UE-S1AP-ID					MME-UE-S1AP-ID OPTIONAL,
+	eNB-UE-S1AP-ID					ENB-UE-S1AP-ID OPTIONAL,
+	iE-Extensions					ProtocolExtensionContainer { { UE-associatedLogicalS1-ConnectionItemExtIEs} } OPTIONAL,
+	...
+}
+
+
+UE-associatedLogicalS1-ConnectionItemExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 UEIdentityIndexValue	::=	OCTET STRING
 
 UEPagingID ::= CHOICE {
diff --git a/asn1/s1ap/S1AP-PDU-Contents.asn b/asn1/s1ap/S1AP-PDU-Contents.asn
index 312eee132e..74a6861a97 100644
--- a/asn1/s1ap/S1AP-PDU-Contents.asn
+++ b/asn1/s1ap/S1AP-PDU-Contents.asn
@@ -1,4 +1,5 @@
 -- $Id$
+-- 3GPP TS 36.413 V8.2.0 (2008-06)
 -- 9.3.3	PDU Definitions
 -- **************************************************************
 --
@@ -20,53 +21,58 @@ BEGIN
 -- **************************************************************
 
 IMPORTS
+	
 	AggregateMaximumBitrate,
-	MME-UE-S1AP-ID,
-	ENB-UE-S1AP-ID,
-	HandoverType,
 	Cause,
-	SourceID,
-	TargetID,
-	SourceeNodeB-ToTargeteNodeB-TransparentContainer,
-	SourceRNC-ToTargetRNC-TransparentContainer,
-	SourceBSS-ToTargetBSS-TransparentContainer,
-	TargeteNodeB-ToSourceeNodeB-TransparentContainer,
-	TargetRNC-ToSourceRNC-TransparentContainer,
-	TargetBSS-ToSourceBSS-TransparentContainer,	
-	SAE-Bearer-ID,
-	TransportLayerAddress,
+	Cdma2000HORequiredIndication,
+	Cdma2000HOStatus,
+	Cdma2000OneXMEID,
+	Cdma2000OneXRAND,
+	Cdma2000PDU,
+	Cdma2000RATType,
+	Cdma2000SectorID,
+	CriticalityDiagnostics,
+	Direct-Forwarding-Path-Availability,
+	ENB-Global-ID,
+	EUTRAN-CGI-ID,	ENBname,
+	ENB-StatusTransfer-TransparentContainer,
+	ENB-UE-S1AP-ID,
 	GTP-TEID,
 	GUMMEI,
+	HandoverRestrictionList,
+	HandoverType,
+	MMEname,
+	MME-UE-S1AP-ID,
+	NAS-PDU,	PagingCause,
+	PagingDRX,
+	PLMNidentity,
+	RelativeMMECapacity,	RequestType,
+	SAE-Bearer-ID,
 	SAE-BearerLevelQoSParameters,
 	SAEBearerList,
-	Cause,
-	TraceActivation,
-	NAS-PDU,
-	
+	SecurityInfo,
 	SecurityInformation,
-	UEPagingID,
-	PagingDRX,
-	PagingCause,
-	TAId,
-	CriticalityDiagnostics,
-	ENB-Global-ID,
-	ENBname,
-	MMEname,
 	ServedPLMNs,
-	SupportedTAIs,
+	SourceBSS-ToTargetBSS-TransparentContainer,
+	SourceeNodeB-ToTargeteNodeB-TransparentContainer,
+	SourceID,
+	SourceRNC-ToTargetRNC-TransparentContainer,
+	SupportedTAs,
+	TAI,
+	TargetBSS-ToSourceBSS-TransparentContainer,	
+	TargeteNodeB-ToSourceeNodeB-TransparentContainer,
+	TargetID,
+	TargetRNC-ToSourceRNC-TransparentContainer,
 	TimeToWait,
-	HandoverRestrictionList,
-	PLMNidentity,
-	Cdma2000PDU,
-	Cdma2000RATType,
-	Cdma2000SectorID,
-	SecurityInfo,
+	TraceActivation,
+	TraceReference,
+	TransportLayerAddress,
+	UEIdentityIndexValue,
+	UEPagingID,
 	UERadioCapability,
-	PDCP-SN,
-	Direct-Forwarding-Path-Availability,
-	UEIdentityIndexValue
-
-
+	UE-S1AP-IDs,
+	UE-associatedLogicalS1-ConnectionItem,
+	S-TMSI
 
 FROM S1AP-IEs
 
@@ -85,18 +91,24 @@ FROM S1AP-Containers
 
 
 	id-aggregateMaximumBitrate,
-	id-Bearers-SubjectToStatusTransferENB-List,
-	id-Bearers-SubjectToStatusTransferENB-Item,
-	id-Bearers-SubjectToStatusTransferMME-List,
-	id-Bearers-SubjectToStatusTransferMME-Item,
+	
 	id-Cause,
+	id-cdma2000HORequiredIndication,
+	id-cdma2000HOStatus,
+	id-cdma2000OneXMEID,
+	id-cdma2000OneXRAND,
+	id-cdma2000PDU,
+	id-cdma2000RATType,
+	id-cdma2000SectorID,
 	id-CriticalityDiagnostics,
 	id-Direct-Forwarding-Path-Availability,
 	id-ENB-Global-ID,
+	id-EUTRAN-CGI-ID,
 	id-eNBname,
-	id-eNB-UE-S1AP-ID, 
+	id-eNB-StatusTransfer-TransparentContainer,	id-eNB-UE-S1AP-ID, 
 	id-GERANtoLTEHOInformationReq,
 	id-GERANtoLTEHOInformationRes,
+	id-GUMMEI-ID,
 	id-HandoverRestrictionList,
 	id-HandoverType,
 	id-InitialContextSetup,
@@ -111,7 +123,8 @@ FROM S1AP-Containers
 	id-NAS-PDU,
 	id-pagingCause,
 	id-pagingDRX,
-	id-ServingPLMN,
+	id-RelativeMMECapacity,
+	id-RequestType,
 	id-SAEBearerAdmittedItem,
 	id-SAEBearerAdmittedList,
 	id-SAEBearerDataForwardingItem,
@@ -146,30 +159,36 @@ FROM S1AP-Containers
 	id-SAEBearerToBeSetupListHOReq,
 	id-SAEBearerToBeSwitchedDLItem,
 	id-SAEBearerToBeSwitchedDLList,
+	id-SAEBearerToBeSwitchedULList,
+	id-SAEBearerToBeSwitchedULItem,
 	id-SAEBearertoReleaseListHOCmd,
+	id-SecurityInfo,
 	id-Security-Information,
 	id-ServedPLMNs,
 	id-SourceID,
-	id-UEPagingID,
-	id-SupportedTAIs,
-	id-TAId,
-	id-TAIdItem,
-	id-TAIdList,
+	id-SourceMME-UE-S1AP-ID,
+	id-SupportedTAs,
+	id-S-TMSI,
+	id-TAI,
+	id-TAIItem,
+	id-TAIList,
 	id-TargetID,
 	id-TimeToWait,
 	id-TraceActivation,
+	id-TraceReference,
+	id-UEIdentityIndexValue,
+	id-UEPagingID,
+	id-UERadioCapability,
 	id-UTRANtoLTEHOInformationReq,
 	id-UTRANtoLTEHOInformationRes,
-	id-cdma2000PDU,
-	id-cdma2000RATType,
-	id-cdma2000SectorID,
-	id-SecurityInfo,
-	id-UERadioCapability,
-	id-UEIdentityIndexValue,
-	id-GUMMEI-ID,
+	id-UE-associatedLogicalS1-ConnectionListResAck,
+	id-UE-associatedLogicalS1-ConnectionItem,
+	id-UE-S1AP-IDs,
+	id-ResetType,
 	maxnoofTAI,
 	maxNrOfErrors,
-	maxNrOfSAEBs
+	maxNrOfSAEBs,
+	maxNrOfIndividualS1ConnectionsToReset
 
 
 FROM S1AP-Constants;
@@ -269,7 +288,8 @@ HandoverCommandIEs S1AP-PROTOCOL-IES ::= {
 	-- This IE shall be present if the Handover Type IE is set to value "LTEtoUTRAN" --		} |
 	{ ID id-LTEtoGERANHOInformationRes	
 							CRITICALITY reject	TYPE LTEtoGERANHOInformationRes PRESENCE conditional
-	-- This IE shall be present if the Handover Type IE is set to value "LTEtoGERAN" --												},
+	-- This IE shall be present if the Handover Type IE is set to value "LTEtoGERAN" --												}|
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
 
@@ -352,7 +372,8 @@ HandoverPreparationFailure ::= SEQUENCE {
 
 HandoverPreparationFailureIEs S1AP-PROTOCOL-IES ::= {	
 	{ ID id-eNB-UE-S1AP-ID					CRITICALITY reject	TYPE ENB-UE-S1AP-ID		 			PRESENCE mandatory	} |
-	{ ID id-Cause					CRITICALITY ignore	TYPE Cause		 			PRESENCE mandatory	},
+	{ ID id-Cause					CRITICALITY ignore	TYPE Cause		 			PRESENCE mandatory	}|
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
 
@@ -375,9 +396,9 @@ HandoverRequest ::= SEQUENCE {
 
 HandoverRequestIEs S1AP-PROTOCOL-IES ::= {	
 	{ ID id-MME-UE-S1AP-ID					CRITICALITY reject	TYPE MME-UE-S1AP-ID		 			PRESENCE mandatory	} |
-	{ ID id-eNB-UE-S1AP-ID					CRITICALITY reject	TYPE ENB-UE-S1AP-ID		 			PRESENCE mandatory	} |
 	{ ID id-HandoverType					CRITICALITY reject	TYPE HandoverType		 			PRESENCE mandatory	} |
 	{ ID id-Cause					CRITICALITY ignore	TYPE Cause		 			PRESENCE mandatory	} |
+	{ ID id-aggregateMaximumBitrate		CRITICALITY reject	TYPE AggregateMaximumBitrate		PRESENCE mandatory	}|
 	{ ID id-SAEBearerToBeSetupListHOReq					CRITICALITY reject	TYPE SAEBearerToBeSetupListHOReq		 			PRESENCE mandatory	} |
 	{ ID id-Intra-LTEHOInformationReq			CRITICALITY reject	TYPE Intra-LTEHOInformationReq		PRESENCE conditional
 	-- This IE shall be present if Handover Type IE is set to value "IntraLTE" --		} |
@@ -386,8 +407,8 @@ HandoverRequestIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-GERANtoLTEHOInformationReq	
 							CRITICALITY reject	TYPE GERANtoLTEHOInformationReq PRESENCE conditional
 	-- This IE shall be present if the Handover Type IE is set to value "GERANtoLTE" --												} |
-	{ ID id-ServingPLMN		CRITICALITY reject	TYPE PLMNidentity	PRESENCE optional } |
-	{ ID id-HandoverRestrictionList		CRITICALITY ignore	TYPE HandoverRestrictionList	PRESENCE optional	},
+	{ ID id-HandoverRestrictionList		CRITICALITY ignore	TYPE HandoverRestrictionList	PRESENCE optional	}|
+	{ ID id-TraceActivation				CRITICALITY ignore	TYPE TraceActivation	 		PRESENCE optional	},
 	...
 }
 
@@ -454,7 +475,8 @@ HandoverRequestAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
 	-- This IE shall be present if the Handover Type IE is set to value "UTRANtoLTE" --		} |
 	{ ID id-GERANtoLTEHOInformationRes	
 							CRITICALITY reject	TYPE GERANtoLTEHOInformationRes PRESENCE conditional
-	-- This IE shall be present if the Handover Type IE is set to value "GERANtoLTE" --												},
+	-- This IE shall be present if the Handover Type IE is set to value "GERANtoLTE" --												}|
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
 
@@ -531,7 +553,8 @@ HandoverFailure ::= SEQUENCE {
 
 HandoverFailureIEs 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-Cause					CRITICALITY ignore	TYPE Cause		 			PRESENCE mandatory	}|
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
 
@@ -577,9 +600,9 @@ PathSwitchRequest ::= SEQUENCE {
 }
 
 PathSwitchRequestIEs S1AP-PROTOCOL-IES ::= {	
-	{ ID id-MME-UE-S1AP-ID					CRITICALITY reject	TYPE MME-UE-S1AP-ID		 			PRESENCE mandatory	} |
-	{ ID id-HandoverType					CRITICALITY reject	TYPE HandoverType		 			PRESENCE mandatory	} |
-	{ ID id-SAEBearerToBeSwitchedDLList					CRITICALITY reject	TYPE SAEBearerToBeSwitchedDLList		 			PRESENCE mandatory	},
+	{ ID id-eNB-UE-S1AP-ID					CRITICALITY reject	TYPE ENB-UE-S1AP-ID	 			PRESENCE mandatory	}|
+	{ ID id-SAEBearerToBeSwitchedDLList					CRITICALITY reject	TYPE SAEBearerToBeSwitchedDLList		 			PRESENCE mandatory	}|
+	{ ID id-SourceMME-UE-S1AP-ID					CRITICALITY reject	TYPE MME-UE-S1AP-ID	 			PRESENCE mandatory	},
 	...
 }
 
@@ -615,10 +638,31 @@ 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-eNB-UE-S1AP-ID					CRITICALITY reject	TYPE ENB-UE-S1AP-ID	 			PRESENCE mandatory	}|	{ ID id-SAEBearerToBeSwitchedULList		CRITICALITY ignore	TYPE SAEBearerToBeSwitchedULList	PRESENCE optional }|
+	{ ID id-HandoverRestrictionList			CRITICALITY ignore	TYPE HandoverRestrictionList	PRESENCE optional	} |	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
 
+SAEBearerToBeSwitchedULList ::= SAEB-IE-ContainerList { {SAEBearerToBeSwitchedULItemIEs} }
+
+SAEBearerToBeSwitchedULItemIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-SAEBearerToBeSwitchedULItem		CRITICALITY ignore	TYPE SAEBearerToBeSwitchedULItem	PRESENCE mandatory	},
+	...
+}
+
+SAEBearerToBeSwitchedULItem ::= SEQUENCE {
+	sAE-Bearer-ID						SAE-Bearer-ID,
+	transportLayerAddress				TransportLayerAddress,
+	gTP-TEID							GTP-TEID,
+	iE-Extensions						ProtocolExtensionContainer { { SAEBearerToBeSwitchedULItem-ExtIEs} }			OPTIONAL,
+	...
+}
+
+SAEBearerToBeSwitchedULItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+
 -- **************************************************************
 --
 -- Path Switch Request Failure
@@ -633,7 +677,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-Cause					CRITICALITY reject	TYPE Cause		 			PRESENCE mandatory	},
+	{ ID id-Cause					CRITICALITY reject	TYPE Cause		 			PRESENCE mandatory	}|
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
 
@@ -674,7 +719,8 @@ 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-eNB-UE-S1AP-ID					CRITICALITY reject	TYPE ENB-UE-S1AP-ID		 			PRESENCE mandatory	}|
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
 
@@ -699,8 +745,7 @@ SAEBearerSetupRequestIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-MME-UE-S1AP-ID				CRITICALITY reject	TYPE MME-UE-S1AP-ID	 				PRESENCE mandatory	}|
 	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID	 				PRESENCE mandatory	}|
 	{ ID id-SAEBearerToBeSetupListBearerSUReq			CRITICALITY reject	TYPE SAEBearerToBeSetupListBearerSUReq	 	PRESENCE mandatory	}|
-	{ ID id-TraceActivation				CRITICALITY ignore	TYPE TraceActivation	 		PRESENCE optional	}|
-	{ ID id-NAS-PDU				CRITICALITY ignore	TYPE NAS-PDU	 		PRESENCE mandatory},
+		{ ID id-NAS-PDU				CRITICALITY ignore	TYPE NAS-PDU	 		PRESENCE mandatory},
 	...
 }
 
@@ -742,7 +787,8 @@ SAEBearerSetupResponseIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID	 				PRESENCE mandatory	}|
 	{ ID id-SAEBearerSetupListBearerSURes				CRITICALITY reject	TYPE SAEBearerSetupListBearerSURes			PRESENCE optional	}|
 	{ ID id-SAEBearerFailedToSetupListBearerSURes		CRITICALITY ignore	TYPE SAEBearerList					PRESENCE optional	}|
-	{ ID id-NAS-PDU				CRITICALITY ignore	TYPE NAS-PDU	 		PRESENCE mandatory},
+	{ ID id-NAS-PDU				CRITICALITY ignore	TYPE NAS-PDU	 		PRESENCE mandatory}|
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
 
@@ -831,7 +877,8 @@ SAEBearerModifyResponseIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID	 				PRESENCE mandatory	}|
 	{ ID id-SAEBearerModifyListBearerModRes				CRITICALITY ignore	TYPE SAEBearerModifyListBearerModRes		PRESENCE optional	}|
 	{ ID id-SAEBearerFailedToModifyList		CRITICALITY ignore	TYPE SAEBearerList				PRESENCE optional	}|
-	{ ID id-NAS-PDU				CRITICALITY ignore	TYPE NAS-PDU	 		PRESENCE mandatory},
+	{ ID id-NAS-PDU				CRITICALITY ignore	TYPE NAS-PDU	 		PRESENCE mandatory}|
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
 
@@ -884,20 +931,21 @@ SAEBearerReleaseCommandIEs S1AP-PROTOCOL-IES ::= {
 
 -- **************************************************************
 --
--- SAE Bearer Release Complete
+-- SAE Bearer Release Response
 --
 -- **************************************************************
 
-SAEBearerReleaseComplete ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { { SAEBearerReleaseCompleteIEs } },
+SAEBearerReleaseResponse ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { { SAEBearerReleaseResponseIEs } },
 	...
 }
 
-SAEBearerReleaseCompleteIEs S1AP-PROTOCOL-IES ::= {
+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	},
+	{ ID id-SAEBearerFailedToReleaseList		CRITICALITY ignore	TYPE SAEBearerList				PRESENCE optional	}|
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
 
@@ -965,11 +1013,10 @@ InitialContextSetupRequest ::= SEQUENCE {
 InitialContextSetupRequestIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-MME-UE-S1AP-ID				CRITICALITY reject	TYPE MME-UE-S1AP-ID	 				PRESENCE mandatory	}|
 	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID	 				PRESENCE mandatory	}|
-	{ ID id-aggregateMaximumBitrate		CRITICALITY reject	TYPE AggregateMaximumBitrate		PRESENCE optional	}|
+	{ ID id-aggregateMaximumBitrate		CRITICALITY reject	TYPE AggregateMaximumBitrate		PRESENCE mandatory	}|
 	{ ID id-SAEBearerToBeSetupListCtxtSUReq			CRITICALITY reject	TYPE SAEBearerToBeSetupListCtxtSUReq	 	PRESENCE mandatory	}|
 	{ ID id-Security-Information		CRITICALITY ignore	TYPE SecurityInformation		PRESENCE mandatory	}|
 	{ ID id-TraceActivation				CRITICALITY ignore	TYPE TraceActivation	 		PRESENCE optional	}|
-	{ ID id-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-UERadioCapability			CRITICALITY ignore	TYPE UERadioCapability				PRESENCE optional	},
@@ -1033,7 +1080,8 @@ InitialContextSetupResponseIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-MME-UE-S1AP-ID				CRITICALITY reject	TYPE MME-UE-S1AP-ID	 				PRESENCE mandatory	}|
 	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID	 				PRESENCE mandatory	}|
 	{ ID id-SAEBearerSetupListCtxtSURes				CRITICALITY reject	TYPE SAEBearerSetupListCtxtSURes			PRESENCE optional	}|
-	{ ID id-SAEBearerFailedToSetupListCtxtSURes		CRITICALITY ignore	TYPE SAEBearerList					PRESENCE optional	},
+	{ ID id-SAEBearerFailedToSetupListCtxtSURes		CRITICALITY ignore	TYPE SAEBearerList					PRESENCE optional	}|
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
 
@@ -1073,7 +1121,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-Cause						CRITICALITY ignore	TYPE Cause						PRESENCE mandatory	},
+	{ ID id-Cause						CRITICALITY ignore	TYPE Cause						PRESENCE mandatory	}|
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
 
@@ -1093,25 +1142,25 @@ PagingIEs S1AP-PROTOCOL-IES ::= {
 	{ 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	},
+	{ ID id-TAIList					CRITICALITY ignore	TYPE TAIList		 	PRESENCE mandatory	},
 	...
 }
 
-TAIdList::= SEQUENCE (SIZE(1.. maxnoofTAI)) OF ProtocolIE-SingleContainer {{TAIdItemIEs}}
+TAIList::= SEQUENCE (SIZE(1.. maxnoofTAI)) OF ProtocolIE-SingleContainer {{TAIItemIEs}}
 
-TAIdItemIEs 	S1AP-PROTOCOL-IES ::= {
-	{ ID id-TAIdItem	 CRITICALITY ignore		TYPE TAIdItem	PRESENCE mandatory },
+TAIItemIEs 	S1AP-PROTOCOL-IES ::= {
+	{ ID id-TAIItem	 CRITICALITY ignore		TYPE TAIItem	PRESENCE mandatory },
 	...
 }
 
-TAIdItem ::= SEQUENCE {
-	tAId 							TAId, -- FFS
-	iE-Extensions					ProtocolExtensionContainer { {TAIdItemExtIEs} } OPTIONAL,
+TAIItem ::= SEQUENCE {
+	tAI 							TAI,
+	iE-Extensions					ProtocolExtensionContainer { {TAIItemExtIEs} } OPTIONAL,
 	...
 }
 
 
-TAIdItemExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+TAIItemExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
@@ -1134,8 +1183,8 @@ UEContextReleaseCommand ::= SEQUENCE {
 }
 
 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-UE-S1AP-IDs				CRITICALITY reject	TYPE UE-S1AP-IDs					PRESENCE mandatory} |
+	
 	{ ID id-Cause					CRITICALITY ignore	TYPE Cause						PRESENCE mandatory} ,
 	...
 }
@@ -1153,7 +1202,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-eNB-UE-S1AP-ID			CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory} |
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
 
@@ -1193,7 +1243,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-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory	}|
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }-- **************************************************************
 --
@@ -1209,7 +1260,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-Cause				CRITICALITY ignore	TYPE Cause				PRESENCE mandatory	},
+	{ ID id-Cause				CRITICALITY ignore	TYPE Cause				PRESENCE mandatory	}|
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
 
@@ -1228,7 +1280,6 @@ DownlinkNASTransport-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-ServingPLMN					CRITICALITY reject	TYPE PLMNidentity	PRESENCE optional } |
 	{ ID id-HandoverRestrictionList		CRITICALITY ignore	TYPE HandoverRestrictionList	PRESENCE optional	},
 	...
 }
@@ -1248,7 +1299,8 @@ InitialUEMessage ::= SEQUENCE {
 InitialUEMessage-IEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-eNB-UE-S1AP-ID			CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory} |
 	{ ID id-NAS-PDU					CRITICALITY reject	TYPE NAS-PDU				PRESENCE mandatory} |
-	{ ID id-TAId					CRITICALITY reject	TYPE TAId						PRESENCE mandatory},
+	{ ID id-TAI					CRITICALITY reject	TYPE TAI						PRESENCE mandatory}|
+	{ ID id-S-TMSI					CRITICALITY reject	TYPE S-TMSI				PRESENCE optional},
 	...
 }
 
@@ -1307,10 +1359,30 @@ Reset ::= SEQUENCE {
 }
 
 ResetIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-Cause						CRITICALITY ignore	TYPE Cause						PRESENCE mandatory	},
+	{ ID id-Cause						CRITICALITY ignore	TYPE Cause						PRESENCE mandatory	}|
+	{ ID id-ResetType				CRITICALITY reject	TYPE ResetType			PRESENCE mandatory	},
 	...
 }
 
+ResetType ::= CHOICE {
+	s1-Interface		ResetAll,
+	partOfS1-Interface		UE-associatedLogicalS1-ConnectionListRes,
+	...
+}
+
+
+
+ResetAll ::= ENUMERATED {
+	reset-all,
+	...
+}
+
+UE-associatedLogicalS1-ConnectionListRes ::= SEQUENCE (SIZE(1.. maxNrOfIndividualS1ConnectionsToReset)) OF ProtocolIE-SingleContainer { { UE-associatedLogicalS1-ConnectionItemRes } }
+
+UE-associatedLogicalS1-ConnectionItemRes 	S1AP-PROTOCOL-IES ::= {
+	{ ID id-UE-associatedLogicalS1-ConnectionItem	 CRITICALITY reject 	TYPE UE-associatedLogicalS1-ConnectionItem 	PRESENCE mandatory },
+	...
+}
 
 
 -- **************************************************************
@@ -1325,10 +1397,18 @@ ResetAcknowledge ::= SEQUENCE {
 }
 
 ResetAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-UE-associatedLogicalS1-ConnectionListResAck		CRITICALITY ignore	TYPE UE-associatedLogicalS1-ConnectionListResAck			PRESENCE optional	}|
 	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
 
+UE-associatedLogicalS1-ConnectionListResAck ::= SEQUENCE (SIZE(1.. maxNrOfIndividualS1ConnectionsToReset)) OF ProtocolIE-SingleContainer { { UE-associatedLogicalS1-ConnectionItemResAck } }
+
+UE-associatedLogicalS1-ConnectionItemResAck 	S1AP-PROTOCOL-IES ::= {
+	{ ID id-UE-associatedLogicalS1-ConnectionItem	 CRITICALITY ignore 	TYPE UE-associatedLogicalS1-ConnectionItem  	PRESENCE mandatory },
+	...
+}
+
 -- **************************************************************
 --
 -- ERROR INDICATION ELEMENTARY PROCEDURE
@@ -1374,7 +1454,7 @@ S1SetupRequest ::= SEQUENCE {
 S1SetupRequestIEs S1AP-PROTOCOL-IES ::= {
 	{ 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	},
+	{ ID id-SupportedTAs		CRITICALITY reject	TYPE SupportedTAs	 	PRESENCE mandatory	},
 	...
 }
 
@@ -1393,7 +1473,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-GUMMEI-ID				CRITICALITY reject	TYPE GUMMEI				PRESENCE mandatory	},
+	{ ID id-GUMMEI-ID				CRITICALITY reject	TYPE GUMMEI				PRESENCE mandatory	}|
+	{ ID id-RelativeMMECapacity					CRITICALITY reject	TYPE RelativeMMECapacity		 			PRESENCE mandatory	}|
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
 
@@ -1410,7 +1492,127 @@ S1SetupFailure ::= SEQUENCE {
 
 S1SetupFailureIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-Cause						CRITICALITY ignore	TYPE Cause						PRESENCE mandatory	}|
-	{ ID id-TimeToWait					CRITICALITY ignore	TYPE TimeToWait					PRESENCE optional	},
+	{ ID id-TimeToWait					CRITICALITY ignore	TYPE TimeToWait					PRESENCE optional	}|
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
+	...
+}
+
+-- **************************************************************
+--
+-- ENB CONFIGURATION UPDATE ELEMENTARY PROCEDURE
+--
+-- **************************************************************
+
+-- **************************************************************
+--
+-- eNB Configuration Update 
+--
+-- **************************************************************
+
+ENBConfigurationUpdate ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {ENBConfigurationUpdateIEs} },
+	...
+}
+
+ENBConfigurationUpdateIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-eNBname				CRITICALITY ignore	TYPE ENBname			PRESENCE optional	}|
+	{ ID id-SupportedTAs		CRITICALITY reject	TYPE SupportedTAs	 	PRESENCE optional	},
+	...
+}
+
+-- **************************************************************
+--
+-- eNB Configuration Update Acknowledge
+--
+-- **************************************************************
+
+ENBConfigurationUpdateAcknowledge ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {ENBConfigurationUpdateAcknowledgeIEs} },
+	...
+}
+
+
+ENBConfigurationUpdateAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
+	...
+}
+
+-- **************************************************************
+--
+-- eNB Configuration Update Failure
+--
+-- **************************************************************
+
+ENBConfigurationUpdateFailure ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {ENBConfigurationUpdateFailureIEs} },
+	...
+}
+
+ENBConfigurationUpdateFailureIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-Cause						CRITICALITY ignore	TYPE Cause						PRESENCE mandatory	}|
+	{ ID id-TimeToWait					CRITICALITY ignore	TYPE TimeToWait					PRESENCE optional	}|
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional },
+...
+}
+
+
+-- **************************************************************
+--
+-- MME Configuration UPDATE ELEMENTARY PROCEDURE
+--
+-- **************************************************************
+
+-- **************************************************************
+--
+-- MME Configuration Update 
+--
+-- **************************************************************
+
+MMEConfigurationUpdate ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {MMEConfigurationUpdateIEs} },
+	...
+}
+
+MMEConfigurationUpdateIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-MMEname				CRITICALITY ignore	TYPE MMEname	 		PRESENCE optional	}|
+	{ ID id-ServedPLMNs			CRITICALITY reject	TYPE ServedPLMNs		PRESENCE optional	}|
+	{ ID id-GUMMEI-ID			CRITICALITY reject	TYPE GUMMEI				PRESENCE optional	}|
+	{ ID id-RelativeMMECapacity	CRITICALITY reject	TYPE RelativeMMECapacity	PRESENCE optional},
+	...
+}
+
+-- **************************************************************
+--
+-- MME Configuration Update Acknowledge
+--
+-- **************************************************************
+
+MMEConfigurationUpdateAcknowledge ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {MMEConfigurationUpdateAcknowledgeIEs} },
+	...
+}
+
+
+MMEConfigurationUpdateAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
+	...
+}
+
+-- **************************************************************
+--
+-- MME Configuration Update Failure
+--
+-- **************************************************************
+
+MMEConfigurationUpdateFailure ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {MMEConfigurationUpdateFailureIEs} },
+	...
+}
+
+MMEConfigurationUpdateFailureIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-Cause						CRITICALITY ignore	TYPE Cause						PRESENCE mandatory	}|
+	{ ID id-TimeToWait					CRITICALITY ignore	TYPE TimeToWait					PRESENCE optional	}|
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	},
 	...
 }
 
@@ -1434,6 +1636,9 @@ 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-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	},
 	...
 }
@@ -1460,6 +1665,9 @@ UplinkS1cdma2000tunnelingIEs S1AP-PROTOCOL-IES ::= {
 	{ 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-cdma2000HORequiredIndication			CRITICALITY ignore	TYPE Cdma2000HORequiredIndication 			PRESENCE optional	} |
+	{ ID id-cdma2000OneXMEID			CRITICALITY ignore	TYPE Cdma2000OneXMEID 			PRESENCE optional	} |
+	{ ID id-cdma2000OneXRAND			CRITICALITY ignore	TYPE Cdma2000OneXRAND 			PRESENCE optional	} |
 	{ ID id-cdma2000PDU					CRITICALITY reject	TYPE Cdma2000PDU	 			PRESENCE mandatory	},
 	...
 }
@@ -1508,71 +1716,154 @@ ENBStatusTransfer ::= SEQUENCE {
 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} ,
+	{ ID id-eNB-StatusTransfer-TransparentContainer	CRITICALITY reject	TYPE ENB-StatusTransfer-TransparentContainer		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	}
+-- **************************************************************
+--
+-- MME STATUS TRANSFER
+--
+-- **************************************************************
+
+-- **************************************************************
+--
+-- MME Status Transfer
+--
+-- **************************************************************
+
+MMEStatusTransfer ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {MMEStatusTransferIEs} },
+	...
 }
 
-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,
+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-eNB-StatusTransfer-TransparentContainer	CRITICALITY reject	TYPE ENB-StatusTransfer-TransparentContainer		PRESENCE mandatory} ,
 	...
 }
 
-Bearers-SubjectToStatusTransferENB-ItemExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+
+-- **************************************************************
+--
+-- Trace Procedures
+--
+-- **************************************************************
+-- **************************************************************
+--
+-- Trace Start
+--
+-- **************************************************************
+
+TraceStart ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {TraceStartIEs} },
+	...
+}
+
+TraceStartIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-MME-UE-S1AP-ID				CRITICALITY reject	TYPE MME-UE-S1AP-ID				PRESENCE mandatory} |
+	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory} |
+	{ ID id-TraceActivation				CRITICALITY ignore	TYPE TraceActivation			PRESENCE optional	},
 	...
 }
 
 -- **************************************************************
 --
--- MME STATUS TRANSFER
+-- Trace Failure Indication
 --
 -- **************************************************************
 
+TraceFailureIndication ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {TraceFailureIndicationIEs} },
+	...
+}
+
+TraceFailureIndicationIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-MME-UE-S1AP-ID				CRITICALITY reject	TYPE MME-UE-S1AP-ID				PRESENCE mandatory} |
+	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory} |
+	{ ID id-TraceReference				CRITICALITY ignore	TYPE TraceReference				PRESENCE mandatory} |
+	{ ID id-Cause						CRITICALITY ignore	TYPE Cause						PRESENCE mandatory} ,
+	...
+}
+
 -- **************************************************************
 --
--- MME Status Transfer
+-- DEACTIVATE TRACE ELEMENTARY PROCEDURE
 --
 -- **************************************************************
 
-MMEStatusTransfer ::= SEQUENCE {
-	protocolIEs			ProtocolIE-Container       { {MMEStatusTransferIEs} },
+-- **************************************************************
+--
+-- DEACTIVATE TRACE
+--
+-- **************************************************************
+
+DeactivateTrace ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { { DeactivateTraceIEs} },
 	...
 }
 
-MMEStatusTransferIEs S1AP-PROTOCOL-IES ::= {
+DeactivateTraceIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-MME-UE-S1AP-ID		CRITICALITY reject	TYPE MME-UE-S1AP-ID		PRESENCE mandatory} |
+	{ ID id-eNB-UE-S1AP-ID		CRITICALITY reject	TYPE ENB-UE-S1AP-ID		PRESENCE mandatory} |
+	{ ID id-TraceReference		CRITICALITY ignore	TYPE TraceReference	 	PRESENCE mandatory	},
+	...
+}
+
+-- **************************************************************
+--
+-- Location Reporting Control
+--
+-- **************************************************************
+
+LocationReportingControl ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { { LocationReportingControlIEs} },
+	...
+}
+
+LocationReportingControlIEs 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} ,
+	{ ID id-RequestType				CRITICALITY ignore	TYPE RequestType				PRESENCE mandatory	} ,
 	...
 }
 
-Bearers-SubjectToStatusTransferMME-List 					::= SAEB-IE-ContainerList { { Bearers-SubjectToStatusTransferMME-ItemIEs } }
+-- **************************************************************
+--
+-- Location Report Failure Indication
+--
+-- **************************************************************
 
-Bearers-SubjectToStatusTransferMME-ItemIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-Bearers-SubjectToStatusTransferMME-Item	CRITICALITY ignore	TYPE Bearers-SubjectToStatusTransferMME-Item 	PRESENCE mandatory	}
+LocationReportingFailureIndication ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { { LocationReportingFailureIndicationIEs} },
+	...
+}
+
+LocationReportingFailureIndicationIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-MME-UE-S1AP-ID			CRITICALITY reject	TYPE MME-UE-S1AP-ID				PRESENCE mandatory} |
+	{ ID id-eNB-UE-S1AP-ID			CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory} |
+	{ ID id-Cause					CRITICALITY ignore	TYPE Cause						PRESENCE optional	} ,
+	...
 }
 
-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,
+-- **************************************************************
+--
+-- Location Report 
+--
+-- **************************************************************
+
+LocationReport ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { { LocationReportIEs} },
 	...
 }
 
-Bearers-SubjectToStatusTransferMME-ItemExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+LocationReportIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-MME-UE-S1AP-ID			CRITICALITY reject	TYPE MME-UE-S1AP-ID				PRESENCE mandatory} |
+	{ ID id-eNB-UE-S1AP-ID			CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory} |
+	{ ID id-EUTRAN-CGI-ID				CRITICALITY ignore	TYPE EUTRAN-CGI-ID				PRESENCE mandatory} |
+	{ ID id-RequestType				CRITICALITY ignore	TYPE RequestType				PRESENCE mandatory} ,
 	...
 }
 
diff --git a/asn1/s1ap/S1AP-PDU-Descriptions.asn b/asn1/s1ap/S1AP-PDU-Descriptions.asn
index 31151a06f5..baf5c68990 100644
--- a/asn1/s1ap/S1AP-PDU-Descriptions.asn
+++ b/asn1/s1ap/S1AP-PDU-Descriptions.asn
@@ -1,4 +1,5 @@
 -- $Id$
+-- 3GPP TS 36.413 V8.2.0 (2008-06)
 -- 9.3.2	Elementary Procedure Definitions
 -- **************************************************************
 --
@@ -25,79 +26,100 @@ IMPORTS
 	ProcedureCode
 FROM S1AP-CommonDataTypes
 
-	HandoverRequired,
+	DeactivateTrace,
+	DownlinkNASTransport,
+	DownlinkS1cdma2000tunneling,
+	ENBStatusTransfer,
+	ENBConfigurationUpdate,
+	ENBConfigurationUpdateAcknowledge,
+	ENBConfigurationUpdateFailure,
+	ErrorIndication,
+	HandoverCancel,
+	HandoverCancelAcknowledge,
 	HandoverCommand,
+	HandoverFailure,
+	HandoverNotify,
 	HandoverPreparationFailure,
 	HandoverRequest,
 	HandoverRequestAcknowledge,
-	HandoverFailure,
-	HandoverNotify,
-	PathSwitchRequest,
-	PathSwitchRequestAcknowledge,
-	PathSwitchRequestFailure,	
-	SAEBearerSetupRequest,
-	SAEBearerSetupResponse,
-	SAEBearerModifyRequest,
-	SAEBearerModifyResponse,
-	SAEBearerReleaseCommand,
-	SAEBearerReleaseComplete,
-	SAEBearerReleaseRequest,
+	HandoverRequired,
+	InitialContextSetupFailure,
 	InitialContextSetupRequest,
 	InitialContextSetupResponse,
-	InitialContextSetupFailure,
-	Paging,
-	DownlinkNASTransport,
 	InitialUEMessage,
-	UplinkNASTransport,
-	HandoverCancel,
-	HandoverCancelAcknowledge,
+	LocationReportingControl,
+	LocationReportingFailureIndication,
+	LocationReport,
+
+	MMEConfigurationUpdate,
+	MMEConfigurationUpdateAcknowledge,
+	MMEConfigurationUpdateFailure,
+	MMEStatusTransfer,
+	NASNonDeliveryIndication,
+	Paging,
+	PathSwitchRequest,
+	PathSwitchRequestAcknowledge,
+	PathSwitchRequestFailure,	
 	Reset,
 	ResetAcknowledge,
-	ErrorIndication,
-	NASNonDeliveryIndication,
+	S1SetupFailure,
 	S1SetupRequest,
 	S1SetupResponse,
-	S1SetupFailure,
-	UEContextReleaseRequest,
-	UplinkS1cdma2000tunneling,
-	DownlinkS1cdma2000tunneling,
+	SAEBearerModifyRequest,
+	SAEBearerModifyResponse,
+	SAEBearerReleaseCommand,
+	SAEBearerReleaseResponse,
+	SAEBearerReleaseRequest,
+	SAEBearerSetupRequest,
+	SAEBearerSetupResponse,
+	TraceFailureIndication,
+	TraceStart,
+	UECapabilityInfoIndication,
+	UEContextModificationFailure,
 	UEContextModificationRequest,
 	UEContextModificationResponse,
-	UEContextModificationFailure,
-	UECapabilityInfoIndication,
 	UEContextReleaseCommand,
 	UEContextReleaseComplete,
-	ENBStatusTransfer,
-	MMEStatusTransfer
+	UEContextReleaseRequest,
+	UplinkNASTransport,
+	UplinkS1cdma2000tunneling
 
 FROM S1AP-PDU-Contents
 	
+	id-DeactivateTrace,
+	id-downlinkNASTransport,
+	id-DownlinkS1cdma2000tunneling,
+	id-eNBStatusTransfer,
+	id-ErrorIndication,
+	id-HandoverCancel,
+	id-HandoverNotification,
 	id-HandoverPreparation,
 	id-HandoverResourceAllocation,
-	id-HandoverNotification,
-	id-PathSwitchRequest,
-	id-SAEBearerSetup,
-	id-SAEBearerModify,
-	id-SAEBearerRelease,
-	id-SAEBearerReleaseRequest,
 	id-InitialContextSetup,
-	id-Paging,
-	id-downlinkNASTransport,
 	id-initialUEMessage,
-	id-uplinkNASTransport,
-	id-HandoverCancel,
-	id-Reset,
-	id-ErrorIndication,
+	id-ENBConfigurationUpdate,
+	id-LocationReportingControl,
+	id-LocationReportingFailureIndication,
+	id-LocationReport,
+	id-MMEConfigurationUpdate,
+	id-MMEStatusTransfer,
 	id-NASNonDeliveryIndication,
+	id-Paging,
+	id-PathSwitchRequest,
+	id-Reset,
 	id-S1Setup,
-	id-UEContextReleaseRequest,
-	id-UplinkS1cdma2000tunneling,
-	id-DownlinkS1cdma2000tunneling,
-	id-UEContextModification,
+	id-SAEBearerModify,
+	id-SAEBearerRelease,
+	id-SAEBearerReleaseRequest,
+	id-SAEBearerSetup,
+	id-TraceFailureIndication,
+	id-TraceStart,
 	id-UECapabilityInfoIndication,
+	id-UEContextModification,
 	id-UEContextRelease,
-	id-eNBStatusTransfer,
-	id-MMEStatusTransfer
+	id-UEContextReleaseRequest,
+	id-uplinkNASTransport,
+	id-UplinkS1cdma2000tunneling
 FROM S1AP-Constants;
 
 
@@ -178,7 +200,9 @@ S1AP-ELEMENTARY-PROCEDURES-CLASS-1 S1AP-ELEMENTARY-PROCEDURE ::= {
 	reset							|
 	s1Setup							|
 	uEContextModification			|
-	uEContextRelease				,
+	uEContextRelease				|
+	eNBConfigurationUpdate			|
+	mMEConfigurationUpdate			,
 	...
 }
 
@@ -196,7 +220,13 @@ S1AP-ELEMENTARY-PROCEDURES-CLASS-2 S1AP-ELEMENTARY-PROCEDURE ::= {
 	uplinkS1cdma2000tunneling		|
 	uECapabilityInfoIndication		|
 	eNBStatusTransfer				|
-	mMEStatusTransfer				,
+	mMEStatusTransfer				|
+	deactivateTrace					|
+	traceStart						|
+	traceFailureIndication			|
+	locationReportingControl		|
+	locationReportingFailureIndication		|
+	locationReport					,
 	...
 }
 
@@ -252,7 +282,7 @@ sAEbearerModify S1AP-ELEMENTARY-PROCEDURE ::= {
 
 sAEbearerRelease S1AP-ELEMENTARY-PROCEDURE ::= {
 	INITIATING MESSAGE	SAEBearerReleaseCommand
-	SUCCESSFUL OUTCOME	SAEBearerReleaseComplete
+	SUCCESSFUL OUTCOME	SAEBearerReleaseResponse
 	PROCEDURE CODE		id-SAEBearerRelease
 	CRITICALITY		reject
 }
@@ -334,6 +364,22 @@ s1Setup S1AP-ELEMENTARY-PROCEDURE ::= {
 	CRITICALITY				reject
 }
 
+eNBConfigurationUpdate S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		ENBConfigurationUpdate
+	SUCCESSFUL OUTCOME		ENBConfigurationUpdateAcknowledge
+	UNSUCCESSFUL OUTCOME 	ENBConfigurationUpdateFailure
+	PROCEDURE CODE			id-ENBConfigurationUpdate
+	CRITICALITY				reject
+}
+
+mMEConfigurationUpdate S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		MMEConfigurationUpdate
+	SUCCESSFUL OUTCOME		MMEConfigurationUpdateAcknowledge
+	UNSUCCESSFUL OUTCOME 	MMEConfigurationUpdateFailure
+	PROCEDURE CODE			id-MMEConfigurationUpdate
+	CRITICALITY				reject
+}
+
 downlinkS1cdma2000tunneling S1AP-ELEMENTARY-PROCEDURE ::= {
 	INITIATING MESSAGE		DownlinkS1cdma2000tunneling
 	PROCEDURE CODE			id-DownlinkS1cdma2000tunneling
@@ -380,4 +426,39 @@ mMEStatusTransfer S1AP-ELEMENTARY-PROCEDURE ::= {
 	CRITICALITY				ignore
 }
 
+deactivateTrace S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		DeactivateTrace
+	PROCEDURE CODE			id-DeactivateTrace
+	CRITICALITY				ignore
+}
+
+traceStart S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE	TraceStart
+	PROCEDURE CODE		id-TraceStart
+	CRITICALITY			ignore
+}
+
+traceFailureIndication S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE	TraceFailureIndication
+	PROCEDURE CODE		id-TraceFailureIndication
+	CRITICALITY			ignore
+}
+
+locationReportingControl S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		LocationReportingControl
+	PROCEDURE CODE			id-LocationReportingControl
+	CRITICALITY				ignore
+}
+
+locationReportingFailureIndication S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		LocationReportingFailureIndication
+	PROCEDURE CODE			id-LocationReportingFailureIndication
+	CRITICALITY				ignore
+}
+
+locationReport S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		LocationReport
+	PROCEDURE CODE			id-LocationReport
+	CRITICALITY				ignore
+}
 END
diff --git a/asn1/s1ap/packet-s1ap-template.c b/asn1/s1ap/packet-s1ap-template.c
index 703632900f..f15ddfcdd4 100644
--- a/asn1/s1ap/packet-s1ap-template.c
+++ b/asn1/s1ap/packet-s1ap-template.c
@@ -1,6 +1,6 @@
 /* packet-s1ap.c
  * Routines for E-UTRAN S1 Application Protocol (S1AP) packet dissection
- * Copyright 2007, Anders Broman <anders.broman@ericsson.com>
+ * Copyright 2007-2008, Anders Broman <anders.broman@ericsson.com>
  *
  * $Id$
  *
diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf
index a5c0bb8f43..8213cf33cf 100644
--- a/asn1/s1ap/s1ap.cnf
+++ b/asn1/s1ap/s1ap.cnf
@@ -150,32 +150,40 @@ ProtocolExtensionID TYPE = FT_UINT8  DISPLAY = BASE_DEC STRINGS = VALS(s1ap_Prot
 #.ASSIGN_VALUE_TO_TYPE  # S1AP does not have constants assigned to types, they are pure INTEGER
 # ProcedureCode
 
-id-HandoverPreparation 				ProcedureCode
-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-InitialContextSetup				ProcedureCode
-id-Paging							ProcedureCode
-id-downlinkNASTransport				ProcedureCode
-id-initialUEMessage					ProcedureCode
-id-uplinkNASTransport				ProcedureCode
-id-Reset							ProcedureCode
-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
+id-HandoverPreparation 					ProcedureCode
+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-InitialContextSetup					ProcedureCode
+id-Paging								ProcedureCode
+id-downlinkNASTransport					ProcedureCode
+id-initialUEMessage						ProcedureCode
+id-uplinkNASTransport					ProcedureCode
+id-Reset								ProcedureCode
+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
+id-DeactivateTrace						ProcedureCode
+id-TraceStart							ProcedureCode
+id-TraceFailureIndication				ProcedureCode
+id-ENBConfigurationUpdate				ProcedureCode
+id-MMEConfigurationUpdate				ProcedureCode
+id-LocationReportingControl				ProcedureCode
+id-LocationReportingFailureIndication	ProcedureCode
+id-LocationReport						ProcedureCode
 
 # ProtocolIE-ID
 id-MME-UE-S1AP-ID									ProtocolIE-ID
@@ -222,8 +230,8 @@ id-Security-Information								ProtocolIE-ID
 id-HandoverRestrictionList							ProtocolIE-ID
 id-pagingDRX 										ProtocolIE-ID
 id-pagingCause										ProtocolIE-ID
-id-TAIdList											ProtocolIE-ID
-id-TAIdItem											ProtocolIE-ID
+id-TAIList											ProtocolIE-ID
+id-TAIItem											ProtocolIE-ID
 id-SAEBearerFailedToSetupListCtxtSURes				ProtocolIE-ID
 id-SAEBearerReleaseItemHOCmd						ProtocolIE-ID
 id-SAEBearerSetupItemCtxtSURes						ProtocolIE-ID
@@ -238,11 +246,10 @@ id-CriticalityDiagnostics 							ProtocolIE-ID
 id-eNBname											ProtocolIE-ID
 id-MMEname											ProtocolIE-ID
 id-ServedPLMNs										ProtocolIE-ID
-id-SupportedTAIs									ProtocolIE-ID
+id-SupportedTAs										ProtocolIE-ID
 id-TimeToWait										ProtocolIE-ID
 id-aggregateMaximumBitrate							ProtocolIE-ID
-id-TAId												ProtocolIE-ID
-id-ServingPLMN										ProtocolIE-ID
+id-TAI												ProtocolIE-ID
 id-SAEBearerReleaseListBearerRelComp				ProtocolIE-ID
 id-cdma2000PDU										ProtocolIE-ID
 id-cdma2000RATType									ProtocolIE-ID
@@ -250,13 +257,27 @@ 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
+id-cdma2000HOStatus									ProtocolIE-ID
+id-cdma2000HORequiredIndication						ProtocolIE-ID
+id-cdma2000OneXMEID									ProtocolIE-ID
+id-TraceReference									ProtocolIE-ID
+id-RelativeMMECapacity								ProtocolIE-ID
+id-SourceMME-UE-S1AP-ID								ProtocolIE-ID
+id-Bearers-SubjectToStatusTransfer-Item				ProtocolIE-ID
+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-S-TMSI											ProtocolIE-ID
+id-cdma2000OneXRAND									ProtocolIE-ID
+id-RequestType										ProtocolIE-ID
+id-UE-S1AP-IDs										ProtocolIE-ID
+id-EUTRAN-CGI-ID									ProtocolIE-ID 
 
 #.END
 
@@ -307,8 +328,8 @@ SecurityInformation						N s1ap.ies id-Security-Information
 HandoverRestrictionList					N s1ap.ies id-HandoverRestrictionList
 PagingDRX								N s1ap.ies id-pagingDRX
 PagingCause								N s1ap.ies id-pagingCause
-TAIdList								N s1ap.ies id-TAIdList
-TAIdItem								N s1ap.ies id-TAIdItem
+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
@@ -323,11 +344,10 @@ CriticalityDiagnostics					N s1ap.ies id-CriticalityDiagnostics
 ENBname									N s1ap.ies id-eNBname
 MMEname									N s1ap.ies id-MMEname
 ServedPLMNs								N s1ap.ies id-ServedPLMNs
-SupportedTAIs							N s1ap.ies id-SupportedTAIs
+SupportedTAs							N s1ap.ies id-SupportedTAs
 TimeToWait								N s1ap.ies id-TimeToWait
 AggregateMaximumBitrate					N s1ap.ies id-aggregateMaximumBitrate
-TAId									N s1ap.ies id-TAId
-PLMNidentity							N s1ap.ies id-ServingPLMN
+TAI										N s1ap.ies id-TAI
 SAEBearerReleaseListBearerRelComp		N s1ap.ies id-SAEBearerReleaseListBearerRelComp				
 Cdma2000PDU								N s1ap.ies id-cdma2000PDU										
 Cdma2000RATType							N s1ap.ies id-cdma2000RATType									
@@ -335,13 +355,27 @@ 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			
+Cdma2000HOStatus						N s1ap.ies id-cdma2000HOStatus
+Cdma2000HORequiredIndication			N s1ap.ies id-cdma2000HORequiredIndication
+Cdma2000OneXMEID						N s1ap.ies id-cdma2000OneXMEID
+TraceReference							N s1ap.ies id-TraceReference
+RelativeMMECapacity						N s1ap.ies id-RelativeMMECapacity
+MME-UE-S1AP-ID							N s1ap.ies id-SourceMME-UE-S1AP-ID
+Bearers-SubjectToStatusTransfer-Item	N s1ap.ies id-Bearers-SubjectToStatusTransfer-Item
+ENB-StatusTransfer-TransparentContainer	N s1ap.ies id-eNB-StatusTransfer-TransparentContainer
+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
+S-TMSI									N s1ap.ies id-S-TMSI
+Cdma2000OneXRAND						N s1ap.ies id-cdma2000OneXRAND
+RequestType								N s1ap.ies id-RequestType
+UE-S1AP-IDs								N s1ap.ies id-UE-S1AP-IDs
+EUTRAN-CGI-ID							N s1ap.ies id-EUTRAN-CGI-ID 
 
 #S1AP-PROTOCOL-IES-PAIR
 #RAB-SetupOrModifyItemFirst         N s1ap.ies.pair.first id-RAB-SetupOrModifyItem
@@ -373,7 +407,7 @@ SAEBearerModifyRequest					N s1ap.proc.imsg id-SAEBearerModify
 SAEBearerModifyResponse					N s1ap.proc.sout id-SAEBearerModify
 
 SAEBearerReleaseCommand					N s1ap.proc.imsg id-SAEBearerRelease
-SAEBearerReleaseComplete				N s1ap.proc.sout id-SAEBearerRelease
+SAEBearerReleaseResponse				N s1ap.proc.sout id-SAEBearerRelease
 
 SAEBearerReleaseRequest					N s1ap.proc.imsg id-SAEBearerReleaseRequest
 
@@ -407,6 +441,14 @@ S1SetupFailure							N s1ap.proc.uout id-S1Setup
 
 DownlinkS1cdma2000tunneling				N s1ap.proc.imsg id-DownlinkS1cdma2000tunneling
 
+ENBConfigurationUpdate					N s1ap.proc.imsg id-ENBConfigurationUpdate
+ENBConfigurationUpdateAcknowledge		N s1ap.proc.sout id-ENBConfigurationUpdate
+ENBConfigurationUpdateFailure			N s1ap.proc.uout id-ENBConfigurationUpdate
+
+MMEConfigurationUpdate					N s1ap.proc.imsg id-MMEConfigurationUpdate
+MMEConfigurationUpdateAcknowledge		N s1ap.proc.sout id-MMEConfigurationUpdate
+MMEConfigurationUpdateFailure			N s1ap.proc.uout id-MMEConfigurationUpdate
+
 UplinkS1cdma2000tunneling				N s1ap.proc.imsg id-UplinkS1cdma2000tunneling
 
 UEContextModificationRequest			N s1ap.proc.imsg id-UEContextModification 
@@ -421,4 +463,16 @@ UEContextReleaseComplete				N s1ap.proc.sout id-UEContextRelease
 ENBStatusTransfer						N s1ap.proc.imsg id-eNBStatusTransfer
 
 MMEStatusTransfer						N s1ap.proc.imsg id-MMEStatusTransfer
+
+DeactivateTrace							N s1ap.proc.imsg id-DeactivateTrace
+
+TraceStart								N s1ap.proc.imsg id-TraceStart
+
+TraceFailureIndication					N s1ap.proc.imsg id-TraceFailureIndication
+
+LocationReportingControl				N s1ap.proc.imsg id-LocationReportingControl
+
+LocationReportingFailureIndication		N s1ap.proc.imsg id-LocationReportingFailureIndication
+
+LocationReport							N s1ap.proc.imsg id-LocationReport
 #.END
\ No newline at end of file