asn1dir: update S1AP to rel.14

2019-03-14 11:04:02 +01:00 · 2019-03-14 11:04:02 +01:00 · 8a8fa1576c
parent f0e8434a18
commit 8a8fa1576c
20 changed files with 33006 additions and 150 deletions
--- a/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/36413-e80.txt
+++ b/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/36413-e80.txt
--- a/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/S1AP-Constants.asn
+++ b/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/S1AP-Constants.asn
@ -88,6 +88,11 @@ id-UEContextModificationIndication			ProcedureCode ::= 53
 id-ConnectionEstablishmentIndication		ProcedureCode ::= 54
 id-UEContextSuspend							ProcedureCode ::= 55
 id-UEContextResume							ProcedureCode ::= 56
+id-NASDeliveryIndication					ProcedureCode ::= 57
+id-RetrieveUEInformation					ProcedureCode ::= 58
+id-UEInformationTransfer					ProcedureCode ::= 59
+id-eNBCPRelocationIndication				ProcedureCode ::= 60
+id-MMECPRelocationIndication				ProcedureCode ::= 61

 -- **************************************************************
 --
@ -120,6 +125,7 @@ maxnoofCells							INTEGER ::= 16
 maxnoofCellsineNB						INTEGER ::= 256
 maxnoofTAIforWarning					INTEGER ::= 65535 
 maxnoofCellID							INTEGER ::= 65535 
+maxnoofDCNs								INTEGER ::= 32 
 maxnoofEmergencyAreaID					INTEGER ::= 65535 
 maxnoofCellinTAI						INTEGER ::= 65535 
 maxnoofCellinEAI						INTEGER ::= 65535 
@ -278,7 +284,7 @@ id-CellAccessMode									ProtocolIE-ID ::= 145
 id-CSGMembershipStatus 								ProtocolIE-ID ::= 146
 id-LPPa-PDU											ProtocolIE-ID ::= 147
 id-Routing-ID										ProtocolIE-ID ::= 148
-id-Time-Synchronisation-Info						ProtocolIE-ID ::= 149
+id-Time-Synchronisation-Info							ProtocolIE-ID ::= 149
 id-PS-ServiceNotAvailable							ProtocolIE-ID ::= 150
 id-PagingPriority									ProtocolIE-ID ::= 151
 id-x2TNLConfigurationInfo							ProtocolIE-ID ::= 152
@ -368,5 +374,22 @@ id-E-RABFailedToResumeItemResumeReq					ProtocolIE-ID ::= 236
 id-E-RABFailedToResumeListResumeRes					ProtocolIE-ID ::= 237
 id-E-RABFailedToResumeItemResumeRes					ProtocolIE-ID ::= 238
 id-NB-IoT-Paging-eDRXInformation					ProtocolIE-ID ::= 239
+id-V2XServicesAuthorized							ProtocolIE-ID ::= 240
 id-UEUserPlaneCIoTSupportIndicator 					ProtocolIE-ID ::= 241
+id-CE-mode-B-SupportIndicator 						ProtocolIE-ID ::= 242
+id-SRVCCOperationNotPossible						ProtocolIE-ID ::= 243
+id-NB-IoT-UEIdentityIndexValue 						ProtocolIE-ID ::= 244
+id-RRC-Resume-Cause									ProtocolIE-ID ::= 245
+id-DCN-ID											ProtocolIE-ID ::= 246
+id-ServedDCNs					 					ProtocolIE-ID ::= 247
+id-UESidelinkAggregateMaximumBitrate 				ProtocolIE-ID ::= 248
+id-DLNASPDUDeliveryAckRequest						ProtocolIE-ID ::= 249
+id-Coverage-Level 									ProtocolIE-ID ::= 250
+id-EnhancedCoverageRestricted						ProtocolIE-ID ::= 251
+id-UE-Level-QoS-Parameters							ProtocolIE-ID ::= 252
+id-DL-CP-SecurityInformation						ProtocolIE-ID ::= 253
+id-UL-CP-SecurityInformation						ProtocolIE-ID ::= 254
+id-CE-ModeBRestricted								ProtocolIE-ID ::= 271
+id-PendingDataIndication							ProtocolIE-ID ::= 283
+
 END
--- a/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/S1AP-IEs.asn
+++ b/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/S1AP-IEs.asn
@ -59,6 +59,7 @@ IMPORTS
 	maxnoofForbTACs,
 	maxnoofCells,
 	maxnoofCellID,
+	maxnoofDCNs,
 	maxnoofEmergencyAreaID,
 	maxnoofTAIforWarning,
 	maxnoofCellinTAI,
@ -168,7 +169,7 @@ AssistanceDataForRecommendedCells-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 Bearers-SubjectToStatusTransferList ::= SEQUENCE (SIZE(1.. maxnoofE-RABs)) OF ProtocolIE-SingleContainer { { Bearers-SubjectToStatusTransfer-ItemIEs } }

 Bearers-SubjectToStatusTransfer-ItemIEs S1AP-PROTOCOL-IES ::= {
-	{ ID id-Bearers-SubjectToStatusTransfer-Item	CRITICALITY ignore	TYPE Bearers-SubjectToStatusTransfer-Item 	PRESENCE mandatory	},
+	{ ID id-Bearers-SubjectToStatusTransfer-Item	CRITICALITY ignore	TYPE Bearers-SubjectToStatusTransfer-Item	PRESENCE mandatory	},
 	...
 }

@ -313,7 +314,8 @@ CauseRadioNetwork ::= ENUMERATED {
 	...,
 	redirection-towards-1xRTT,
 	not-supported-QCI-value,
-	invalid-CSG-Id
+	invalid-CSG-Id,
+	release-due-to-pre-emption

 }

@ -351,6 +353,11 @@ CellIdentifierAndCELevelForCECapableUEs-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 -- Coverage Enhancement level encoded according to TS 36.331 [16] --
 CELevel ::= OCTET STRING

+CE-mode-B-SupportIndicator ::= ENUMERATED {
+	supported,
+	...
+}
+
 CellIdentity ::= BIT STRING (SIZE (28))

 CellID-Broadcast ::= SEQUENCE (SIZE(1..maxnoofCellID)) OF CellID-Broadcast-Item
@ -535,6 +542,11 @@ COUNTvaluePDCP-SNlength18-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }

+Coverage-Level ::= ENUMERATED {
+	extendedcoverage,
+	...
+}
+
 CriticalityDiagnostics ::= SEQUENCE {
 	procedureCode					ProcedureCode														OPTIONAL,
 	triggeringMessage				TriggeringMessage													OPTIONAL,
@ -567,11 +579,38 @@ CriticalityDiagnostics-IE-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {

 DataCodingScheme ::= BIT STRING (SIZE (8))

+DCN-ID ::= INTEGER (0..65535)
+
+ServedDCNs ::= SEQUENCE (SIZE(0..maxnoofDCNs)) OF ServedDCNsItem
+
+ServedDCNsItem ::= SEQUENCE {
+	dCN-ID						DCN-ID,
+	relativeDCNCapacity			RelativeMMECapacity,
+	iE-Extensions			ProtocolExtensionContainer { {ServedDCNsItem-ExtIEs} }	OPTIONAL,
+	...
+}
+
+ServedDCNsItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+DL-CP-SecurityInformation ::= SEQUENCE {
+	dl-NAS-MAC				DL-NAS-MAC,
+	iE-Extensions			ProtocolExtensionContainer { { DL-CP-SecurityInformation-ExtIEs} }	OPTIONAL,
+	...
+}
+
+DL-CP-SecurityInformation-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 DL-Forwarding ::= ENUMERATED {
 	dL-Forwarding-proposed,
 	...
 }

+DL-NAS-MAC ::= BIT STRING (SIZE (16))
+
 Direct-Forwarding-Path-Availability ::= ENUMERATED {
 	directPathAvailable,
 	...
@ -582,6 +621,11 @@ Data-Forwarding-Not-Possible ::= ENUMERATED {
 	...
 }

+DLNASPDUDeliveryAckRequest ::= ENUMERATED {
+	requested,
+	...
+}
+
 -- E

 EARFCN ::= INTEGER(0..maxEARFCN, ...)
@ -639,7 +683,9 @@ EmergencyAreaIDListForRestart	::= SEQUENCE (SIZE(1..maxnoofRestartEmergencyAreaI
 ENB-ID ::= CHOICE {
 	macroENB-ID			BIT STRING (SIZE(20)),
 	homeENB-ID			BIT STRING (SIZE(28)),
-	...
+	... ,
+	short-macroENB-ID 	BIT STRING (SIZE(18)),
+	long-macroENB-ID		BIT STRING (SIZE(21))
 }

 GERAN-Cell-ID ::= SEQUENCE {
@ -685,6 +731,17 @@ ENBX2TLAs ::= SEQUENCE (SIZE(1.. maxnoofeNBX2TLAs)) OF TransportLayerAddress

 EncryptionAlgorithms ::= BIT STRING (SIZE (16,...))

+EnhancedCoverageRestricted ::= ENUMERATED {
+	restricted,
+	...
+}
+
+CE-ModeBRestricted ::= ENUMERATED {
+	restricted,
+	not-restricted,
+	...
+}
+
 EPLMNs ::= SEQUENCE (SIZE(1..maxnoofEPLMNs)) OF PLMNidentity
 EventType	::= ENUMERATED {
 	direct,
@ -1266,6 +1323,8 @@ NB-IoT-Paging-eDRX-Cycle ::= ENUMERATED{hf2, hf4, hf6, hf8, hf10, hf12, hf14, hf

 NB-IoT-PagingTimeWindow ::= ENUMERATED{s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14, s15, s16, ...}

+NB-IoT-UEIdentityIndexValue ::= BIT STRING (SIZE (12))
+
 NextPagingAreaScope ::= ENUMERATED {
 	same,
 	changed,
@ -1286,7 +1345,10 @@ OverloadAction ::= ENUMERATED {
 	permit-emergency-sessions-and-mobile-terminated-services-only,
 	...,
 	permit-high-priority-sessions-and-mobile-terminated-services-only,
-	reject-delay-tolerant-access
+	reject-delay-tolerant-access,
+	permit-high-priority-sessions-and-exception-reporting-and-mobile-terminated-services-only,
+	not-accept-mo-data-or-delay-tolerant-access-from-CP-CIoT
+
 }

 OverloadResponse ::= CHOICE {
@ -1352,6 +1414,11 @@ PDCP-SNExtended ::= INTEGER (0..32767)

 PDCP-SNlength18 ::= INTEGER (0..262143)

+PendingDataIndication ::= ENUMERATED {
+	true,
+	...
+}
+
 M1PeriodicReporting ::= SEQUENCE { 
 	reportInterval				ReportIntervalMDT,
 	reportAmount				ReportAmountMDT,
@ -1684,6 +1751,11 @@ SourceeNB-ID-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }

+SRVCCOperationNotPossible ::= ENUMERATED {
+	notPossible,
+	...
+}
+
 SRVCCOperationPossible ::= ENUMERATED {
 	possible,
 	...
@ -1945,8 +2017,8 @@ TransportLayerAddress		::= BIT STRING (SIZE(1..160, ...))
 TraceActivation ::= SEQUENCE {
 	e-UTRAN-Trace-ID					E-UTRAN-Trace-ID,
 	interfacesToTrace					InterfacesToTrace,
-     traceDepth							TraceDepth,
-     traceCollectionEntityIPAddress		TransportLayerAddress,
+traceDepth							TraceDepth,
+traceCollectionEntityIPAddress		TransportLayerAddress,
 	iE-Extensions						ProtocolExtensionContainer { { TraceActivation-ExtIEs} }	OPTIONAL,
 	...
 }
@ -2070,7 +2142,33 @@ UESecurityCapabilities-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }

-UE-Usage-Type ::= INTEGER (0..255)
+UESidelinkAggregateMaximumBitrate ::= SEQUENCE {
+	uESidelinkAggregateMaximumBitRate		BitRate,
+	iE-Extensions					ProtocolExtensionContainer { {UE-Sidelink-Aggregate-MaximumBitrates-ExtIEs} } OPTIONAL,
+	...
+}
+
+UE-Sidelink-Aggregate-MaximumBitrates-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+UE-Usage-Type ::= INTEGER (0..255) 
+
+UL-CP-SecurityInformation ::= SEQUENCE {
+	ul-NAS-MAC				UL-NAS-MAC,
+	ul-NAS-Count			UL-NAS-Count,
+	iE-Extensions			ProtocolExtensionContainer { { UL-CP-SecurityInformation-ExtIEs} }	OPTIONAL,
+	...
+}
+
+UL-CP-SecurityInformation-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+UL-NAS-MAC ::= BIT STRING (SIZE (16))
+
+UL-NAS-Count ::= BIT STRING (SIZE (5))
+

 UserLocationInformation ::= SEQUENCE {
 	eutran-cgi 				EUTRAN-CGI,
@ -2096,6 +2194,29 @@ VoiceSupportMatchIndicator ::= ENUMERATED {
 	...
 }

+V2XServicesAuthorized ::= SEQUENCE {
+	vehicleUE			VehicleUE											OPTIONAL,
+	pedestrianUE 		PedestrianUE						OPTIONAL,
+	iE-Extensions		ProtocolExtensionContainer { {V2XServicesAuthorized-ExtIEs} }	OPTIONAL,
+	...
+}
+
+V2XServicesAuthorized-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+VehicleUE ::= ENUMERATED { 
+	authorized,
+	not-authorized,
+	...
+}
+
+PedestrianUE ::= ENUMERATED { 
+	authorized,
+	not-authorized,
+	...
+}
+
 -- W

 WarningAreaList ::= CHOICE {
--- a/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/S1AP-PDU-Contents.asn
+++ b/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/S1AP-PDU-Contents.asn
@ -87,6 +87,7 @@ IMPORTS
 	SourceeNB-ToTargeteNB-TransparentContainer,
 	SourceRNC-ToTargetRNC-TransparentContainer,
 	SubscriberProfileIDforRFP,
+	SRVCCOperationNotPossible,
 	SRVCCOperationPossible,
 	SRVCCHOIndication,
 	SupportedTAs,
@ -149,7 +150,20 @@ IMPORTS
 	UE-Usage-Type,
 	UEUserPlaneCIoTSupportIndicator,
 	NB-IoT-DefaultPagingDRX,
-	NB-IoT-Paging-eDRXInformation
+	NB-IoT-Paging-eDRXInformation,
+	CE-mode-B-SupportIndicator,
+	NB-IoT-UEIdentityIndexValue,
+	V2XServicesAuthorized,
+	DCN-ID,
+	ServedDCNs,
+	UESidelinkAggregateMaximumBitrate,
+	DLNASPDUDeliveryAckRequest,
+	Coverage-Level,
+	EnhancedCoverageRestricted,
+	DL-CP-SecurityInformation,
+	UL-CP-SecurityInformation,
+	CE-ModeBRestricted,
+	PendingDataIndication



@ -285,6 +299,7 @@ FROM S1AP-Containers
 	id-Source-ToTarget-TransparentContainer,
 	id-Source-ToTarget-TransparentContainer-Secondary,
 	id-SourceMME-UE-S1AP-ID,
+	id-SRVCCOperationNotPossible,
 	id-SRVCCOperationPossible,
 	id-SRVCCHOIndication,
 	id-SubscriberProfileIDforRFP,
@ -310,6 +325,7 @@ FROM S1AP-Containers
 	id-UE-RetentionInformation,
 	id-UESecurityCapabilities,
 	id-UE-S1AP-IDs,
+	id-V2XServicesAuthorized,
 	id-ResetType,
 	id-MessageIdentifier,
 	id-SerialNumber,
@ -369,7 +385,21 @@ FROM S1AP-Containers
 	id-UE-Usage-Type,
 	id-UEUserPlaneCIoTSupportIndicator,
 	id-NB-IoT-DefaultPagingDRX,
-	id-NB-IoT-Paging-eDRXInformation
+	id-NB-IoT-Paging-eDRXInformation,
+	id-CE-mode-B-SupportIndicator,
+	id-NB-IoT-UEIdentityIndexValue,
+	id-RRC-Resume-Cause,
+	id-DCN-ID,
+	id-ServedDCNs,
+	id-UESidelinkAggregateMaximumBitrate,
+	id-DLNASPDUDeliveryAckRequest,
+	id-Coverage-Level,
+	id-EnhancedCoverageRestricted,
+	id-UE-Level-QoS-Parameters,
+	id-DL-CP-SecurityInformation,
+	id-UL-CP-SecurityInformation,
+	id-CE-ModeBRestricted,
+	id-PendingDataIndication


 FROM S1AP-Constants;
@ -454,8 +484,8 @@ E-RABDataForwardingItemIEs S1AP-PROTOCOL-IES ::= {

 E-RABDataForwardingItem ::= SEQUENCE {
 	e-RAB-ID							E-RAB-ID,
-	dL-transportLayerAddress			TransportLayerAddress 													OPTIONAL,
-	dL-gTP-TEID							GTP-TEID 																OPTIONAL,
+	dL-transportLayerAddress			TransportLayerAddress													OPTIONAL,
+	dL-gTP-TEID							GTP-TEID																OPTIONAL,
 	uL-TransportLayerAddress			TransportLayerAddress													OPTIONAL,
 	uL-GTP-TEID							GTP-TEID																OPTIONAL,
 	iE-Extensions						ProtocolExtensionContainer { { E-RABDataForwardingItem-ExtIEs} }			OPTIONAL,
@ -528,11 +558,16 @@ HandoverRequestIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-Masked-IMEISV							CRITICALITY ignore	TYPE Masked-IMEISV						PRESENCE optional}|
 	{ ID id-ExpectedUEBehaviour						CRITICALITY ignore	TYPE ExpectedUEBehaviour				PRESENCE optional}|
 	{ ID id-ProSeAuthorized							CRITICALITY ignore	TYPE ProSeAuthorized					PRESENCE optional}|
-	{ ID id-UEUserPlaneCIoTSupportIndicator			CRITICALITY ignore	TYPE UEUserPlaneCIoTSupportIndicator 		PRESENCE optional},
+	{ ID id-UEUserPlaneCIoTSupportIndicator			CRITICALITY ignore	TYPE UEUserPlaneCIoTSupportIndicator		PRESENCE optional}|
+	{ ID id-V2XServicesAuthorized					CRITICALITY ignore	TYPE V2XServicesAuthorized			PRESENCE optional}|
+	{ ID id-UESidelinkAggregateMaximumBitrate		CRITICALITY ignore	TYPE UESidelinkAggregateMaximumBitrate		PRESENCE optional}|
+	{ ID id-EnhancedCoverageRestricted				CRITICALITY ignore	TYPE EnhancedCoverageRestricted			PRESENCE optional}|
+	{ ID id-CE-ModeBRestricted						CRITICALITY ignore	TYPE CE-ModeBRestricted			PRESENCE optional}|
+	{ ID id-PendingDataIndication					CRITICALITY ignore	TYPE PendingDataIndication			PRESENCE optional},
 	...
 }

-E-RABToBeSetupListHOReq 					::= E-RAB-IE-ContainerList { {E-RABToBeSetupItemHOReqIEs} }
+E-RABToBeSetupListHOReq					::= E-RAB-IE-ContainerList { {E-RABToBeSetupItemHOReqIEs} }

 E-RABToBeSetupItemHOReqIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-E-RABToBeSetupItemHOReq				CRITICALITY reject	TYPE E-RABToBeSetupItemHOReq			PRESENCE mandatory	},
@ -565,19 +600,20 @@ HandoverRequestAcknowledge ::= SEQUENCE {
 	...
 }

-HandoverRequestAcknowledgeIEs S1AP-PROTOCOL-IES ::= {	
-	{ ID id-MME-UE-S1AP-ID							CRITICALITY ignore	TYPE MME-UE-S1AP-ID						PRESENCE mandatory	}|
-	{ ID id-eNB-UE-S1AP-ID							CRITICALITY ignore	TYPE ENB-UE-S1AP-ID						PRESENCE mandatory	}|
-	{ ID id-E-RABAdmittedList						CRITICALITY ignore	TYPE E-RABAdmittedList					PRESENCE mandatory	}|
-	{ ID id-E-RABFailedToSetupListHOReqAck			CRITICALITY ignore	TYPE E-RABFailedtoSetupListHOReqAck		PRESENCE optional	}|
-	{ ID id-Target-ToSource-TransparentContainer	CRITICALITY reject	TYPE Target-ToSource-TransparentContainer	PRESENCE mandatory	}|
-	{ ID id-CSG-Id									CRITICALITY ignore	TYPE CSG-Id								PRESENCE optional	}|
-	{ ID id-CriticalityDiagnostics					CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional	}|
-	{ ID id-CellAccessMode							CRITICALITY ignore	TYPE CellAccessMode						PRESENCE optional	},
+HandoverRequestAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-MME-UE-S1AP-ID							CRITICALITY ignore	TYPE MME-UE-S1AP-ID						PRESENCE mandatory}|
+	{ ID id-eNB-UE-S1AP-ID							CRITICALITY ignore	TYPE ENB-UE-S1AP-ID						PRESENCE mandatory}|
+	{ ID id-E-RABAdmittedList						CRITICALITY ignore	TYPE E-RABAdmittedList					PRESENCE mandatory}|
+	{ ID id-E-RABFailedToSetupListHOReqAck			CRITICALITY ignore	TYPE E-RABFailedtoSetupListHOReqAck		PRESENCE optional}|
+	{ ID id-Target-ToSource-TransparentContainer	CRITICALITY reject	TYPE Target-ToSource-TransparentContainer	PRESENCE mandatory}|
+	{ ID id-CSG-Id									CRITICALITY ignore	TYPE CSG-Id								PRESENCE optional}|
+	{ ID id-CriticalityDiagnostics					CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional}|
+	{ ID id-CellAccessMode							CRITICALITY ignore	TYPE CellAccessMode						PRESENCE optional}|
+	{ ID id-CE-mode-B-SupportIndicator				CRITICALITY ignore	TYPE CE-mode-B-SupportIndicator			PRESENCE optional},
 	...
 }

-E-RABAdmittedList 					::= E-RAB-IE-ContainerList { {E-RABAdmittedItemIEs} }
+E-RABAdmittedList					::= E-RAB-IE-ContainerList { {E-RABAdmittedItemIEs} }

 E-RABAdmittedItemIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-E-RABAdmittedItem			CRITICALITY ignore	TYPE E-RABAdmittedItem			PRESENCE mandatory	},
@ -600,7 +636,7 @@ E-RABAdmittedItem-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }

-E-RABFailedtoSetupListHOReqAck 					::= E-RAB-IE-ContainerList { {E-RABFailedtoSetupItemHOReqAckIEs} }
+E-RABFailedtoSetupListHOReqAck					::= E-RAB-IE-ContainerList { {E-RABFailedtoSetupItemHOReqAckIEs} }

 E-RABFailedtoSetupItemHOReqAckIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-E-RABFailedtoSetupItemHOReqAck			CRITICALITY ignore	TYPE E-RABFailedToSetupItemHOReqAck			PRESENCE mandatory	},
@ -695,7 +731,8 @@ PathSwitchRequestIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-CSGMembershipStatus				CRITICALITY ignore	TYPE CSGMembershipStatus		PRESENCE optional}|
 -- Extension for Release 11 to support BBAI -- 
 	{ ID id-Tunnel-Information-for-BBF		CRITICALITY ignore	TYPE TunnelInformation			PRESENCE optional}|
-	{ ID id-LHN-ID							CRITICALITY ignore	TYPE LHN-ID						PRESENCE optional},
+	{ ID id-LHN-ID							CRITICALITY ignore	TYPE LHN-ID						PRESENCE optional}|
+	{ ID id-RRC-Resume-Cause				CRITICALITY ignore	TYPE RRC-Establishment-Cause	PRESENCE optional },
 	...
 }

@ -740,7 +777,12 @@ PathSwitchRequestAcknowledgeIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-MME-UE-S1AP-ID-2				CRITICALITY ignore	TYPE MME-UE-S1AP-ID						PRESENCE optional}|
 	{ ID id-CSGMembershipStatus				CRITICALITY ignore	TYPE CSGMembershipStatus				PRESENCE optional}|
 	{ ID id-ProSeAuthorized					CRITICALITY ignore	TYPE ProSeAuthorized					PRESENCE optional}|
-	{ ID id-UEUserPlaneCIoTSupportIndicator	CRITICALITY ignore	TYPE UEUserPlaneCIoTSupportIndicator	PRESENCE optional},
+	{ ID id-UEUserPlaneCIoTSupportIndicator	CRITICALITY ignore	TYPE UEUserPlaneCIoTSupportIndicator	PRESENCE optional}|
+	{ ID id-V2XServicesAuthorized			CRITICALITY ignore	TYPE V2XServicesAuthorized				PRESENCE optional}|
+	{ ID id-UESidelinkAggregateMaximumBitrate		CRITICALITY ignore	TYPE UESidelinkAggregateMaximumBitrate	PRESENCE optional}|
+	{ ID id-EnhancedCoverageRestricted		CRITICALITY ignore	TYPE EnhancedCoverageRestricted			PRESENCE optional}|
+	{ ID id-CE-ModeBRestricted				CRITICALITY ignore	TYPE CE-ModeBRestricted					PRESENCE optional}|
+	{ ID id-PendingDataIndication			CRITICALITY ignore	TYPE PendingDataIndication				PRESENCE optional},
 	...
 }

@ -852,8 +894,8 @@ E-RABSetupRequestIEs S1AP-PROTOCOL-IES ::= {

 E-RABToBeSetupListBearerSUReq ::= SEQUENCE (SIZE(1.. maxnoofE-RABs)) OF ProtocolIE-SingleContainer { {E-RABToBeSetupItemBearerSUReqIEs} }

-E-RABToBeSetupItemBearerSUReqIEs 	S1AP-PROTOCOL-IES ::= {
-	{ ID id-E-RABToBeSetupItemBearerSUReq	 CRITICALITY reject 	TYPE E-RABToBeSetupItemBearerSUReq 	PRESENCE mandatory },
+E-RABToBeSetupItemBearerSUReqIEs	S1AP-PROTOCOL-IES ::= {
+	{ ID id-E-RABToBeSetupItemBearerSUReq	 CRITICALITY reject		TYPE E-RABToBeSetupItemBearerSUReq	PRESENCE mandatory },
 	...
 }

@ -899,8 +941,8 @@ E-RABSetupResponseIEs S1AP-PROTOCOL-IES ::= {

 E-RABSetupListBearerSURes ::= SEQUENCE (SIZE(1.. maxnoofE-RABs)) OF ProtocolIE-SingleContainer { {E-RABSetupItemBearerSUResIEs} }

-E-RABSetupItemBearerSUResIEs 	S1AP-PROTOCOL-IES ::= {
-	{ ID id-E-RABSetupItemBearerSURes	 CRITICALITY ignore 	TYPE E-RABSetupItemBearerSURes 	PRESENCE mandatory },
+E-RABSetupItemBearerSUResIEs	S1AP-PROTOCOL-IES ::= {
+	{ ID id-E-RABSetupItemBearerSURes	 CRITICALITY ignore		TYPE E-RABSetupItemBearerSURes	PRESENCE mandatory },
 	...
 }

@ -946,8 +988,8 @@ E-RABModifyRequestIEs S1AP-PROTOCOL-IES ::= {

 E-RABToBeModifiedListBearerModReq ::= SEQUENCE (SIZE(1.. maxnoofE-RABs)) OF ProtocolIE-SingleContainer { {E-RABToBeModifiedItemBearerModReqIEs} }

-E-RABToBeModifiedItemBearerModReqIEs 	S1AP-PROTOCOL-IES ::= {
-	{ ID id-E-RABToBeModifiedItemBearerModReq	 CRITICALITY reject 	TYPE E-RABToBeModifiedItemBearerModReq 	PRESENCE mandatory },
+E-RABToBeModifiedItemBearerModReqIEs	S1AP-PROTOCOL-IES ::= {
+	{ ID id-E-RABToBeModifiedItemBearerModReq	 CRITICALITY reject		TYPE E-RABToBeModifiedItemBearerModReq	PRESENCE mandatory },
 	...
 }

@ -990,7 +1032,7 @@ E-RABModifyResponseIEs S1AP-PROTOCOL-IES ::= {

 E-RABModifyListBearerModRes ::= SEQUENCE (SIZE(1.. maxnoofE-RABs)) OF ProtocolIE-SingleContainer { {E-RABModifyItemBearerModResIEs} }

-E-RABModifyItemBearerModResIEs 	S1AP-PROTOCOL-IES ::= {
+E-RABModifyItemBearerModResIEs	S1AP-PROTOCOL-IES ::= {
 	{ ID id-E-RABModifyItemBearerModRes		CRITICALITY ignore	TYPE E-RABModifyItemBearerModRes		PRESENCE mandatory},
 	...
 }
@ -1144,7 +1186,12 @@ InitialContextSetupRequestIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-Masked-IMEISV					CRITICALITY ignore	TYPE Masked-IMEISV						PRESENCE optional}|
 	{ ID id-ExpectedUEBehaviour				CRITICALITY ignore	TYPE ExpectedUEBehaviour				PRESENCE optional}|
 	{ ID id-ProSeAuthorized					CRITICALITY ignore	TYPE ProSeAuthorized					PRESENCE optional}|
-	{ ID id-UEUserPlaneCIoTSupportIndicator	CRITICALITY ignore	TYPE UEUserPlaneCIoTSupportIndicator	PRESENCE optional},
+	{ ID id-UEUserPlaneCIoTSupportIndicator	CRITICALITY ignore	TYPE UEUserPlaneCIoTSupportIndicator	PRESENCE optional}|
+	{ ID id-V2XServicesAuthorized			CRITICALITY ignore	TYPE V2XServicesAuthorized				PRESENCE optional}|
+	{ ID id-UESidelinkAggregateMaximumBitrate		CRITICALITY ignore	TYPE UESidelinkAggregateMaximumBitrate	PRESENCE optional}|
+	{ ID id-EnhancedCoverageRestricted		CRITICALITY ignore	TYPE EnhancedCoverageRestricted			PRESENCE optional}|
+	{ ID id-CE-ModeBRestricted				CRITICALITY ignore	TYPE CE-ModeBRestricted					PRESENCE optional}|
+	{ ID id-PendingDataIndication			CRITICALITY ignore	TYPE PendingDataIndication				PRESENCE optional},
 	...
 }

@ -1153,7 +1200,7 @@ InitialContextSetupRequestIEs S1AP-PROTOCOL-IES ::= {

 E-RABToBeSetupListCtxtSUReq ::= SEQUENCE (SIZE(1.. maxnoofE-RABs)) OF ProtocolIE-SingleContainer { {E-RABToBeSetupItemCtxtSUReqIEs} }

-E-RABToBeSetupItemCtxtSUReqIEs 	S1AP-PROTOCOL-IES ::= {
+E-RABToBeSetupItemCtxtSUReqIEs	S1AP-PROTOCOL-IES ::= {
 	{ ID id-E-RABToBeSetupItemCtxtSUReq	CRITICALITY reject	TYPE E-RABToBeSetupItemCtxtSUReq		PRESENCE mandatory	},
 	...
 }
@ -1200,14 +1247,14 @@ InitialContextSetupResponseIEs S1AP-PROTOCOL-IES ::= {

 E-RABSetupListCtxtSURes ::= SEQUENCE (SIZE(1.. maxnoofE-RABs)) OF ProtocolIE-SingleContainer { {E-RABSetupItemCtxtSUResIEs} }

-E-RABSetupItemCtxtSUResIEs 	S1AP-PROTOCOL-IES ::= {
+E-RABSetupItemCtxtSUResIEs	S1AP-PROTOCOL-IES ::= {
 	{ ID id-E-RABSetupItemCtxtSURes		CRITICALITY ignore	TYPE E-RABSetupItemCtxtSURes	PRESENCE mandatory	},
 	...
 }

 E-RABSetupItemCtxtSURes ::= SEQUENCE {
 	e-RAB-ID						E-RAB-ID,
-	transportLayerAddress 			TransportLayerAddress,
+	transportLayerAddress			TransportLayerAddress,
 	gTP-TEID						GTP-TEID,
 	iE-Extensions					ProtocolExtensionContainer { {E-RABSetupItemCtxtSUResExtIEs} } OPTIONAL,
 	...
@ -1269,19 +1316,22 @@ PagingIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-AssistanceDataForPaging			CRITICALITY ignore	TYPE AssistanceDataForPaging			PRESENCE optional}|
 	{ ID id-Paging-eDRXInformation			CRITICALITY ignore	TYPE Paging-eDRXInformation				PRESENCE optional}|
 	{ ID id-extended-UEIdentityIndexValue	CRITICALITY ignore	TYPE Extended-UEIdentityIndexValue	PRESENCE optional}|
-	{ ID id-NB-IoT-Paging-eDRXInformation	CRITICALITY ignore	TYPE NB-IoT-Paging-eDRXInformation	PRESENCE optional},
+	{ ID id-NB-IoT-Paging-eDRXInformation	CRITICALITY ignore	TYPE NB-IoT-Paging-eDRXInformation	PRESENCE optional}|
+	{ ID id-NB-IoT-UEIdentityIndexValue		CRITICALITY ignore	TYPE NB-IoT-UEIdentityIndexValue		PRESENCE optional}|
+	{ ID id-EnhancedCoverageRestricted		CRITICALITY ignore	TYPE EnhancedCoverageRestricted			PRESENCE optional}|
+	{ ID id-CE-ModeBRestricted				CRITICALITY ignore	TYPE CE-ModeBRestricted					PRESENCE optional},
 	...
 }

 TAIList::= SEQUENCE (SIZE(1.. maxnoofTAIs)) OF ProtocolIE-SingleContainer {{TAIItemIEs}}

-TAIItemIEs 	S1AP-PROTOCOL-IES ::= {
+TAIItemIEs	S1AP-PROTOCOL-IES ::= {
 	{ ID id-TAIItem	 CRITICALITY ignore		TYPE TAIItem	PRESENCE mandatory },
 	...
 }

 TAIItem ::= SEQUENCE {
-	tAI 							TAI,
+	tAI								TAI,
 	iE-Extensions					ProtocolExtensionContainer { {TAIItemExtIEs} } OPTIONAL,
 	...
 }
@ -1386,7 +1436,11 @@ UEContextModificationRequestIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-CSGMembershipStatus				CRITICALITY ignore	TYPE CSGMembershipStatus				PRESENCE optional}|
 	{ ID id-RegisteredLAI					CRITICALITY ignore	TYPE LAI								PRESENCE optional}|
 	{ ID id-AdditionalCSFallbackIndicator	CRITICALITY ignore	TYPE AdditionalCSFallbackIndicator	PRESENCE conditional}|
-	{ ID id-ProSeAuthorized					CRITICALITY ignore	TYPE ProSeAuthorized					PRESENCE optional},
+	{ ID id-ProSeAuthorized					CRITICALITY ignore	TYPE ProSeAuthorized					PRESENCE optional}|
+	{ ID id-SRVCCOperationPossible			CRITICALITY ignore	TYPE SRVCCOperationPossible				PRESENCE optional}|
+	{ ID id-SRVCCOperationNotPossible		CRITICALITY ignore	TYPE SRVCCOperationNotPossible			PRESENCE optional}|
+	{ ID id-V2XServicesAuthorized			CRITICALITY ignore	TYPE V2XServicesAuthorized				PRESENCE optional}|
+	{ ID id-UESidelinkAggregateMaximumBitrate		CRITICALITY ignore	TYPE UESidelinkAggregateMaximumBitrate	PRESENCE optional},
 	...
 }
 -- **************************************************************
@ -1492,7 +1546,11 @@ DownlinkNASTransport-IEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-HandoverRestrictionList		CRITICALITY ignore	TYPE HandoverRestrictionList		PRESENCE optional}|
 	{ ID id-SubscriberProfileIDforRFP	CRITICALITY ignore	TYPE SubscriberProfileIDforRFP		PRESENCE optional}|
 	{ ID id-SRVCCOperationPossible		CRITICALITY ignore	TYPE SRVCCOperationPossible			PRESENCE optional}|
-	{ ID id-UERadioCapability			CRITICALITY ignore	TYPE UERadioCapability				PRESENCE optional},
+	{ ID id-UERadioCapability			CRITICALITY ignore	TYPE UERadioCapability				PRESENCE optional}|
+	{ ID id-DLNASPDUDeliveryAckRequest	CRITICALITY ignore	TYPE DLNASPDUDeliveryAckRequest	PRESENCE optional}|
+	{ ID id-EnhancedCoverageRestricted	CRITICALITY ignore	TYPE EnhancedCoverageRestricted			PRESENCE optional}|
+	{ ID id-CE-ModeBRestricted			CRITICALITY ignore	TYPE CE-ModeBRestricted			PRESENCE optional}|
+	{ ID id-PendingDataIndication		CRITICALITY ignore	TYPE PendingDataIndication			PRESENCE optional},
 	...
 }

@ -1526,7 +1584,11 @@ InitialUEMessage-IEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-SIPTO-L-GW-TransportLayerAddress	CRITICALITY ignore	TYPE TransportLayerAddress	PRESENCE optional}|
 	{ ID id-LHN-ID						CRITICALITY ignore	TYPE LHN-ID							PRESENCE optional}|
 	{ ID id-MME-Group-ID				CRITICALITY ignore	TYPE MME-Group-ID					PRESENCE optional}|
-	{ ID id-UE-Usage-Type				CRITICALITY ignore	TYPE UE-Usage-Type					PRESENCE optional},
+	{ ID id-UE-Usage-Type				CRITICALITY ignore	TYPE UE-Usage-Type					PRESENCE optional}|
+	{ ID id-CE-mode-B-SupportIndicator	CRITICALITY ignore	TYPE CE-mode-B-SupportIndicator		PRESENCE optional}|
+	{ ID id-DCN-ID						CRITICALITY ignore	TYPE DCN-ID							PRESENCE optional}|
+	{ ID id-Coverage-Level				CRITICALITY ignore	TYPE Coverage-Level				PRESENCE optional},
+
 	...
 }

@ -1593,6 +1655,24 @@ RerouteNASRequest-IEs S1AP-PROTOCOL-IES ::= {
 	...
 }

+
+-- **************************************************************
+--
+-- NAS DELIVERY INDICATION
+--
+-- **************************************************************
+
+NASDeliveryIndication ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container { { NASDeliveryIndicationIEs} },
+	...
+}
+
+NASDeliveryIndicationIEs 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},
+	...
+}
+
 -- **************************************************************
 --
 -- RESET ELEMENTARY PROCEDURE
@ -1656,8 +1736,8 @@ ResetAcknowledgeIEs S1AP-PROTOCOL-IES ::= {

 UE-associatedLogicalS1-ConnectionListResAck ::= SEQUENCE (SIZE(1.. maxnoofIndividualS1ConnectionsToReset)) 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 },
+UE-associatedLogicalS1-ConnectionItemResAck		S1AP-PROTOCOL-IES ::= {
+	{ ID id-UE-associatedLogicalS1-ConnectionItem		CRITICALITY ignore	TYPE UE-associatedLogicalS1-ConnectionItem		PRESENCE mandatory },
 	...
 }

@ -1732,7 +1812,8 @@ S1SetupResponseIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-RelativeMMECapacity			CRITICALITY ignore	TYPE RelativeMMECapacity		PRESENCE mandatory}|
 	{ ID id-MMERelaySupportIndicator	CRITICALITY ignore	TYPE MMERelaySupportIndicator	PRESENCE optional}|
 	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics		PRESENCE optional}|
-	{ ID id-UE-RetentionInformation		CRITICALITY ignore	TYPE UE-RetentionInformation	PRESENCE optional},
+	{ ID id-UE-RetentionInformation		CRITICALITY ignore	TYPE UE-RetentionInformation	PRESENCE optional}|
+	{ ID id-ServedDCNs					CRITICALITY ignore	TYPE ServedDCNs					PRESENCE optional},
 	...
 }

@ -1836,7 +1917,8 @@ MMEConfigurationUpdate ::= SEQUENCE {
 MMEConfigurationUpdateIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-MMEname					CRITICALITY ignore	TYPE MMEname				PRESENCE optional	}|
 	{ ID id-ServedGUMMEIs			CRITICALITY reject	TYPE ServedGUMMEIs			PRESENCE optional	}|
-	{ ID id-RelativeMMECapacity		CRITICALITY reject	TYPE RelativeMMECapacity	PRESENCE optional	},
+	{ ID id-RelativeMMECapacity		CRITICALITY reject	TYPE RelativeMMECapacity	PRESENCE optional	}|
+	{ ID id-ServedDCNs				CRITICALITY ignore	TYPE ServedDCNs				PRESENCE optional},
 	...
 }

@ -2088,8 +2170,8 @@ DeactivateTraceIEs S1AP-PROTOCOL-IES ::= {
 -- **************************************************************

 CellTrafficTrace ::= SEQUENCE {
-     protocolIEs		ProtocolIE-Container	{ { CellTrafficTraceIEs } },
-     ...
+protocolIEs		ProtocolIE-Container	{ { CellTrafficTraceIEs } },
+...
 }

 CellTrafficTraceIEs S1AP-PROTOCOL-IES ::= {
@ -2474,7 +2556,7 @@ DownlinkUEAssociatedLPPaTransport-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-Routing-ID				CRITICALITY reject	TYPE Routing-ID					PRESENCE mandatory	}|
-	{ ID id-LPPa-PDU    			CRITICALITY reject	TYPE LPPa-PDU					PRESENCE mandatory	},
+	{ ID id-LPPa-PDU				CRITICALITY reject	TYPE LPPa-PDU					PRESENCE mandatory	},
 	...
 }

@ -2635,7 +2717,7 @@ E-RABModificationConfirmIEs S1AP-PROTOCOL-IES ::= {

 E-RABModifyListBearerModConf ::= SEQUENCE (SIZE(1.. maxnoofE-RABs)) OF ProtocolIE-SingleContainer { {E-RABModifyItemBearerModConfIEs} }

-E-RABModifyItemBearerModConfIEs 	S1AP-PROTOCOL-IES ::= {
+E-RABModifyItemBearerModConfIEs		S1AP-PROTOCOL-IES ::= {
 	{ ID id-E-RABModifyItemBearerModConf		CRITICALITY ignore	TYPE E-RABModifyItemBearerModConf		PRESENCE mandatory},
 	...
 }
@ -2735,7 +2817,8 @@ UEContextSuspendResponse ::= SEQUENCE {
 UEContextSuspendResponseIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-MME-UE-S1AP-ID				CRITICALITY ignore	TYPE MME-UE-S1AP-ID				PRESENCE mandatory}|
 	{ ID id-eNB-UE-S1AP-ID				CRITICALITY ignore	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory}|
-	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics		PRESENCE optional},
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics		PRESENCE optional}|
+	{ ID id-SecurityContext				CRITICALITY reject	TYPE SecurityContext			PRESENCE optional},
 	...
 }

@ -2759,7 +2842,8 @@ UEContextResumeRequest ::= SEQUENCE {
 UEContextResumeRequestIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-MME-UE-S1AP-ID										CRITICALITY reject	TYPE MME-UE-S1AP-ID				PRESENCE mandatory}|
 	{ ID id-eNB-UE-S1AP-ID									CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory}|
-	{ ID id-E-RABFailedToResumeListResumeReq 				CRITICALITY reject	TYPE E-RABFailedToResumeListResumeReq		PRESENCE optional},
+	{ ID id-E-RABFailedToResumeListResumeReq				CRITICALITY reject	TYPE E-RABFailedToResumeListResumeReq		PRESENCE optional}|
+	{ ID id-RRC-Resume-Cause								CRITICALITY ignore	TYPE RRC-Establishment-Cause	PRESENCE optional},
 	...
 }

@ -2796,7 +2880,9 @@ UEContextResumeResponseIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-MME-UE-S1AP-ID						CRITICALITY ignore	TYPE MME-UE-S1AP-ID							PRESENCE mandatory}|
 	{ ID id-eNB-UE-S1AP-ID						CRITICALITY ignore	TYPE ENB-UE-S1AP-ID							PRESENCE mandatory}|
 	{ ID id-E-RABFailedToResumeListResumeRes	CRITICALITY reject	TYPE E-RABFailedToResumeListResumeRes		PRESENCE optional}|
-	{ ID id-CriticalityDiagnostics				CRITICALITY ignore	TYPE CriticalityDiagnostics					PRESENCE optional},
+	{ ID id-CriticalityDiagnostics				CRITICALITY ignore	TYPE CriticalityDiagnostics					PRESENCE optional}|
+	{ ID id-SecurityContext						CRITICALITY reject	TYPE SecurityContext						PRESENCE optional}|
+	{ ID id-PendingDataIndication				CRITICALITY ignore	TYPE PendingDataIndication					PRESENCE optional},
 	...
 }

@ -2851,7 +2937,85 @@ ConnectionEstablishmentIndication::= SEQUENCE {
 ConnectionEstablishmentIndicationIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-MME-UE-S1AP-ID				CRITICALITY ignore	TYPE MME-UE-S1AP-ID				PRESENCE mandatory}|
 	{ ID id-eNB-UE-S1AP-ID				CRITICALITY ignore	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory}|
-	{ ID id-UERadioCapability			CRITICALITY ignore	TYPE UERadioCapability			PRESENCE optional},
+	{ ID id-UERadioCapability			CRITICALITY ignore	TYPE UERadioCapability			PRESENCE optional }|
+	{ ID id-EnhancedCoverageRestricted	CRITICALITY ignore	TYPE EnhancedCoverageRestricted	PRESENCE optional }|
+	{ ID id-DL-CP-SecurityInformation	CRITICALITY ignore	TYPE DL-CP-SecurityInformation	PRESENCE optional }|
+	{ ID id-CE-ModeBRestricted			CRITICALITY ignore	TYPE CE-ModeBRestricted			PRESENCE optional},
+	...
+}
+
+-- **************************************************************
+--
+-- Retrieve UE Information 
+--
+-- **************************************************************
+
+RetrieveUEInformation ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { { RetrieveUEInformationIEs} },
+	...
+}
+
+RetrieveUEInformationIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-S-TMSI						CRITICALITY reject	TYPE S-TMSI				PRESENCE mandatory},
+...
+
+}
+
+
+-- **************************************************************
+
+-- UE Information Transfer
+--
+-- **************************************************************
+UEInformationTransfer ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {  UEInformationTransferIEs} },
+	...
+}
+
+UEInformationTransferIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-S-TMSI						CRITICALITY reject	TYPE S-TMSI						PRESENCE mandatory}|
+	{ ID id-UE-Level-QoS-Parameters		CRITICALITY ignore	TYPE E-RABLevelQoSParameters	PRESENCE optional}|
+	{ ID id-UERadioCapability			CRITICALITY ignore	TYPE UERadioCapability			PRESENCE optional}|
+	{ ID id-PendingDataIndication		CRITICALITY ignore	TYPE PendingDataIndication		PRESENCE optional},
+	...
+}
+
+
+-- **************************************************************
+--
+-- eNB CP Relocation Indication
+--
+-- **************************************************************
+
+ENBCPRelocationIndication ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container { { ENBCPRelocationIndicationIEs} },
+	...
+}
+
+ENBCPRelocationIndicationIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory}|
+	{ ID id-S-TMSI						CRITICALITY reject	TYPE S-TMSI						PRESENCE mandatory}|
+	{ ID id-EUTRAN-CGI					CRITICALITY ignore	TYPE EUTRAN-CGI					PRESENCE mandatory}|
+	{ ID id-TAI							CRITICALITY ignore	TYPE TAI						PRESENCE mandatory}|
+	{ ID id-UL-CP-SecurityInformation	CRITICALITY reject	TYPE UL-CP-SecurityInformation	PRESENCE mandatory},
+	...
+}
+
+
+-- **************************************************************
+--
+-- MME CP Relocation Indication
+--
+-- **************************************************************
+
+MMECPRelocationIndication ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container { { MMECPRelocationIndicationIEs} },
+	...
+}
+
+MMECPRelocationIndicationIEs 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},
 	...
 }

--- a/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/S1AP-PDU-Descriptions.asn
+++ b/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/S1AP-PDU-Descriptions.asn
@ -109,7 +109,12 @@ FROM S1AP-CommonDataTypes
 	UEContextResumeRequest,
 	UEContextResumeResponse,
 	UEContextResumeFailure,
-	ConnectionEstablishmentIndication
+	ConnectionEstablishmentIndication,
+	NASDeliveryIndication,
+	RetrieveUEInformation,
+	UEInformationTransfer,
+	ENBCPRelocationIndication,
+	MMECPRelocationIndication


 FROM S1AP-PDU-Contents
@ -170,7 +175,14 @@ FROM S1AP-PDU-Contents
 	id-PWSFailureIndication,
 	id-UEContextSuspend,
 	id-UEContextResume,
-	id-ConnectionEstablishmentIndication
+	id-ConnectionEstablishmentIndication,
+	id-NASDeliveryIndication,
+	id-RetrieveUEInformation,
+	id-UEInformationTransfer,
+	id-eNBCPRelocationIndication,
+	id-MMECPRelocationIndication
+
+
 FROM S1AP-Constants;


@ -184,8 +196,8 @@ S1AP-ELEMENTARY-PROCEDURE ::= CLASS {
 	&InitiatingMessage				,
 	&SuccessfulOutcome							OPTIONAL,
 	&UnsuccessfulOutcome						OPTIONAL,
-	&procedureCode				ProcedureCode 	UNIQUE,
-	&criticality				Criticality 	DEFAULT ignore
+	&procedureCode				ProcedureCode	UNIQUE,
+	&criticality				Criticality	DEFAULT ignore
 }
 WITH SYNTAX {
 	INITIATING MESSAGE			&InitiatingMessage
@ -242,7 +254,7 @@ S1AP-ELEMENTARY-PROCEDURES S1AP-ELEMENTARY-PROCEDURE ::= {
 S1AP-ELEMENTARY-PROCEDURES-CLASS-1 S1AP-ELEMENTARY-PROCEDURE ::= {
 	handoverPreparation				|
 	handoverResourceAllocation		|
-	pathSwitchRequest 				|
+	pathSwitchRequest				|
 	e-RABSetup						|
 	e-RABModify						|
 	e-RABRelease					|
@ -267,7 +279,7 @@ S1AP-ELEMENTARY-PROCEDURES-CLASS-1 S1AP-ELEMENTARY-PROCEDURE ::= {
 S1AP-ELEMENTARY-PROCEDURES-CLASS-2 S1AP-ELEMENTARY-PROCEDURE ::= {	
 	handoverNotification			|
 	e-RABReleaseIndication			|
-	paging 							|
+	paging							|
 	downlinkNASTransport			|
 	initialUEMessage				|
 	uplinkNASTransport				|
@ -301,7 +313,12 @@ S1AP-ELEMENTARY-PROCEDURES-CLASS-2 S1AP-ELEMENTARY-PROCEDURE ::= {
 	pWSRestartIndication			|
 	rerouteNASRequest				|
 	pWSFailureIndication						|
-	connectionEstablishmentIndication
+	connectionEstablishmentIndication	|
+	nASDeliveryIndication			|
+	retrieveUEInformation			|
+	uEInformationTransfer			|
+	eNBCPRelocationIndication					|
+	mMECPRelocationIndication
 }

 -- **************************************************************
@ -370,7 +387,7 @@ e-RABReleaseIndication S1AP-ELEMENTARY-PROCEDURE ::= {
 initialContextSetup S1AP-ELEMENTARY-PROCEDURE ::= {
 	INITIATING MESSAGE		InitialContextSetupRequest
 	SUCCESSFUL OUTCOME		InitialContextSetupResponse
-	UNSUCCESSFUL OUTCOME 	InitialContextSetupFailure
+	UNSUCCESSFUL OUTCOME	InitialContextSetupFailure
 	PROCEDURE CODE			id-InitialContextSetup
 	CRITICALITY				reject
 }
@ -433,7 +450,7 @@ errorIndication S1AP-ELEMENTARY-PROCEDURE ::= {
 s1Setup S1AP-ELEMENTARY-PROCEDURE ::= {
 	INITIATING MESSAGE		S1SetupRequest
 	SUCCESSFUL OUTCOME		S1SetupResponse
-	UNSUCCESSFUL OUTCOME 	S1SetupFailure
+	UNSUCCESSFUL OUTCOME	S1SetupFailure
 	PROCEDURE CODE			id-S1Setup
 	CRITICALITY				reject
 }
@ -441,7 +458,7 @@ s1Setup S1AP-ELEMENTARY-PROCEDURE ::= {
 eNBConfigurationUpdate S1AP-ELEMENTARY-PROCEDURE ::= {
 	INITIATING MESSAGE		ENBConfigurationUpdate
 	SUCCESSFUL OUTCOME		ENBConfigurationUpdateAcknowledge
-	UNSUCCESSFUL OUTCOME 	ENBConfigurationUpdateFailure
+	UNSUCCESSFUL OUTCOME	ENBConfigurationUpdateFailure
 	PROCEDURE CODE			id-ENBConfigurationUpdate
 	CRITICALITY				reject
 }
@ -449,7 +466,7 @@ eNBConfigurationUpdate S1AP-ELEMENTARY-PROCEDURE ::= {
 mMEConfigurationUpdate S1AP-ELEMENTARY-PROCEDURE ::= {
 	INITIATING MESSAGE		MMEConfigurationUpdate
 	SUCCESSFUL OUTCOME		MMEConfigurationUpdateAcknowledge
-	UNSUCCESSFUL OUTCOME 	MMEConfigurationUpdateFailure
+	UNSUCCESSFUL OUTCOME	MMEConfigurationUpdateFailure
 	PROCEDURE CODE			id-MMEConfigurationUpdate
 	CRITICALITY				reject
 }
@ -469,7 +486,7 @@ uplinkS1cdma2000tunnelling S1AP-ELEMENTARY-PROCEDURE ::= {
 uEContextModification S1AP-ELEMENTARY-PROCEDURE ::= {
 	INITIATING MESSAGE		UEContextModificationRequest
 	SUCCESSFUL OUTCOME		UEContextModificationResponse
-	UNSUCCESSFUL OUTCOME 	UEContextModificationFailure
+	UNSUCCESSFUL OUTCOME	UEContextModificationFailure
 	PROCEDURE CODE			id-UEContextModification
 	CRITICALITY				reject
 }
@ -517,9 +534,9 @@ traceFailureIndication S1AP-ELEMENTARY-PROCEDURE ::= {
 	CRITICALITY				ignore
 }
 cellTrafficTrace S1AP-ELEMENTARY-PROCEDURE ::={
-     INITIATING MESSAGE		CellTrafficTrace
-     PROCEDURE CODE			id-CellTrafficTrace
-     CRITICALITY				ignore
+INITIATING MESSAGE		CellTrafficTrace
+PROCEDURE CODE			id-CellTrafficTrace
+CRITICALITY				ignore
 }

 locationReportingControl S1AP-ELEMENTARY-PROCEDURE ::= {
@ -669,7 +686,7 @@ uEContextSuspend S1AP-ELEMENTARY-PROCEDURE ::= {
 uEContextResume S1AP-ELEMENTARY-PROCEDURE ::= {
 	INITIATING MESSAGE		UEContextResumeRequest
 	SUCCESSFUL OUTCOME		UEContextResumeResponse
-	UNSUCCESSFUL OUTCOME 	UEContextResumeFailure
+	UNSUCCESSFUL OUTCOME	UEContextResumeFailure
 	PROCEDURE CODE			id-UEContextResume
 	CRITICALITY				reject
 }
@ -680,4 +697,35 @@ connectionEstablishmentIndication S1AP-ELEMENTARY-PROCEDURE ::= {
 	CRITICALITY				reject
 }

+nASDeliveryIndication S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		NASDeliveryIndication
+	PROCEDURE CODE			id-NASDeliveryIndication
+	CRITICALITY				ignore
+}
+
+retrieveUEInformation S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		RetrieveUEInformation
+	PROCEDURE CODE			id-RetrieveUEInformation
+	CRITICALITY				reject
+}
+
+uEInformationTransfer S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		UEInformationTransfer
+	PROCEDURE CODE			id-UEInformationTransfer
+	CRITICALITY				reject
+}
+
+eNBCPRelocationIndication S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		ENBCPRelocationIndication
+	PROCEDURE CODE			id-eNBCPRelocationIndication
+	CRITICALITY				reject
+}
+
+mMECPRelocationIndication S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		MMECPRelocationIndication
+	PROCEDURE CODE			id-MMECPRelocationIndication
+	CRITICALITY				reject
+}
+
+
 END
--- a/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/extract.py
+++ b/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/extract.py
@ -6,8 +6,15 @@
 import codecs
 import re

+import sys
+if sys.platform == 'win32':
+    eollen = 2
+else:
+    eollen = 1
+
+
 dirpath = './'
-path = dirpath + '36413-d30.txt'
+path = dirpath + '36413-e80.txt'

 # ASN.1 modules are described within specific sections
 sections = [
@ -34,11 +41,11 @@ def main():
    module_name = None
    
    for line in speclines:
-        if line[:-2] in sections:
+        if line[:-eollen] in sections:
            if inside:
                raise(Exception('ASN.1 extraction failed: %s' % line))
            inside, start = True, True
-        elif line[:-2] == 'END':
+        elif line[:-eollen] == 'END':
            module.append(line)
            inside = False
            print('%s.asn' % module_name)
--- a/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/load_obj.txt
+++ b/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/load_obj.txt
@ -62,6 +62,11 @@ S1AP-Constants.id-UEContextModificationIndication
 S1AP-Constants.id-ConnectionEstablishmentIndication
 S1AP-Constants.id-UEContextSuspend
 S1AP-Constants.id-UEContextResume
+S1AP-Constants.id-NASDeliveryIndication
+S1AP-Constants.id-RetrieveUEInformation
+S1AP-Constants.id-UEInformationTransfer
+S1AP-Constants.id-eNBCPRelocationIndication
+S1AP-Constants.id-MMECPRelocationIndication
 S1AP-Constants.maxPrivateIEs
 S1AP-Constants.maxProtocolExtensions
 S1AP-Constants.maxProtocolIEs
@ -81,6 +86,7 @@ S1AP-Constants.maxnoofCells
 S1AP-Constants.maxnoofCellsineNB
 S1AP-Constants.maxnoofTAIforWarning
 S1AP-Constants.maxnoofCellID
+S1AP-Constants.maxnoofDCNs
 S1AP-Constants.maxnoofEmergencyAreaID
 S1AP-Constants.maxnoofCellinTAI
 S1AP-Constants.maxnoofCellinEAI
@ -322,7 +328,23 @@ S1AP-Constants.id-E-RABFailedToResumeItemResumeReq
 S1AP-Constants.id-E-RABFailedToResumeListResumeRes
 S1AP-Constants.id-E-RABFailedToResumeItemResumeRes
 S1AP-Constants.id-NB-IoT-Paging-eDRXInformation
+S1AP-Constants.id-V2XServicesAuthorized
 S1AP-Constants.id-UEUserPlaneCIoTSupportIndicator
+S1AP-Constants.id-CE-mode-B-SupportIndicator
+S1AP-Constants.id-SRVCCOperationNotPossible
+S1AP-Constants.id-NB-IoT-UEIdentityIndexValue
+S1AP-Constants.id-RRC-Resume-Cause
+S1AP-Constants.id-DCN-ID
+S1AP-Constants.id-ServedDCNs
+S1AP-Constants.id-UESidelinkAggregateMaximumBitrate
+S1AP-Constants.id-DLNASPDUDeliveryAckRequest
+S1AP-Constants.id-Coverage-Level
+S1AP-Constants.id-EnhancedCoverageRestricted
+S1AP-Constants.id-UE-Level-QoS-Parameters
+S1AP-Constants.id-DL-CP-SecurityInformation
+S1AP-Constants.id-UL-CP-SecurityInformation
+S1AP-Constants.id-CE-ModeBRestricted
+S1AP-Constants.id-PendingDataIndication
 S1AP-Containers.S1AP-PROTOCOL-IES
 S1AP-Containers.S1AP-PROTOCOL-IES-PAIR
 S1AP-Containers.S1AP-PROTOCOL-EXTENSION
@ -356,6 +378,7 @@ S1AP-IEs.CauseNas
 S1AP-IEs.CellAccessMode
 S1AP-IEs.CellIdentifierAndCELevelForCECapableUEs-ExtIEs
 S1AP-IEs.CELevel
+S1AP-IEs.CE-mode-B-SupportIndicator
 S1AP-IEs.CellIdentity
 S1AP-IEs.CellID-Broadcast
 S1AP-IEs.CellID-Broadcast-Item-ExtIEs
@ -389,13 +412,20 @@ S1AP-IEs.CSGMembershipStatus
 S1AP-IEs.COUNTvalue-ExtIEs
 S1AP-IEs.COUNTValueExtended-ExtIEs
 S1AP-IEs.COUNTvaluePDCP-SNlength18-ExtIEs
+S1AP-IEs.Coverage-Level
 S1AP-IEs.CriticalityDiagnostics-ExtIEs
 S1AP-IEs.CriticalityDiagnostics-IE-List
 S1AP-IEs.CriticalityDiagnostics-IE-Item-ExtIEs
 S1AP-IEs.DataCodingScheme
+S1AP-IEs.DCN-ID
+S1AP-IEs.ServedDCNs
+S1AP-IEs.ServedDCNsItem-ExtIEs
+S1AP-IEs.DL-CP-SecurityInformation-ExtIEs
 S1AP-IEs.DL-Forwarding
+S1AP-IEs.DL-NAS-MAC
 S1AP-IEs.Direct-Forwarding-Path-Availability
 S1AP-IEs.Data-Forwarding-Not-Possible
+S1AP-IEs.DLNASPDUDeliveryAckRequest
 S1AP-IEs.EARFCN
 S1AP-IEs.ECGIList
 S1AP-IEs.PWSfailedECGIList
@ -418,6 +448,8 @@ S1AP-IEs.ENB-UE-S1AP-ID
 S1AP-IEs.ENBname
 S1AP-IEs.ENBX2TLAs
 S1AP-IEs.EncryptionAlgorithms
+S1AP-IEs.EnhancedCoverageRestricted
+S1AP-IEs.CE-ModeBRestricted
 S1AP-IEs.EventType
 S1AP-IEs.E-RAB-ID
 S1AP-IEs.E-RABInformationListIEs
@ -517,6 +549,7 @@ S1AP-IEs.NB-IoT-DefaultPagingDRX
 S1AP-IEs.NB-IoT-Paging-eDRXInformation-ExtIEs
 S1AP-IEs.NB-IoT-Paging-eDRX-Cycle
 S1AP-IEs.NB-IoT-PagingTimeWindow
+S1AP-IEs.NB-IoT-UEIdentityIndexValue
 S1AP-IEs.NextPagingAreaScope
 S1AP-IEs.NumberofBroadcastRequest
 S1AP-IEs.NumberOfBroadcasts
@ -533,6 +566,7 @@ S1AP-IEs.PagingPriority
 S1AP-IEs.PDCP-SN
 S1AP-IEs.PDCP-SNExtended
 S1AP-IEs.PDCP-SNlength18
+S1AP-IEs.PendingDataIndication
 S1AP-IEs.M1PeriodicReporting-ExtIEs
 S1AP-IEs.PLMNidentity
 S1AP-IEs.Port-Number
@ -585,6 +619,7 @@ S1AP-IEs.SynchronisationInformation-ExtIEs
 S1AP-IEs.Source-ToTarget-TransparentContainer
 S1AP-IEs.SourceBSS-ToTargetBSS-TransparentContainer
 S1AP-IEs.SourceeNB-ID-ExtIEs
+S1AP-IEs.SRVCCOperationNotPossible
 S1AP-IEs.SRVCCOperationPossible
 S1AP-IEs.SRVCCHOIndication
 S1AP-IEs.SourceeNB-ToTargeteNB-TransparentContainer-ExtIEs
@ -651,10 +686,17 @@ S1AP-IEs.UERadioCapabilityForPaging
 S1AP-IEs.UE-RLF-Report-Container
 S1AP-IEs.UE-RLF-Report-Container-for-extended-bands
 S1AP-IEs.UESecurityCapabilities-ExtIEs
+S1AP-IEs.UE-Sidelink-Aggregate-MaximumBitrates-ExtIEs
 S1AP-IEs.UE-Usage-Type
+S1AP-IEs.UL-CP-SecurityInformation-ExtIEs
+S1AP-IEs.UL-NAS-MAC
+S1AP-IEs.UL-NAS-Count
 S1AP-IEs.UserLocationInformation-ExtIEs
 S1AP-IEs.UEUserPlaneCIoTSupportIndicator
 S1AP-IEs.VoiceSupportMatchIndicator
+S1AP-IEs.V2XServicesAuthorized-ExtIEs
+S1AP-IEs.VehicleUE
+S1AP-IEs.PedestrianUE
 S1AP-IEs.WarningAreaList
 S1AP-IEs.WarningType
 S1AP-IEs.WarningSecurityInfo
@ -723,6 +765,7 @@ S1AP-PDU-Contents.InitialUEMessage-IEs
 S1AP-PDU-Contents.UplinkNASTransport-IEs
 S1AP-PDU-Contents.NASNonDeliveryIndication-IEs
 S1AP-PDU-Contents.RerouteNASRequest-IEs
+S1AP-PDU-Contents.NASDeliveryIndicationIEs
 S1AP-PDU-Contents.ResetIEs
 S1AP-PDU-Contents.ResetType
 S1AP-PDU-Contents.ResetAll
@ -786,6 +829,10 @@ S1AP-PDU-Contents.E-RABFailedToResumeItemResumeResIEs
 S1AP-PDU-Contents.E-RABFailedToResumeItemResumeRes-ExtIEs
 S1AP-PDU-Contents.UEContextResumeFailureIEs
 S1AP-PDU-Contents.ConnectionEstablishmentIndicationIEs
+S1AP-PDU-Contents.RetrieveUEInformationIEs
+S1AP-PDU-Contents.UEInformationTransferIEs
+S1AP-PDU-Contents.ENBCPRelocationIndicationIEs
+S1AP-PDU-Contents.MMECPRelocationIndicationIEs
 S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURE
 S1AP-PDU-Descriptions.S1AP-PDU
 S1AP-PDU-Descriptions.handoverPreparation
@ -845,6 +892,11 @@ S1AP-PDU-Descriptions.pWSFailureIndication
 S1AP-PDU-Descriptions.uEContextSuspend
 S1AP-PDU-Descriptions.uEContextResume
 S1AP-PDU-Descriptions.connectionEstablishmentIndication
+S1AP-PDU-Descriptions.nASDeliveryIndication
+S1AP-PDU-Descriptions.retrieveUEInformation
+S1AP-PDU-Descriptions.uEInformationTransfer
+S1AP-PDU-Descriptions.eNBCPRelocationIndication
+S1AP-PDU-Descriptions.mMECPRelocationIndication
 SonTransfer-IEs.SONtransferApplicationIdentity
 SonTransfer-IEs.SONtransferRequestContainer
 SonTransfer-IEs.SONtransferResponseContainer
@ -919,6 +971,8 @@ S1AP-IEs.COUNTValueExtended
 S1AP-IEs.COUNTvaluePDCP-SNlength18
 S1AP-IEs.CriticalityDiagnostics
 S1AP-IEs.CriticalityDiagnostics-IE-Item
+S1AP-IEs.ServedDCNsItem
+S1AP-IEs.DL-CP-SecurityInformation
 S1AP-IEs.EmergencyAreaID-Broadcast-Item
 S1AP-IEs.EmergencyAreaID-Cancelled-Item
 S1AP-IEs.CompletedCellinEAI-Item
@ -997,7 +1051,10 @@ S1AP-IEs.UEAggregateMaximumBitrate
 S1AP-IEs.UE-S1AP-ID-pair
 S1AP-IEs.UE-associatedLogicalS1-ConnectionItem
 S1AP-IEs.UESecurityCapabilities
+S1AP-IEs.UESidelinkAggregateMaximumBitrate
+S1AP-IEs.UL-CP-SecurityInformation
 S1AP-IEs.UserLocationInformation
+S1AP-IEs.V2XServicesAuthorized
 S1AP-IEs.X2TNLConfigurationInfo
 S1AP-IEs.ENBX2ExtTLA
 S1AP-PDU-Contents.E-RAB-IE-ContainerList
@ -1062,6 +1119,7 @@ S1AP-PDU-Contents.InitialUEMessage
 S1AP-PDU-Contents.UplinkNASTransport
 S1AP-PDU-Contents.NASNonDeliveryIndication
 S1AP-PDU-Contents.RerouteNASRequest
+S1AP-PDU-Contents.NASDeliveryIndication
 S1AP-PDU-Contents.Reset
 S1AP-PDU-Contents.UE-associatedLogicalS1-ConnectionListRes
 S1AP-PDU-Contents.ResetAcknowledge
@ -1123,6 +1181,10 @@ S1AP-PDU-Contents.E-RABFailedToResumeListResumeRes
 S1AP-PDU-Contents.E-RABFailedToResumeItemResumeRes
 S1AP-PDU-Contents.UEContextResumeFailure
 S1AP-PDU-Contents.ConnectionEstablishmentIndication
+S1AP-PDU-Contents.RetrieveUEInformation
+S1AP-PDU-Contents.UEInformationTransfer
+S1AP-PDU-Contents.ENBCPRelocationIndication
+S1AP-PDU-Contents.MMECPRelocationIndication
 S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-1
 S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-2
 SonTransfer-IEs.RequestedCellList
--- a/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/rel_13/36413-d30.txt
+++ b/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/rel_13/36413-d30.txt
--- a/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/rel_13/S1AP-CommonDataTypes.asn
+++ b/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/rel_13/S1AP-CommonDataTypes.asn
@ -0,0 +1,32 @@
+-- **************************************************************
+--
+-- Common definitions
+--
+-- **************************************************************
+
+S1AP-CommonDataTypes {
+itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) 
+eps-Access (21) modules (3) s1ap (1) version1 (1) s1ap-CommonDataTypes (3) }
+
+DEFINITIONS AUTOMATIC TAGS ::= 
+
+BEGIN
+
+Criticality		::= ENUMERATED { reject, ignore, notify }
+
+Presence		::= ENUMERATED { optional, conditional, mandatory }
+
+PrivateIE-ID	::= CHOICE {
+	local				INTEGER (0..65535),
+	global				OBJECT IDENTIFIER
+}
+
+ProcedureCode		::= INTEGER (0..255)
+
+ProtocolExtensionID	::= INTEGER (0..65535)
+
+ProtocolIE-ID		::= INTEGER (0..65535)
+
+TriggeringMessage	::= ENUMERATED { initiating-message, successful-outcome, unsuccessfull-outcome }
+
+END
--- a/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/rel_13/S1AP-Constants.asn
+++ b/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/rel_13/S1AP-Constants.asn
@ -0,0 +1,372 @@
+-- **************************************************************
+--
+-- Constant definitions
+--
+-- **************************************************************
+
+S1AP-Constants { 
+itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) 
+eps-Access (21) modules (3) s1ap (1) version1 (1) s1ap-Constants (4) } 
+
+DEFINITIONS AUTOMATIC TAGS ::= 
+
+BEGIN
+
+-- **************************************************************
+--
+-- IE parameter types from other modules.
+--
+-- **************************************************************
+
+IMPORTS
+	ProcedureCode,
+	ProtocolIE-ID
+
+FROM S1AP-CommonDataTypes;
+
+
+-- **************************************************************
+--
+-- Elementary Procedures
+--
+-- **************************************************************
+
+id-HandoverPreparation						ProcedureCode ::= 0
+id-HandoverResourceAllocation				ProcedureCode ::= 1
+id-HandoverNotification						ProcedureCode ::= 2
+id-PathSwitchRequest						ProcedureCode ::= 3
+id-HandoverCancel							ProcedureCode ::= 4
+id-E-RABSetup								ProcedureCode ::= 5
+id-E-RABModify								ProcedureCode ::= 6
+id-E-RABRelease								ProcedureCode ::= 7
+id-E-RABReleaseIndication					ProcedureCode ::= 8
+id-InitialContextSetup						ProcedureCode ::= 9
+id-Paging									ProcedureCode ::= 10
+id-downlinkNASTransport						ProcedureCode ::= 11
+id-initialUEMessage							ProcedureCode ::= 12
+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-DownlinkS1cdma2000tunnelling				ProcedureCode ::= 19
+id-UplinkS1cdma2000tunnelling				ProcedureCode ::= 20
+id-UEContextModification					ProcedureCode ::= 21
+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
+id-OverloadStart							ProcedureCode ::= 34
+id-OverloadStop								ProcedureCode ::= 35
+id-WriteReplaceWarning						ProcedureCode ::= 36
+id-eNBDirectInformationTransfer				ProcedureCode ::= 37
+id-MMEDirectInformationTransfer				ProcedureCode ::= 38
+id-PrivateMessage							ProcedureCode ::= 39
+id-eNBConfigurationTransfer					ProcedureCode ::= 40
+id-MMEConfigurationTransfer					ProcedureCode ::= 41
+id-CellTrafficTrace							ProcedureCode ::= 42
+id-Kill										ProcedureCode ::= 43
+id-downlinkUEAssociatedLPPaTransport		ProcedureCode ::= 44
+id-uplinkUEAssociatedLPPaTransport			ProcedureCode ::= 45
+id-downlinkNonUEAssociatedLPPaTransport		ProcedureCode ::= 46
+id-uplinkNonUEAssociatedLPPaTransport		ProcedureCode ::= 47
+id-UERadioCapabilityMatch					ProcedureCode ::= 48
+id-PWSRestartIndication						ProcedureCode ::= 49
+id-E-RABModificationIndication				ProcedureCode ::= 50
+id-PWSFailureIndication						ProcedureCode ::= 51
+id-RerouteNASRequest						ProcedureCode ::= 52
+id-UEContextModificationIndication			ProcedureCode ::= 53
+id-ConnectionEstablishmentIndication		ProcedureCode ::= 54
+id-UEContextSuspend							ProcedureCode ::= 55
+id-UEContextResume							ProcedureCode ::= 56
+
+-- **************************************************************
+--
+-- Extension constants
+--
+-- **************************************************************
+
+maxPrivateIEs							INTEGER ::= 65535
+maxProtocolExtensions					INTEGER ::= 65535
+maxProtocolIEs							INTEGER ::= 65535
+-- **************************************************************
+--
+-- Lists
+--
+-- **************************************************************
+
+maxnoofCSGs								INTEGER ::= 256
+maxnoofE-RABs							INTEGER ::= 256
+maxnoofTAIs								INTEGER ::= 256
+maxnoofTACs								INTEGER ::= 256
+maxnoofErrors							INTEGER ::= 256
+maxnoofBPLMNs							INTEGER ::= 6
+maxnoofPLMNsPerMME						INTEGER ::= 32
+maxnoofEPLMNs							INTEGER ::= 15
+maxnoofEPLMNsPlusOne					INTEGER ::= 16
+maxnoofForbLACs							INTEGER ::= 4096
+maxnoofForbTACs							INTEGER ::= 4096
+maxnoofIndividualS1ConnectionsToReset	INTEGER ::= 256
+maxnoofCells							INTEGER ::= 16
+maxnoofCellsineNB						INTEGER ::= 256
+maxnoofTAIforWarning					INTEGER ::= 65535 
+maxnoofCellID							INTEGER ::= 65535 
+maxnoofEmergencyAreaID					INTEGER ::= 65535 
+maxnoofCellinTAI						INTEGER ::= 65535 
+maxnoofCellinEAI						INTEGER ::= 65535 
+maxnoofeNBX2TLAs						INTEGER ::= 2
+maxnoofeNBX2ExtTLAs						INTEGER ::= 16
+maxnoofeNBX2GTPTLAs						INTEGER ::= 16
+maxnoofRATs								INTEGER ::= 8
+maxnoofGroupIDs							INTEGER ::= 65535
+maxnoofMMECs							INTEGER ::= 256
+maxnoofCellIDforMDT						INTEGER ::= 32
+maxnoofTAforMDT							INTEGER ::= 8
+maxnoofMDTPLMNs							INTEGER ::= 16
+maxnoofCellsforRestart					INTEGER ::= 256
+maxnoofRestartTAIs						INTEGER ::= 2048
+maxnoofRestartEmergencyAreaIDs			INTEGER ::= 256
+maxEARFCN								INTEGER ::= 262143
+maxnoofMBSFNAreaMDT						INTEGER ::= 8
+maxnoofRecommendedCells					INTEGER ::= 16
+maxnoofRecommendedENBs					INTEGER ::= 16
+
+-- **************************************************************
+--
+-- IEs
+--
+-- **************************************************************
+
+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-eNB-UE-S1AP-ID									ProtocolIE-ID ::= 8
+id-E-RABSubjecttoDataForwardingList					ProtocolIE-ID ::= 12
+id-E-RABtoReleaseListHOCmd							ProtocolIE-ID ::= 13
+id-E-RABDataForwardingItem							ProtocolIE-ID ::= 14
+id-E-RABReleaseItemBearerRelComp					ProtocolIE-ID ::= 15
+id-E-RABToBeSetupListBearerSUReq					ProtocolIE-ID ::= 16
+id-E-RABToBeSetupItemBearerSUReq					ProtocolIE-ID ::= 17
+id-E-RABAdmittedList								ProtocolIE-ID ::= 18
+id-E-RABFailedToSetupListHOReqAck					ProtocolIE-ID ::= 19
+id-E-RABAdmittedItem								ProtocolIE-ID ::= 20
+id-E-RABFailedtoSetupItemHOReqAck					ProtocolIE-ID ::= 21
+id-E-RABToBeSwitchedDLList							ProtocolIE-ID ::= 22
+id-E-RABToBeSwitchedDLItem							ProtocolIE-ID ::= 23
+id-E-RABToBeSetupListCtxtSUReq						ProtocolIE-ID ::= 24
+id-TraceActivation									ProtocolIE-ID ::= 25
+id-NAS-PDU											ProtocolIE-ID ::= 26
+id-E-RABToBeSetupItemHOReq							ProtocolIE-ID ::= 27
+id-E-RABSetupListBearerSURes						ProtocolIE-ID ::= 28
+id-E-RABFailedToSetupListBearerSURes				ProtocolIE-ID ::= 29
+id-E-RABToBeModifiedListBearerModReq				ProtocolIE-ID ::= 30
+id-E-RABModifyListBearerModRes						ProtocolIE-ID ::= 31
+id-E-RABFailedToModifyList							ProtocolIE-ID ::= 32
+id-E-RABToBeReleasedList							ProtocolIE-ID ::= 33
+id-E-RABFailedToReleaseList							ProtocolIE-ID ::= 34
+id-E-RABItem										ProtocolIE-ID ::= 35
+id-E-RABToBeModifiedItemBearerModReq				ProtocolIE-ID ::= 36
+id-E-RABModifyItemBearerModRes						ProtocolIE-ID ::= 37
+id-E-RABReleaseItem									ProtocolIE-ID ::= 38
+id-E-RABSetupItemBearerSURes						ProtocolIE-ID ::= 39
+id-SecurityContext									ProtocolIE-ID ::= 40
+id-HandoverRestrictionList							ProtocolIE-ID ::= 41
+id-UEPagingID										ProtocolIE-ID ::= 43
+id-pagingDRX										ProtocolIE-ID ::= 44
+id-TAIList											ProtocolIE-ID ::= 46
+id-TAIItem											ProtocolIE-ID ::= 47
+id-E-RABFailedToSetupListCtxtSURes					ProtocolIE-ID ::= 48
+id-E-RABReleaseItemHOCmd							ProtocolIE-ID ::= 49
+id-E-RABSetupItemCtxtSURes							ProtocolIE-ID ::= 50
+id-E-RABSetupListCtxtSURes							ProtocolIE-ID ::= 51
+id-E-RABToBeSetupItemCtxtSUReq						ProtocolIE-ID ::= 52
+id-E-RABToBeSetupListHOReq							ProtocolIE-ID ::= 53
+id-GERANtoLTEHOInformationRes						ProtocolIE-ID ::= 55
+id-UTRANtoLTEHOInformationRes						ProtocolIE-ID ::= 57
+id-CriticalityDiagnostics 							ProtocolIE-ID ::= 58
+id-Global-ENB-ID									ProtocolIE-ID ::= 59
+id-eNBname											ProtocolIE-ID ::= 60
+id-MMEname											ProtocolIE-ID ::= 61
+id-ServedPLMNs										ProtocolIE-ID ::= 63
+id-SupportedTAs										ProtocolIE-ID ::= 64
+id-TimeToWait										ProtocolIE-ID ::= 65
+id-uEaggregateMaximumBitrate						ProtocolIE-ID ::= 66
+id-TAI												ProtocolIE-ID ::= 67
+id-E-RABReleaseListBearerRelComp					ProtocolIE-ID ::= 69
+id-cdma2000PDU										ProtocolIE-ID ::= 70
+id-cdma2000RATType									ProtocolIE-ID ::= 71
+id-cdma2000SectorID									ProtocolIE-ID ::= 72
+id-SecurityKey										ProtocolIE-ID ::= 73
+id-UERadioCapability								ProtocolIE-ID ::= 74
+id-GUMMEI-ID										ProtocolIE-ID ::= 75
+id-E-RABInformationListItem							ProtocolIE-ID ::= 78
+id-Direct-Forwarding-Path-Availability				ProtocolIE-ID ::= 79
+id-UEIdentityIndexValue								ProtocolIE-ID ::= 80
+id-cdma2000HOStatus									ProtocolIE-ID ::= 83
+id-cdma2000HORequiredIndication						ProtocolIE-ID ::= 84
+id-E-UTRAN-Trace-ID									ProtocolIE-ID ::= 86
+id-RelativeMMECapacity								ProtocolIE-ID ::= 87
+id-SourceMME-UE-S1AP-ID								ProtocolIE-ID ::= 88
+id-Bearers-SubjectToStatusTransfer-Item				ProtocolIE-ID ::= 89
+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-E-RABToBeSwitchedULItem							ProtocolIE-ID ::= 94
+id-E-RABToBeSwitchedULList							ProtocolIE-ID ::= 95
+id-S-TMSI											ProtocolIE-ID ::= 96
+id-cdma2000OneXRAND									ProtocolIE-ID ::= 97
+id-RequestType										ProtocolIE-ID ::= 98
+id-UE-S1AP-IDs										ProtocolIE-ID ::= 99
+id-EUTRAN-CGI										ProtocolIE-ID ::= 100
+id-OverloadResponse									ProtocolIE-ID ::= 101
+id-cdma2000OneXSRVCCInfo							ProtocolIE-ID ::= 102
+id-E-RABFailedToBeReleasedList						ProtocolIE-ID ::= 103
+id-Source-ToTarget-TransparentContainer				ProtocolIE-ID ::= 104
+id-ServedGUMMEIs									ProtocolIE-ID ::= 105
+id-SubscriberProfileIDforRFP						ProtocolIE-ID ::= 106
+id-UESecurityCapabilities							ProtocolIE-ID ::= 107
+id-CSFallbackIndicator								ProtocolIE-ID ::= 108
+id-CNDomain											ProtocolIE-ID ::= 109
+id-E-RABReleasedList								ProtocolIE-ID ::= 110
+id-MessageIdentifier								ProtocolIE-ID ::= 111
+id-SerialNumber										ProtocolIE-ID ::= 112
+id-WarningAreaList									ProtocolIE-ID ::= 113
+id-RepetitionPeriod									ProtocolIE-ID ::= 114
+id-NumberofBroadcastRequest							ProtocolIE-ID ::= 115
+id-WarningType										ProtocolIE-ID ::= 116
+id-WarningSecurityInfo								ProtocolIE-ID ::= 117
+id-DataCodingScheme									ProtocolIE-ID ::= 118
+id-WarningMessageContents							ProtocolIE-ID ::= 119
+id-BroadcastCompletedAreaList						ProtocolIE-ID ::= 120
+id-Inter-SystemInformationTransferTypeEDT			ProtocolIE-ID ::= 121
+id-Inter-SystemInformationTransferTypeMDT			ProtocolIE-ID ::= 122
+id-Target-ToSource-TransparentContainer				ProtocolIE-ID ::= 123
+id-SRVCCOperationPossible							ProtocolIE-ID ::= 124
+id-SRVCCHOIndication								ProtocolIE-ID ::= 125
+id-NAS-DownlinkCount								ProtocolIE-ID ::= 126
+id-CSG-Id											ProtocolIE-ID ::= 127
+id-CSG-IdList										ProtocolIE-ID ::= 128
+id-SONConfigurationTransferECT						ProtocolIE-ID ::= 129
+id-SONConfigurationTransferMCT						ProtocolIE-ID ::= 130
+id-TraceCollectionEntityIPAddress					ProtocolIE-ID ::= 131
+id-MSClassmark2										ProtocolIE-ID ::= 132
+id-MSClassmark3										ProtocolIE-ID ::= 133
+id-RRC-Establishment-Cause							ProtocolIE-ID ::= 134
+id-NASSecurityParametersfromE-UTRAN					ProtocolIE-ID ::= 135
+id-NASSecurityParameterstoE-UTRAN					ProtocolIE-ID ::= 136
+id-DefaultPagingDRX									ProtocolIE-ID ::= 137
+id-Source-ToTarget-TransparentContainer-Secondary	ProtocolIE-ID ::= 138
+id-Target-ToSource-TransparentContainer-Secondary	ProtocolIE-ID ::= 139
+id-EUTRANRoundTripDelayEstimationInfo				ProtocolIE-ID ::= 140
+id-BroadcastCancelledAreaList						ProtocolIE-ID ::= 141
+id-ConcurrentWarningMessageIndicator				ProtocolIE-ID ::= 142
+id-Data-Forwarding-Not-Possible						ProtocolIE-ID ::= 143
+id-ExtendedRepetitionPeriod							ProtocolIE-ID ::= 144
+id-CellAccessMode									ProtocolIE-ID ::= 145
+id-CSGMembershipStatus 								ProtocolIE-ID ::= 146
+id-LPPa-PDU											ProtocolIE-ID ::= 147
+id-Routing-ID										ProtocolIE-ID ::= 148
+id-Time-Synchronisation-Info						ProtocolIE-ID ::= 149
+id-PS-ServiceNotAvailable							ProtocolIE-ID ::= 150
+id-PagingPriority									ProtocolIE-ID ::= 151
+id-x2TNLConfigurationInfo							ProtocolIE-ID ::= 152
+id-eNBX2ExtendedTransportLayerAddresses				ProtocolIE-ID ::= 153
+id-GUMMEIList										ProtocolIE-ID ::= 154
+id-GW-TransportLayerAddress							ProtocolIE-ID ::= 155
+id-Correlation-ID									ProtocolIE-ID ::= 156
+id-SourceMME-GUMMEI									ProtocolIE-ID ::= 157
+id-MME-UE-S1AP-ID-2									ProtocolIE-ID ::= 158
+id-RegisteredLAI									ProtocolIE-ID ::= 159
+id-RelayNode-Indicator								ProtocolIE-ID ::= 160
+id-TrafficLoadReductionIndication					ProtocolIE-ID ::= 161
+id-MDTConfiguration									ProtocolIE-ID ::= 162
+id-MMERelaySupportIndicator							ProtocolIE-ID ::= 163
+id-GWContextReleaseIndication						ProtocolIE-ID ::= 164
+id-ManagementBasedMDTAllowed						ProtocolIE-ID ::= 165
+id-PrivacyIndicator									ProtocolIE-ID ::= 166
+id-Time-UE-StayedInCell-EnhancedGranularity			ProtocolIE-ID ::= 167
+id-HO-Cause											ProtocolIE-ID ::= 168
+id-VoiceSupportMatchIndicator						ProtocolIE-ID ::= 169
+id-GUMMEIType										ProtocolIE-ID ::= 170
+id-M3Configuration									ProtocolIE-ID ::= 171
+id-M4Configuration									ProtocolIE-ID ::= 172
+id-M5Configuration									ProtocolIE-ID ::= 173
+id-MDT-Location-Info								ProtocolIE-ID ::= 174
+id-MobilityInformation								ProtocolIE-ID ::= 175
+id-Tunnel-Information-for-BBF						ProtocolIE-ID ::= 176
+id-ManagementBasedMDTPLMNList						ProtocolIE-ID ::= 177
+id-SignallingBasedMDTPLMNList						ProtocolIE-ID ::= 178
+id-ULCOUNTValueExtended								ProtocolIE-ID ::= 179
+id-DLCOUNTValueExtended								ProtocolIE-ID ::= 180
+id-ReceiveStatusOfULPDCPSDUsExtended				ProtocolIE-ID ::= 181
+id-ECGIListForRestart								ProtocolIE-ID ::= 182
+id-SIPTO-Correlation-ID								ProtocolIE-ID ::= 183
+id-SIPTO-L-GW-TransportLayerAddress					ProtocolIE-ID ::= 184
+id-TransportInformation								ProtocolIE-ID ::= 185
+id-LHN-ID											ProtocolIE-ID ::= 186
+id-AdditionalCSFallbackIndicator					ProtocolIE-ID ::= 187
+id-TAIListForRestart								ProtocolIE-ID ::= 188
+id-UserLocationInformation							ProtocolIE-ID ::= 189
+id-EmergencyAreaIDListForRestart					ProtocolIE-ID ::= 190
+id-KillAllWarningMessages							ProtocolIE-ID ::= 191
+id-Masked-IMEISV									ProtocolIE-ID ::= 192
+id-eNBIndirectX2TransportLayerAddresses				ProtocolIE-ID ::= 193
+id-uE-HistoryInformationFromTheUE					ProtocolIE-ID ::= 194
+id-ProSeAuthorized									ProtocolIE-ID ::= 195
+id-ExpectedUEBehaviour								ProtocolIE-ID ::= 196
+id-LoggedMBSFNMDT									ProtocolIE-ID ::= 197
+id-UERadioCapabilityForPaging						ProtocolIE-ID ::= 198
+id-E-RABToBeModifiedListBearerModInd				ProtocolIE-ID ::= 199
+id-E-RABToBeModifiedItemBearerModInd				ProtocolIE-ID ::= 200
+id-E-RABNotToBeModifiedListBearerModInd				ProtocolIE-ID ::= 201
+id-E-RABNotToBeModifiedItemBearerModInd				ProtocolIE-ID ::= 202
+id-E-RABModifyListBearerModConf						ProtocolIE-ID ::= 203
+id-E-RABModifyItemBearerModConf						ProtocolIE-ID ::= 204
+id-E-RABFailedToModifyListBearerModConf				ProtocolIE-ID ::= 205
+id-SON-Information-Report							ProtocolIE-ID ::= 206
+id-Muting-Availability-Indication					ProtocolIE-ID ::= 207
+id-Muting-Pattern-Information						ProtocolIE-ID ::= 208
+id-Synchronisation-Information						ProtocolIE-ID ::= 209
+id-E-RABToBeReleasedListBearerModConf				ProtocolIE-ID ::= 210
+id-AssistanceDataForPaging							ProtocolIE-ID ::= 211
+id-CellIdentifierAndCELevelForCECapableUEs			ProtocolIE-ID ::= 212
+id-InformationOnRecommendedCellsAndENBsForPaging	ProtocolIE-ID ::= 213
+id-RecommendedCellItem								ProtocolIE-ID ::= 214
+id-RecommendedENBItem								ProtocolIE-ID ::= 215
+id-ProSeUEtoNetworkRelaying							ProtocolIE-ID ::= 216
+id-ULCOUNTValuePDCP-SNlength18						ProtocolIE-ID ::= 217
+id-DLCOUNTValuePDCP-SNlength18						ProtocolIE-ID ::= 218
+id-ReceiveStatusOfULPDCPSDUsPDCP-SNlength18			ProtocolIE-ID ::= 219
+id-M6Configuration									ProtocolIE-ID ::= 220
+id-M7Configuration									ProtocolIE-ID ::= 221
+id-PWSfailedECGIList								ProtocolIE-ID ::= 222
+id-MME-Group-ID										ProtocolIE-ID ::= 223
+id-Additional-GUTI									ProtocolIE-ID ::= 224
+id-S1-Message										ProtocolIE-ID ::= 225
+id-CSGMembershipInfo								ProtocolIE-ID ::= 226
+id-Paging-eDRXInformation							ProtocolIE-ID ::= 227
+id-UE-RetentionInformation							ProtocolIE-ID ::= 228
+id-UE-Usage-Type									ProtocolIE-ID ::= 230
+id-extended-UEIdentityIndexValue					ProtocolIE-ID ::= 231
+id-RAT-Type											ProtocolIE-ID ::= 232
+id-BearerType										ProtocolIE-ID ::= 233
+id-NB-IoT-DefaultPagingDRX							ProtocolIE-ID ::= 234
+id-E-RABFailedToResumeListResumeReq					ProtocolIE-ID ::= 235
+id-E-RABFailedToResumeItemResumeReq					ProtocolIE-ID ::= 236
+id-E-RABFailedToResumeListResumeRes					ProtocolIE-ID ::= 237
+id-E-RABFailedToResumeItemResumeRes					ProtocolIE-ID ::= 238
+id-NB-IoT-Paging-eDRXInformation					ProtocolIE-ID ::= 239
+id-UEUserPlaneCIoTSupportIndicator 					ProtocolIE-ID ::= 241
+END
--- a/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/rel_13/S1AP-Containers.asn
+++ b/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/rel_13/S1AP-Containers.asn
@ -0,0 +1,197 @@
+-- **************************************************************
+--
+-- Container definitions
+--
+-- **************************************************************
+
+S1AP-Containers {
+itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) 
+eps-Access (21) modules (3) s1ap (1) version1 (1) s1ap-Containers (5) }
+
+DEFINITIONS AUTOMATIC TAGS ::= 
+
+BEGIN
+
+-- **************************************************************
+--
+-- IE parameter types from other modules.
+--
+-- **************************************************************
+
+IMPORTS
+	Criticality,
+	Presence,
+	PrivateIE-ID,
+	ProtocolExtensionID,
+	ProtocolIE-ID
+FROM S1AP-CommonDataTypes
+
+	maxPrivateIEs,
+	maxProtocolExtensions,
+	maxProtocolIEs
+FROM S1AP-Constants;
+
+-- **************************************************************
+--
+-- Class Definition for Protocol IEs
+--
+-- **************************************************************
+
+S1AP-PROTOCOL-IES ::= CLASS {
+	&id				ProtocolIE-ID 					UNIQUE,
+	&criticality	Criticality,
+	&Value,
+	&presence		Presence
+}
+WITH SYNTAX {
+	ID				&id
+	CRITICALITY		&criticality
+	TYPE			&Value
+	PRESENCE		&presence
+}
+
+-- **************************************************************
+--
+-- Class Definition for Protocol IEs
+--
+-- **************************************************************
+
+S1AP-PROTOCOL-IES-PAIR ::= CLASS {
+	&id					ProtocolIE-ID 				UNIQUE,
+	&firstCriticality	Criticality,
+	&FirstValue,
+	&secondCriticality	Criticality,
+	&SecondValue,
+	&presence			Presence
+}
+WITH SYNTAX {
+	ID				&id
+	FIRST CRITICALITY		&firstCriticality
+	FIRST TYPE				&FirstValue
+	SECOND CRITICALITY		&secondCriticality
+	SECOND TYPE				&SecondValue
+	PRESENCE				&presence
+}
+
+-- **************************************************************
+--
+-- Class Definition for Protocol Extensions
+--
+-- **************************************************************
+
+S1AP-PROTOCOL-EXTENSION ::= CLASS {
+	&id				ProtocolExtensionID			UNIQUE,
+	&criticality	Criticality,
+	&Extension,
+	&presence		Presence
+}
+WITH SYNTAX {
+	ID				&id
+	CRITICALITY		&criticality
+	EXTENSION		&Extension
+	PRESENCE		&presence
+}
+
+-- **************************************************************
+--
+-- Class Definition for Private IEs
+--
+-- **************************************************************
+
+S1AP-PRIVATE-IES ::= CLASS {
+	&id				PrivateIE-ID,
+	&criticality	Criticality,
+	&Value,
+	&presence		Presence
+}
+WITH SYNTAX {
+	ID				&id
+	CRITICALITY		&criticality
+	TYPE			&Value
+	PRESENCE		&presence
+}
+
+-- **************************************************************
+--
+-- Container for Protocol IEs
+--
+-- **************************************************************
+
+ProtocolIE-Container {S1AP-PROTOCOL-IES : IEsSetParam} ::= 
+	SEQUENCE (SIZE (0..maxProtocolIEs)) OF
+	ProtocolIE-Field {{IEsSetParam}}
+
+ProtocolIE-SingleContainer {S1AP-PROTOCOL-IES : IEsSetParam} ::= 
+	ProtocolIE-Field {{IEsSetParam}}
+
+ProtocolIE-Field {S1AP-PROTOCOL-IES : IEsSetParam} ::= SEQUENCE {
+	id				S1AP-PROTOCOL-IES.&id				({IEsSetParam}),
+	criticality		S1AP-PROTOCOL-IES.&criticality		({IEsSetParam}{@id}),
+	value			S1AP-PROTOCOL-IES.&Value			({IEsSetParam}{@id})
+}
+
+-- **************************************************************
+--
+-- Container for Protocol IE Pairs
+--
+-- **************************************************************
+
+ProtocolIE-ContainerPair {S1AP-PROTOCOL-IES-PAIR : IEsSetParam} ::= 
+	SEQUENCE (SIZE (0..maxProtocolIEs)) OF
+	ProtocolIE-FieldPair {{IEsSetParam}}
+
+ProtocolIE-FieldPair {S1AP-PROTOCOL-IES-PAIR : IEsSetParam} ::= SEQUENCE {
+	id					S1AP-PROTOCOL-IES-PAIR.&id					({IEsSetParam}),
+	firstCriticality	S1AP-PROTOCOL-IES-PAIR.&firstCriticality	({IEsSetParam}{@id}),
+	firstValue			S1AP-PROTOCOL-IES-PAIR.&FirstValue			({IEsSetParam}{@id}),
+	secondCriticality	S1AP-PROTOCOL-IES-PAIR.&secondCriticality	({IEsSetParam}{@id}),
+	secondValue			S1AP-PROTOCOL-IES-PAIR.&SecondValue		({IEsSetParam}{@id})
+}
+
+-- **************************************************************
+--
+-- Container Lists for Protocol IE Containers
+--
+-- **************************************************************
+
+ProtocolIE-ContainerList {INTEGER : lowerBound, INTEGER : upperBound, S1AP-PROTOCOL-IES : IEsSetParam} ::=
+	SEQUENCE (SIZE (lowerBound..upperBound)) OF
+	ProtocolIE-SingleContainer {{IEsSetParam}}
+
+ProtocolIE-ContainerPairList {INTEGER : lowerBound, INTEGER : upperBound, S1AP-PROTOCOL-IES-PAIR : IEsSetParam} ::=
+	SEQUENCE (SIZE (lowerBound..upperBound)) OF
+	ProtocolIE-ContainerPair {{IEsSetParam}}
+
+-- **************************************************************
+--
+-- Container for Protocol Extensions
+--
+-- **************************************************************
+
+ProtocolExtensionContainer {S1AP-PROTOCOL-EXTENSION : ExtensionSetParam} ::= 
+	SEQUENCE (SIZE (1..maxProtocolExtensions)) OF
+	ProtocolExtensionField {{ExtensionSetParam}}
+
+ProtocolExtensionField {S1AP-PROTOCOL-EXTENSION : ExtensionSetParam} ::= SEQUENCE {
+	id					S1AP-PROTOCOL-EXTENSION.&id				({ExtensionSetParam}),
+	criticality			S1AP-PROTOCOL-EXTENSION.&criticality	({ExtensionSetParam}{@id}),
+	extensionValue		S1AP-PROTOCOL-EXTENSION.&Extension		({ExtensionSetParam}{@id})
+}
+
+-- **************************************************************
+--
+-- Container for Private IEs
+--
+-- **************************************************************
+
+PrivateIE-Container {S1AP-PRIVATE-IES : IEsSetParam } ::= 
+	SEQUENCE (SIZE (1.. maxPrivateIEs)) OF
+	PrivateIE-Field {{IEsSetParam}}
+
+PrivateIE-Field {S1AP-PRIVATE-IES : IEsSetParam} ::= SEQUENCE {
+	id					S1AP-PRIVATE-IES.&id				({IEsSetParam}),
+	criticality			S1AP-PRIVATE-IES.&criticality		({IEsSetParam}{@id}),
+	value				S1AP-PRIVATE-IES.&Value				({IEsSetParam}{@id})
+}
+
+END
--- a/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/rel_13/S1AP-IEs.asn
+++ b/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/rel_13/S1AP-IEs.asn
--- a/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/rel_13/S1AP-PDU-Contents.asn
+++ b/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/rel_13/S1AP-PDU-Contents.asn
--- a/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/rel_13/S1AP-PDU-Descriptions.asn
+++ b/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/rel_13/S1AP-PDU-Descriptions.asn
@ -0,0 +1,683 @@
+-- **************************************************************
+--
+-- Elementary Procedure definitions
+--
+-- **************************************************************
+
+S1AP-PDU-Descriptions  { 
+itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) 
+eps-Access (21) modules (3) s1ap (1) version1 (1) s1ap-PDU-Descriptions (0)}
+
+DEFINITIONS AUTOMATIC TAGS ::= 
+
+BEGIN
+
+-- **************************************************************
+--
+-- IE parameter types from other modules.
+--
+-- **************************************************************
+
+IMPORTS
+	Criticality,
+	ProcedureCode
+FROM S1AP-CommonDataTypes
+
+	CellTrafficTrace,
+	DeactivateTrace,
+	DownlinkUEAssociatedLPPaTransport,
+	DownlinkNASTransport,
+	DownlinkNonUEAssociatedLPPaTransport,
+	DownlinkS1cdma2000tunnelling,
+	ENBDirectInformationTransfer,
+	ENBStatusTransfer,
+	ENBConfigurationUpdate,
+	ENBConfigurationUpdateAcknowledge,
+	ENBConfigurationUpdateFailure,
+	ErrorIndication,
+	HandoverCancel,
+	HandoverCancelAcknowledge,
+	HandoverCommand,
+	HandoverFailure,
+	HandoverNotify,
+	HandoverPreparationFailure,
+	HandoverRequest,
+	HandoverRequestAcknowledge,
+	HandoverRequired,
+	InitialContextSetupFailure,
+	InitialContextSetupRequest,
+	InitialContextSetupResponse,
+	InitialUEMessage,
+	KillRequest,
+	KillResponse,
+	LocationReportingControl,
+	LocationReportingFailureIndication,
+	LocationReport,
+	MMEConfigurationUpdate,
+	MMEConfigurationUpdateAcknowledge,
+	MMEConfigurationUpdateFailure,
+	MMEDirectInformationTransfer,
+	MMEStatusTransfer,
+	NASNonDeliveryIndication,
+	OverloadStart,
+	OverloadStop,
+	Paging,
+	PathSwitchRequest,
+	PathSwitchRequestAcknowledge,
+	PathSwitchRequestFailure,	
+	PrivateMessage,
+	Reset,
+	ResetAcknowledge,
+	S1SetupFailure,
+	S1SetupRequest,
+	S1SetupResponse,
+	E-RABModifyRequest,
+	E-RABModifyResponse,
+	E-RABModificationIndication,
+	E-RABModificationConfirm,
+	E-RABReleaseCommand,
+	E-RABReleaseResponse,
+	E-RABReleaseIndication,
+	E-RABSetupRequest,
+	E-RABSetupResponse,
+	TraceFailureIndication,
+	TraceStart,
+	UECapabilityInfoIndication,
+	UEContextModificationFailure,
+	UEContextModificationRequest,
+	UEContextModificationResponse,
+	UEContextReleaseCommand,
+	UEContextReleaseComplete,
+	UEContextReleaseRequest,
+	UERadioCapabilityMatchRequest,
+	UERadioCapabilityMatchResponse,
+	UplinkUEAssociatedLPPaTransport,
+	UplinkNASTransport,
+	UplinkNonUEAssociatedLPPaTransport,
+	UplinkS1cdma2000tunnelling,
+	WriteReplaceWarningRequest,
+	WriteReplaceWarningResponse,
+	ENBConfigurationTransfer,
+	MMEConfigurationTransfer,
+	PWSRestartIndication,
+	UEContextModificationIndication,
+	UEContextModificationConfirm,
+	RerouteNASRequest,
+	PWSFailureIndication,
+	UEContextSuspendRequest,
+	UEContextSuspendResponse,
+	UEContextResumeRequest,
+	UEContextResumeResponse,
+	UEContextResumeFailure,
+	ConnectionEstablishmentIndication
+
+
+FROM S1AP-PDU-Contents
+	
+	id-CellTrafficTrace,
+	id-DeactivateTrace,
+	id-downlinkUEAssociatedLPPaTransport,
+	id-downlinkNASTransport,
+	id-downlinkNonUEAssociatedLPPaTransport,
+	id-DownlinkS1cdma2000tunnelling,
+	id-eNBStatusTransfer,
+	id-ErrorIndication,
+	id-HandoverCancel,
+	id-HandoverNotification,
+	id-HandoverPreparation,
+	id-HandoverResourceAllocation,
+	id-InitialContextSetup,
+	id-initialUEMessage,
+	id-ENBConfigurationUpdate,
+	id-Kill,
+	id-LocationReportingControl,
+	id-LocationReportingFailureIndication,
+	id-LocationReport,
+	id-eNBDirectInformationTransfer,
+	id-MMEConfigurationUpdate,
+	id-MMEDirectInformationTransfer,
+	id-MMEStatusTransfer,
+	id-NASNonDeliveryIndication,
+	id-OverloadStart,
+	id-OverloadStop,
+	id-Paging,
+	id-PathSwitchRequest,
+	id-PrivateMessage,
+	id-Reset,
+	id-S1Setup,
+	id-E-RABModify,
+	id-E-RABModificationIndication,
+	id-E-RABRelease,
+	id-E-RABReleaseIndication,
+	id-E-RABSetup,
+	id-TraceFailureIndication,
+	id-TraceStart,
+	id-UECapabilityInfoIndication,
+	id-UEContextModification,
+	id-UEContextRelease,
+	id-UEContextReleaseRequest,
+	id-UERadioCapabilityMatch,
+	id-uplinkUEAssociatedLPPaTransport,
+	id-uplinkNASTransport,
+	id-uplinkNonUEAssociatedLPPaTransport,
+	id-UplinkS1cdma2000tunnelling,
+	id-WriteReplaceWarning,
+	id-eNBConfigurationTransfer,
+	id-MMEConfigurationTransfer,
+	id-PWSRestartIndication,
+	id-UEContextModificationIndication,
+	id-RerouteNASRequest,
+	id-PWSFailureIndication,
+	id-UEContextSuspend,
+	id-UEContextResume,
+	id-ConnectionEstablishmentIndication
+FROM S1AP-Constants;
+
+
+-- **************************************************************
+--
+-- Interface Elementary Procedure Class
+--
+-- **************************************************************
+
+S1AP-ELEMENTARY-PROCEDURE ::= CLASS {
+	&InitiatingMessage				,
+	&SuccessfulOutcome							OPTIONAL,
+	&UnsuccessfulOutcome						OPTIONAL,
+	&procedureCode				ProcedureCode 	UNIQUE,
+	&criticality				Criticality 	DEFAULT ignore
+}
+WITH SYNTAX {
+	INITIATING MESSAGE			&InitiatingMessage
+	[SUCCESSFUL OUTCOME			&SuccessfulOutcome]
+	[UNSUCCESSFUL OUTCOME		&UnsuccessfulOutcome]
+	PROCEDURE CODE				&procedureCode
+	[CRITICALITY				&criticality]
+}
+
+-- **************************************************************
+--
+-- Interface PDU Definition
+--
+-- **************************************************************
+
+S1AP-PDU ::= CHOICE {
+	initiatingMessage	InitiatingMessage,
+	successfulOutcome	SuccessfulOutcome,
+	unsuccessfulOutcome	UnsuccessfulOutcome,
+	...
+}
+
+InitiatingMessage ::= SEQUENCE {
+	procedureCode	S1AP-ELEMENTARY-PROCEDURE.&procedureCode		({S1AP-ELEMENTARY-PROCEDURES}),
+	criticality		S1AP-ELEMENTARY-PROCEDURE.&criticality			({S1AP-ELEMENTARY-PROCEDURES}{@procedureCode}),
+	value			S1AP-ELEMENTARY-PROCEDURE.&InitiatingMessage	({S1AP-ELEMENTARY-PROCEDURES}{@procedureCode})
+}
+
+SuccessfulOutcome ::= SEQUENCE {
+	procedureCode	S1AP-ELEMENTARY-PROCEDURE.&procedureCode		({S1AP-ELEMENTARY-PROCEDURES}),
+	criticality		S1AP-ELEMENTARY-PROCEDURE.&criticality			({S1AP-ELEMENTARY-PROCEDURES}{@procedureCode}),
+	value			S1AP-ELEMENTARY-PROCEDURE.&SuccessfulOutcome	({S1AP-ELEMENTARY-PROCEDURES}{@procedureCode})
+}
+
+UnsuccessfulOutcome ::= SEQUENCE {
+	procedureCode	S1AP-ELEMENTARY-PROCEDURE.&procedureCode		({S1AP-ELEMENTARY-PROCEDURES}),
+	criticality		S1AP-ELEMENTARY-PROCEDURE.&criticality			({S1AP-ELEMENTARY-PROCEDURES}{@procedureCode}),
+	value			S1AP-ELEMENTARY-PROCEDURE.&UnsuccessfulOutcome	({S1AP-ELEMENTARY-PROCEDURES}{@procedureCode})
+}
+
+-- **************************************************************
+--
+-- Interface Elementary Procedure List
+--
+-- **************************************************************
+
+S1AP-ELEMENTARY-PROCEDURES S1AP-ELEMENTARY-PROCEDURE ::= {
+	S1AP-ELEMENTARY-PROCEDURES-CLASS-1			|
+	S1AP-ELEMENTARY-PROCEDURES-CLASS-2,	
+	...
+}
+
+
+S1AP-ELEMENTARY-PROCEDURES-CLASS-1 S1AP-ELEMENTARY-PROCEDURE ::= {
+	handoverPreparation				|
+	handoverResourceAllocation		|
+	pathSwitchRequest 				|
+	e-RABSetup						|
+	e-RABModify						|
+	e-RABRelease					|
+	initialContextSetup				|
+	handoverCancel					|
+	kill							|
+	reset							|
+	s1Setup							|
+	uEContextModification			|
+	uEContextRelease				|
+	eNBConfigurationUpdate			|
+	mMEConfigurationUpdate			|
+	writeReplaceWarning				,
+	...,
+	uERadioCapabilityMatch						|
+	e-RABModificationIndication					|
+	uEContextModificationIndication				|
+	uEContextSuspend							|
+	uEContextResume
+}
+
+S1AP-ELEMENTARY-PROCEDURES-CLASS-2 S1AP-ELEMENTARY-PROCEDURE ::= {	
+	handoverNotification			|
+	e-RABReleaseIndication			|
+	paging 							|
+	downlinkNASTransport			|
+	initialUEMessage				|
+	uplinkNASTransport				|
+	errorIndication					|
+	nASNonDeliveryIndication		|
+	uEContextReleaseRequest			|
+	downlinkS1cdma2000tunnelling	|
+	uplinkS1cdma2000tunnelling		|
+	uECapabilityInfoIndication		|
+	eNBStatusTransfer				|
+	mMEStatusTransfer				|
+	deactivateTrace					|
+	traceStart						|
+	traceFailureIndication			|
+	cellTrafficTrace				|
+	locationReportingControl		|
+	locationReportingFailureIndication	|
+	locationReport					|
+	overloadStart					|
+	overloadStop					|
+	eNBDirectInformationTransfer	|
+	mMEDirectInformationTransfer	|
+	eNBConfigurationTransfer		|
+	mMEConfigurationTransfer		|
+	privateMessage					,
+	...,
+	downlinkUEAssociatedLPPaTransport	|
+	uplinkUEAssociatedLPPaTransport	|
+	downlinkNonUEAssociatedLPPaTransport	|
+	uplinkNonUEAssociatedLPPaTransport	|
+	pWSRestartIndication			|
+	rerouteNASRequest				|
+	pWSFailureIndication						|
+	connectionEstablishmentIndication
+}
+
+-- **************************************************************
+--
+-- Interface Elementary Procedures
+--
+-- **************************************************************
+
+handoverPreparation S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		HandoverRequired
+	SUCCESSFUL OUTCOME		HandoverCommand
+	UNSUCCESSFUL OUTCOME	HandoverPreparationFailure
+	PROCEDURE CODE			id-HandoverPreparation
+	CRITICALITY				reject
+}
+
+handoverResourceAllocation S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		HandoverRequest
+	SUCCESSFUL OUTCOME		HandoverRequestAcknowledge
+	UNSUCCESSFUL OUTCOME	HandoverFailure
+	PROCEDURE CODE			id-HandoverResourceAllocation
+	CRITICALITY				reject
+}
+
+handoverNotification S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		HandoverNotify
+	PROCEDURE CODE			id-HandoverNotification
+	CRITICALITY				ignore
+}
+
+pathSwitchRequest S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		PathSwitchRequest
+	SUCCESSFUL OUTCOME		PathSwitchRequestAcknowledge
+	UNSUCCESSFUL OUTCOME	PathSwitchRequestFailure
+	PROCEDURE CODE			id-PathSwitchRequest
+	CRITICALITY				reject
+}
+
+e-RABSetup S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		E-RABSetupRequest
+	SUCCESSFUL OUTCOME		E-RABSetupResponse
+	PROCEDURE CODE			id-E-RABSetup
+	CRITICALITY				reject
+}
+
+e-RABModify S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		E-RABModifyRequest
+	SUCCESSFUL OUTCOME		E-RABModifyResponse
+	PROCEDURE CODE			id-E-RABModify
+	CRITICALITY				reject
+}
+
+e-RABRelease S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		E-RABReleaseCommand
+	SUCCESSFUL OUTCOME		E-RABReleaseResponse
+	PROCEDURE CODE			id-E-RABRelease
+	CRITICALITY				reject
+}
+
+e-RABReleaseIndication S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		E-RABReleaseIndication
+	PROCEDURE CODE			id-E-RABReleaseIndication
+	CRITICALITY				ignore
+}
+
+initialContextSetup S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		InitialContextSetupRequest
+	SUCCESSFUL OUTCOME		InitialContextSetupResponse
+	UNSUCCESSFUL OUTCOME 	InitialContextSetupFailure
+	PROCEDURE CODE			id-InitialContextSetup
+	CRITICALITY				reject
+}
+
+uEContextReleaseRequest S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		UEContextReleaseRequest
+	PROCEDURE CODE			id-UEContextReleaseRequest
+	CRITICALITY				ignore
+}
+
+paging S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		Paging
+	PROCEDURE CODE			id-Paging
+	CRITICALITY				ignore
+}
+
+downlinkNASTransport S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		DownlinkNASTransport
+	PROCEDURE CODE			id-downlinkNASTransport
+	CRITICALITY				ignore
+}
+
+initialUEMessage S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		InitialUEMessage
+	PROCEDURE CODE			id-initialUEMessage
+	CRITICALITY				ignore
+}
+
+uplinkNASTransport S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		UplinkNASTransport
+	PROCEDURE CODE			id-uplinkNASTransport
+	CRITICALITY				ignore
+}
+nASNonDeliveryIndication S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		NASNonDeliveryIndication
+	PROCEDURE CODE			id-NASNonDeliveryIndication
+	CRITICALITY				ignore
+}
+
+handoverCancel S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		HandoverCancel
+	SUCCESSFUL OUTCOME		HandoverCancelAcknowledge
+	PROCEDURE CODE			id-HandoverCancel
+	CRITICALITY				reject
+}
+
+reset S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		Reset
+	SUCCESSFUL OUTCOME		ResetAcknowledge
+	PROCEDURE CODE			id-Reset
+	CRITICALITY				reject
+}
+
+errorIndication S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		ErrorIndication
+	PROCEDURE CODE			id-ErrorIndication
+	CRITICALITY				ignore
+}
+
+s1Setup S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		S1SetupRequest
+	SUCCESSFUL OUTCOME		S1SetupResponse
+	UNSUCCESSFUL OUTCOME 	S1SetupFailure
+	PROCEDURE CODE			id-S1Setup
+	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
+}
+
+downlinkS1cdma2000tunnelling S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		DownlinkS1cdma2000tunnelling
+	PROCEDURE CODE			id-DownlinkS1cdma2000tunnelling
+	CRITICALITY				ignore
+}
+
+uplinkS1cdma2000tunnelling S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		UplinkS1cdma2000tunnelling
+	PROCEDURE CODE			id-UplinkS1cdma2000tunnelling
+	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
+}
+
+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
+}
+cellTrafficTrace S1AP-ELEMENTARY-PROCEDURE ::={
+     INITIATING MESSAGE		CellTrafficTrace
+     PROCEDURE CODE			id-CellTrafficTrace
+     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
+}
+
+overloadStart S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		OverloadStart
+	PROCEDURE CODE			id-OverloadStart
+	CRITICALITY				ignore
+}
+
+overloadStop S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		OverloadStop
+	PROCEDURE CODE			id-OverloadStop
+	CRITICALITY				reject
+}
+
+writeReplaceWarning S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		WriteReplaceWarningRequest
+	SUCCESSFUL OUTCOME		WriteReplaceWarningResponse
+	PROCEDURE CODE			id-WriteReplaceWarning
+	CRITICALITY				reject
+}
+
+eNBDirectInformationTransfer S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		ENBDirectInformationTransfer
+	PROCEDURE CODE			id-eNBDirectInformationTransfer
+	CRITICALITY				ignore
+}
+
+mMEDirectInformationTransfer S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		MMEDirectInformationTransfer
+	PROCEDURE CODE			id-MMEDirectInformationTransfer
+	CRITICALITY				ignore
+}
+
+eNBConfigurationTransfer S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		ENBConfigurationTransfer
+	PROCEDURE CODE			id-eNBConfigurationTransfer
+	CRITICALITY				ignore
+}
+
+mMEConfigurationTransfer S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		MMEConfigurationTransfer
+	PROCEDURE CODE			id-MMEConfigurationTransfer
+	CRITICALITY				ignore
+}
+
+
+privateMessage S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		PrivateMessage
+	PROCEDURE CODE			id-PrivateMessage
+	CRITICALITY				ignore
+}
+
+pWSRestartIndication S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		PWSRestartIndication
+	PROCEDURE CODE			id-PWSRestartIndication
+	CRITICALITY				ignore
+}
+
+kill S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		KillRequest
+	SUCCESSFUL OUTCOME		KillResponse
+	PROCEDURE CODE			id-Kill
+	CRITICALITY				reject
+}
+
+downlinkUEAssociatedLPPaTransport S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		DownlinkUEAssociatedLPPaTransport
+	PROCEDURE CODE			id-downlinkUEAssociatedLPPaTransport
+	CRITICALITY				ignore
+}
+
+uplinkUEAssociatedLPPaTransport S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		UplinkUEAssociatedLPPaTransport
+	PROCEDURE CODE			id-uplinkUEAssociatedLPPaTransport
+	CRITICALITY				ignore
+}
+downlinkNonUEAssociatedLPPaTransport S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		DownlinkNonUEAssociatedLPPaTransport
+	PROCEDURE CODE			id-downlinkNonUEAssociatedLPPaTransport
+	CRITICALITY				ignore
+}
+
+uplinkNonUEAssociatedLPPaTransport S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		UplinkNonUEAssociatedLPPaTransport
+	PROCEDURE CODE			id-uplinkNonUEAssociatedLPPaTransport
+	CRITICALITY				ignore
+}
+
+uERadioCapabilityMatch S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		UERadioCapabilityMatchRequest
+	SUCCESSFUL OUTCOME		UERadioCapabilityMatchResponse
+	PROCEDURE CODE			id-UERadioCapabilityMatch
+	CRITICALITY				reject
+}
+
+e-RABModificationIndication S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		E-RABModificationIndication
+	SUCCESSFUL OUTCOME		E-RABModificationConfirm
+	PROCEDURE CODE			id-E-RABModificationIndication
+	CRITICALITY				reject
+}
+
+uEContextModificationIndication S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		UEContextModificationIndication
+	SUCCESSFUL OUTCOME		UEContextModificationConfirm
+	PROCEDURE CODE			id-UEContextModificationIndication
+	CRITICALITY				reject
+}
+
+rerouteNASRequest S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		RerouteNASRequest
+	PROCEDURE CODE			id-RerouteNASRequest
+	CRITICALITY				reject
+}
+
+pWSFailureIndication S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		PWSFailureIndication
+	PROCEDURE CODE			id-PWSFailureIndication
+	CRITICALITY				ignore
+}
+
+uEContextSuspend S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		UEContextSuspendRequest
+	SUCCESSFUL OUTCOME		UEContextSuspendResponse
+	PROCEDURE CODE			id-UEContextSuspend
+	CRITICALITY				reject
+}
+
+uEContextResume S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		UEContextResumeRequest
+	SUCCESSFUL OUTCOME		UEContextResumeResponse
+	UNSUCCESSFUL OUTCOME 	UEContextResumeFailure
+	PROCEDURE CODE			id-UEContextResume
+	CRITICALITY				reject
+}
+
+connectionEstablishmentIndication S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		ConnectionEstablishmentIndication
+	PROCEDURE CODE			id-ConnectionEstablishmentIndication
+	CRITICALITY				reject
+}
+
+END
--- a/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/rel_13/SonTransfer-IEs.asn
+++ b/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/rel_13/SonTransfer-IEs.asn
@ -0,0 +1,332 @@
+-- **************************************************************
+--
+-- IE definitions for the SON Transfer application
+-- The IEs in this ASN.1 module shall be defined and encoded
+-- using the same rules as applicable for the S1AP-IEs module.
+-- 
+-- **************************************************************
+SonTransfer-IEs
+
+DEFINITIONS AUTOMATIC TAGS ::= 
+
+BEGIN
+
+--
+-- Generic IEs for the SON Transfer application
+--
+
+SONtransferApplicationIdentity ::= ENUMERATED {
+	cell-load-reporting,
+	...,
+	multi-cell-load-reporting,
+	event-triggered-cell-load-reporting,
+	ho-reporting,
+	eutran-cell-activation,
+	energy-savings-indication,
+	failure-event-reporting
+}
+
+SONtransferRequestContainer ::= CHOICE{
+	cellLoadReporting					NULL,
+	...,
+	multiCellLoadReporting				MultiCellLoadReportingRequest,
+	eventTriggeredCellLoadReporting		EventTriggeredCellLoadReportingRequest,
+	hOReporting							HOReport,
+	eutranCellActivation				CellActivationRequest,
+	energySavingsIndication				CellStateIndication,
+	failureEventReporting				FailureEventReport
+}
+
+SONtransferResponseContainer ::= CHOICE{
+	cellLoadReporting					CellLoadReportingResponse,
+	...,
+	multiCellLoadReporting				MultiCellLoadReportingResponse,
+	eventTriggeredCellLoadReporting	EventTriggeredCellLoadReportingResponse,
+	hOReporting							NULL,
+	eutranCellActivation				CellActivationResponse,
+	energySavingsIndication				NULL,
+	failureEventReporting				NULL
+}
+
+SONtransferCause ::= CHOICE {
+	cellLoadReporting					CellLoadReportingCause,
+	...,
+	multiCellLoadReporting				CellLoadReportingCause,
+	eventTriggeredCellLoadReporting		CellLoadReportingCause,
+	hOReporting							HOReportingCause,
+	eutranCellActivation				CellActivationCause,
+	energySavingsIndication				CellStateIndicationCause,
+	failureEventReporting				FailureEventReportingCause
+}
+
+
+CellLoadReportingCause ::= ENUMERATED {
+	application-container-syntax-error,
+	inconsistent-reporting-cell-identifier,
+	unspecified,
+	...
+}
+
+HOReportingCause ::= ENUMERATED {
+	application-container-syntax-error,
+	inconsistent-reporting-cell-identifier,
+	unspecified,
+	...
+}
+
+CellActivationCause ::= ENUMERATED {
+	application-container-syntax-error,
+	inconsistent-reporting-cell-identifier,
+	unspecified,
+	...
+}
+
+CellStateIndicationCause ::= ENUMERATED {
+	application-container-syntax-error,
+	inconsistent-reporting-cell-identifier,
+	unspecified,
+	...
+}
+
+FailureEventReportingCause ::= ENUMERATED {
+	application-container-syntax-error,
+	inconsistent-reporting-cell-identifier,
+	unspecified,
+	...
+}
+
+--
+-- IEs for Cell Load Reporting application
+--
+
+CellLoadReportingResponse::= CHOICE{
+	eUTRAN			EUTRANcellLoadReportingResponse,
+	uTRAN			OCTET STRING,
+	gERAN			OCTET STRING,
+	...,
+	eHRPD			EHRPDSectorLoadReportingResponse
+}
+
+CompositeAvailableCapacityGroup ::= OCTET STRING
+
+EUTRANcellLoadReportingResponse ::= SEQUENCE {
+	compositeAvailableCapacityGroup		CompositeAvailableCapacityGroup,
+	...
+}
+
+--
+-- IEs for Multi-Cell Load Reporting application
+--
+
+EUTRANResponse::= SEQUENCE {
+	cell-ID			OCTET STRING,
+	eUTRANcellLoadReportingResponse		EUTRANcellLoadReportingResponse,
+	...
+}
+
+EHRPD-Sector-ID ::= OCTET STRING (SIZE (16))
+
+IRAT-Cell-ID ::= CHOICE{
+	eUTRAN			OCTET STRING,
+	uTRAN			OCTET STRING,
+	gERAN			OCTET STRING,
+	...,
+	eHRPD			EHRPD-Sector-ID
+}
+
+RequestedCellList ::= SEQUENCE (SIZE(1.. maxnoofIRATReportingCells)) OF IRAT-Cell-ID
+
+MultiCellLoadReportingRequest::= SEQUENCE {
+	requestedCellList						RequestedCellList,
+	...
+}
+
+ReportingCellList-Item ::= SEQUENCE {
+	cell-ID									IRAT-Cell-ID,
+	...
+}
+
+ReportingCellList ::= SEQUENCE (SIZE(1.. maxnoofIRATReportingCells)) OF ReportingCellList-Item
+
+MultiCellLoadReportingResponse ::= SEQUENCE (SIZE(1.. maxnoofIRATReportingCells)) OF MultiCellLoadReportingResponse-Item
+
+MultiCellLoadReportingResponse-Item ::= CHOICE{ 
+	eUTRANResponse							EUTRANResponse,
+	uTRANResponse							OCTET STRING,
+	gERANResponse							OCTET STRING,
+	...,
+	eHRPD									EHRPDMultiSectorLoadReportingResponseItem
+}
+
+
+--
+-- IEs for Event-triggered Cell Load Reporting application
+--
+
+NumberOfMeasurementReportingLevels ::= ENUMERATED {
+	rl2,
+	rl3,
+	rl4,
+	rl5,
+	rl10,
+	...
+}
+
+EventTriggeredCellLoadReportingRequest ::= SEQUENCE {
+	numberOfMeasurementReportingLevels		NumberOfMeasurementReportingLevels,
+	...
+}
+
+OverloadFlag ::= ENUMERATED {
+	overload,
+	...
+}
+
+EventTriggeredCellLoadReportingResponse ::= SEQUENCE {
+	cellLoadReportingResponse				CellLoadReportingResponse,
+	overloadFlag							OverloadFlag						OPTIONAL,
+	...
+}
+
+--
+-- IEs for HO Reporting application
+--
+
+
+
+HOReport::= SEQUENCE {
+	hoType					HoType,
+	hoReportType			HoReportType,
+	hosourceID				IRAT-Cell-ID,
+	hoTargetID				IRAT-Cell-ID,
+	candidateCellList		CandidateCellList,
+	...,
+	candidatePCIList		CandidatePCIList	OPTIONAL
+}
+
+HoType ::= ENUMERATED {
+	ltetoutran,
+	ltetogeran,
+	...
+}
+
+HoReportType ::= ENUMERATED {
+	unnecessaryhotoanotherrat,
+	...,
+	earlyirathandover
+}
+
+CandidateCellList ::= SEQUENCE (SIZE(1..maxnoofcandidateCells)) OF IRAT-Cell-ID
+
+CandidatePCIList ::= SEQUENCE (SIZE(1..maxnoofcandidateCells)) OF CandidatePCI
+
+CandidatePCI ::= SEQUENCE {
+	pCI			INTEGER (0..503),
+	eARFCN		OCTET STRING,
+	...
+}
+
+--
+-- IEs for E-UTRAN Cell Activation application
+--
+
+CellActivationRequest ::= SEQUENCE {
+	cellsToActivateList		CellsToActivateList,
+	minimumActivationTime	INTEGER (1..60)		OPTIONAL,
+...
+}
+
+CellsToActivateList ::= SEQUENCE (SIZE(1.. maxnoofCellineNB)) OF CellsToActivateList-Item
+
+CellsToActivateList-Item ::= SEQUENCE {
+	cell-ID					OCTET STRING,
+	...
+}
+
+CellActivationResponse ::= SEQUENCE {
+	activatedCellsList		ActivatedCellsList,
+	...
+}
+
+ActivatedCellsList ::= SEQUENCE (SIZE(0.. maxnoofCellineNB)) OF ActivatedCellsList-Item
+
+ActivatedCellsList-Item ::= SEQUENCE {
+	cell-ID					OCTET STRING,
+	...
+}
+
+--
+-- IEs for Energy Savings Indication application
+--
+
+CellStateIndication ::= SEQUENCE {
+	notificationCellList			NotificationCellList,
+	...
+}
+
+NotificationCellList ::= SEQUENCE (SIZE(1.. maxnoofCellineNB)) OF NotificationCellList-Item
+
+NotificationCellList-Item ::= SEQUENCE {
+	cell-ID					OCTET STRING,
+	notifyFlag				NotifyFlag,
+	...
+}
+
+NotifyFlag ::= ENUMERATED {
+	activated,
+	deactivated,
+	...
+}
+
+FailureEventReport::= CHOICE {
+	tooEarlyInterRATHOReportFromEUTRAN			TooEarlyInterRATHOReportReportFromEUTRAN,
+	...
+}
+
+TooEarlyInterRATHOReportReportFromEUTRAN ::= SEQUENCE {
+	uERLFReportContainer	OCTET STRING, -- as defined in TS 36.331 [16] --
+	mobilityInformation		MobilityInformation		OPTIONAL,
+	...
+}
+
+MobilityInformation ::= BIT STRING (SIZE(32))
+
+
+--
+-- IEs for reporting of eHRPD load
+--
+
+EHRPDCapacityValue ::= INTEGER (0..100)
+
+EHRPDSectorCapacityClassValue ::= INTEGER (1..100, ...)
+
+EHRPDSectorLoadReportingResponse ::= SEQUENCE {
+	dL-EHRPD-CompositeAvailableCapacity			EHRPDCompositeAvailableCapacity,
+	uL-EHRPD-CompositeAvailableCapacity			EHRPDCompositeAvailableCapacity,
+	...
+}
+
+EHRPDCompositeAvailableCapacity ::= SEQUENCE {
+	eHRPDSectorCapacityClassValue				EHRPDSectorCapacityClassValue,
+	eHRPDCapacityValue							EHRPDCapacityValue,
+	...
+}
+
+EHRPDMultiSectorLoadReportingResponseItem ::= SEQUENCE {
+	eHRPD-Sector-ID							EHRPD-Sector-ID,
+	eHRPDSectorLoadReportingResponse		EHRPDSectorLoadReportingResponse,
+	...
+}
+
+
+-- **************************************************************
+--
+-- Constants
+--
+-- **************************************************************
+
+maxnoofIRATReportingCells					INTEGER ::= 128
+maxnoofcandidateCells						INTEGER ::= 16
+maxnoofCellineNB							INTEGER ::= 256
+
+END
--- a/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/rel_13/load_mod.txt
+++ b/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/rel_13/load_mod.txt
@ -0,0 +1,7 @@
+S1AP-CommonDataTypes.asn
+S1AP-Constants.asn
+S1AP-Containers.asn
+S1AP-IEs.asn
+S1AP-PDU-Contents.asn
+S1AP-PDU-Descriptions.asn
+SonTransfer-IEs.asn
--- a/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/rel_13/load_obj.txt
+++ b/pycrate_asn1dir/3GPP_EUTRAN_S1AP_36413/rel_13/load_obj.txt
--- a/pycrate_asn1dir/S1AP.json
+++ b/pycrate_asn1dir/S1AP.json
@ -71,6 +71,11 @@
    {"id": "S1AP-Constants.id-ConnectionEstablishmentIndication", "group": 3},
    {"id": "S1AP-Constants.id-UEContextSuspend", "group": 3},
    {"id": "S1AP-Constants.id-UEContextResume", "group": 3},
+    {"id": "S1AP-Constants.id-NASDeliveryIndication", "group": 3},
+    {"id": "S1AP-Constants.id-RetrieveUEInformation", "group": 3},
+    {"id": "S1AP-Constants.id-UEInformationTransfer", "group": 3},
+    {"id": "S1AP-Constants.id-eNBCPRelocationIndication", "group": 3},
+    {"id": "S1AP-Constants.id-MMECPRelocationIndication", "group": 3},
    {"id": "S1AP-Constants.maxPrivateIEs", "group": 3},
    {"id": "S1AP-Constants.maxProtocolExtensions", "group": 3},
    {"id": "S1AP-Constants.maxProtocolIEs", "group": 3},
@ -90,6 +95,7 @@
    {"id": "S1AP-Constants.maxnoofCellsineNB", "group": 3},
    {"id": "S1AP-Constants.maxnoofTAIforWarning", "group": 3},
    {"id": "S1AP-Constants.maxnoofCellID", "group": 3},
+    {"id": "S1AP-Constants.maxnoofDCNs", "group": 3},
    {"id": "S1AP-Constants.maxnoofEmergencyAreaID", "group": 3},
    {"id": "S1AP-Constants.maxnoofCellinTAI", "group": 3},
    {"id": "S1AP-Constants.maxnoofCellinEAI", "group": 3},
@ -331,7 +337,23 @@
    {"id": "S1AP-Constants.id-E-RABFailedToResumeListResumeRes", "group": 3},
    {"id": "S1AP-Constants.id-E-RABFailedToResumeItemResumeRes", "group": 3},
    {"id": "S1AP-Constants.id-NB-IoT-Paging-eDRXInformation", "group": 3},
+    {"id": "S1AP-Constants.id-V2XServicesAuthorized", "group": 3},
    {"id": "S1AP-Constants.id-UEUserPlaneCIoTSupportIndicator", "group": 3},
+    {"id": "S1AP-Constants.id-CE-mode-B-SupportIndicator", "group": 3},
+    {"id": "S1AP-Constants.id-SRVCCOperationNotPossible", "group": 3},
+    {"id": "S1AP-Constants.id-NB-IoT-UEIdentityIndexValue", "group": 3},
+    {"id": "S1AP-Constants.id-RRC-Resume-Cause", "group": 3},
+    {"id": "S1AP-Constants.id-DCN-ID", "group": 3},
+    {"id": "S1AP-Constants.id-ServedDCNs", "group": 3},
+    {"id": "S1AP-Constants.id-UESidelinkAggregateMaximumBitrate", "group": 3},
+    {"id": "S1AP-Constants.id-DLNASPDUDeliveryAckRequest", "group": 3},
+    {"id": "S1AP-Constants.id-Coverage-Level", "group": 3},
+    {"id": "S1AP-Constants.id-EnhancedCoverageRestricted", "group": 3},
+    {"id": "S1AP-Constants.id-UE-Level-QoS-Parameters", "group": 3},
+    {"id": "S1AP-Constants.id-DL-CP-SecurityInformation", "group": 3},
+    {"id": "S1AP-Constants.id-UL-CP-SecurityInformation", "group": 3},
+    {"id": "S1AP-Constants.id-CE-ModeBRestricted", "group": 3},
+    {"id": "S1AP-Constants.id-PendingDataIndication", "group": 3},
    {"id": "S1AP-Containers.S1AP-PROTOCOL-IES", "group": 4},
    {"id": "S1AP-Containers.S1AP-PROTOCOL-IES-PAIR", "group": 4},
    {"id": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "group": 4},
@ -383,6 +405,7 @@
    {"id": "S1AP-IEs.CellIdentifierAndCELevelForCECapableUEs", "group": 5},
    {"id": "S1AP-IEs.CellIdentifierAndCELevelForCECapableUEs-ExtIEs", "group": 5},
    {"id": "S1AP-IEs.CELevel", "group": 5},
+    {"id": "S1AP-IEs.CE-mode-B-SupportIndicator", "group": 5},
    {"id": "S1AP-IEs.CellIdentity", "group": 5},
    {"id": "S1AP-IEs.CellID-Broadcast", "group": 5},
    {"id": "S1AP-IEs.CellID-Broadcast-Item", "group": 5},
@ -426,15 +449,24 @@
    {"id": "S1AP-IEs.COUNTValueExtended-ExtIEs", "group": 5},
    {"id": "S1AP-IEs.COUNTvaluePDCP-SNlength18", "group": 5},
    {"id": "S1AP-IEs.COUNTvaluePDCP-SNlength18-ExtIEs", "group": 5},
+    {"id": "S1AP-IEs.Coverage-Level", "group": 5},
    {"id": "S1AP-IEs.CriticalityDiagnostics", "group": 5},
    {"id": "S1AP-IEs.CriticalityDiagnostics-ExtIEs", "group": 5},
    {"id": "S1AP-IEs.CriticalityDiagnostics-IE-List", "group": 5},
    {"id": "S1AP-IEs.CriticalityDiagnostics-IE-Item", "group": 5},
    {"id": "S1AP-IEs.CriticalityDiagnostics-IE-Item-ExtIEs", "group": 5},
    {"id": "S1AP-IEs.DataCodingScheme", "group": 5},
+    {"id": "S1AP-IEs.DCN-ID", "group": 5},
+    {"id": "S1AP-IEs.ServedDCNs", "group": 5},
+    {"id": "S1AP-IEs.ServedDCNsItem", "group": 5},
+    {"id": "S1AP-IEs.ServedDCNsItem-ExtIEs", "group": 5},
+    {"id": "S1AP-IEs.DL-CP-SecurityInformation", "group": 5},
+    {"id": "S1AP-IEs.DL-CP-SecurityInformation-ExtIEs", "group": 5},
    {"id": "S1AP-IEs.DL-Forwarding", "group": 5},
+    {"id": "S1AP-IEs.DL-NAS-MAC", "group": 5},
    {"id": "S1AP-IEs.Direct-Forwarding-Path-Availability", "group": 5},
    {"id": "S1AP-IEs.Data-Forwarding-Not-Possible", "group": 5},
+    {"id": "S1AP-IEs.DLNASPDUDeliveryAckRequest", "group": 5},
    {"id": "S1AP-IEs.EARFCN", "group": 5},
    {"id": "S1AP-IEs.ECGIList", "group": 5},
    {"id": "S1AP-IEs.PWSfailedECGIList", "group": 5},
@ -463,6 +495,8 @@
    {"id": "S1AP-IEs.ENBname", "group": 5},
    {"id": "S1AP-IEs.ENBX2TLAs", "group": 5},
    {"id": "S1AP-IEs.EncryptionAlgorithms", "group": 5},
+    {"id": "S1AP-IEs.EnhancedCoverageRestricted", "group": 5},
+    {"id": "S1AP-IEs.CE-ModeBRestricted", "group": 5},
    {"id": "S1AP-IEs.EPLMNs", "group": 5},
    {"id": "S1AP-IEs.EventType", "group": 5},
    {"id": "S1AP-IEs.E-RAB-ID", "group": 5},
@ -595,6 +629,7 @@
    {"id": "S1AP-IEs.NB-IoT-Paging-eDRXInformation-ExtIEs", "group": 5},
    {"id": "S1AP-IEs.NB-IoT-Paging-eDRX-Cycle", "group": 5},
    {"id": "S1AP-IEs.NB-IoT-PagingTimeWindow", "group": 5},
+    {"id": "S1AP-IEs.NB-IoT-UEIdentityIndexValue", "group": 5},
    {"id": "S1AP-IEs.NextPagingAreaScope", "group": 5},
    {"id": "S1AP-IEs.NumberofBroadcastRequest", "group": 5},
    {"id": "S1AP-IEs.NumberOfBroadcasts", "group": 5},
@ -613,6 +648,7 @@
    {"id": "S1AP-IEs.PDCP-SN", "group": 5},
    {"id": "S1AP-IEs.PDCP-SNExtended", "group": 5},
    {"id": "S1AP-IEs.PDCP-SNlength18", "group": 5},
+    {"id": "S1AP-IEs.PendingDataIndication", "group": 5},
    {"id": "S1AP-IEs.M1PeriodicReporting", "group": 5},
    {"id": "S1AP-IEs.M1PeriodicReporting-ExtIEs", "group": 5},
    {"id": "S1AP-IEs.PLMNidentity", "group": 5},
@ -683,6 +719,7 @@
    {"id": "S1AP-IEs.SourceBSS-ToTargetBSS-TransparentContainer", "group": 5},
    {"id": "S1AP-IEs.SourceeNB-ID", "group": 5},
    {"id": "S1AP-IEs.SourceeNB-ID-ExtIEs", "group": 5},
+    {"id": "S1AP-IEs.SRVCCOperationNotPossible", "group": 5},
    {"id": "S1AP-IEs.SRVCCOperationPossible", "group": 5},
    {"id": "S1AP-IEs.SRVCCHOIndication", "group": 5},
    {"id": "S1AP-IEs.SourceeNB-ToTargeteNB-TransparentContainer", "group": 5},
@ -770,11 +807,21 @@
    {"id": "S1AP-IEs.UE-RLF-Report-Container-for-extended-bands", "group": 5},
    {"id": "S1AP-IEs.UESecurityCapabilities", "group": 5},
    {"id": "S1AP-IEs.UESecurityCapabilities-ExtIEs", "group": 5},
+    {"id": "S1AP-IEs.UESidelinkAggregateMaximumBitrate", "group": 5},
+    {"id": "S1AP-IEs.UE-Sidelink-Aggregate-MaximumBitrates-ExtIEs", "group": 5},
    {"id": "S1AP-IEs.UE-Usage-Type", "group": 5},
+    {"id": "S1AP-IEs.UL-CP-SecurityInformation", "group": 5},
+    {"id": "S1AP-IEs.UL-CP-SecurityInformation-ExtIEs", "group": 5},
+    {"id": "S1AP-IEs.UL-NAS-MAC", "group": 5},
+    {"id": "S1AP-IEs.UL-NAS-Count", "group": 5},
    {"id": "S1AP-IEs.UserLocationInformation", "group": 5},
    {"id": "S1AP-IEs.UserLocationInformation-ExtIEs", "group": 5},
    {"id": "S1AP-IEs.UEUserPlaneCIoTSupportIndicator", "group": 5},
    {"id": "S1AP-IEs.VoiceSupportMatchIndicator", "group": 5},
+    {"id": "S1AP-IEs.V2XServicesAuthorized", "group": 5},
+    {"id": "S1AP-IEs.V2XServicesAuthorized-ExtIEs", "group": 5},
+    {"id": "S1AP-IEs.VehicleUE", "group": 5},
+    {"id": "S1AP-IEs.PedestrianUE", "group": 5},
    {"id": "S1AP-IEs.WarningAreaList", "group": 5},
    {"id": "S1AP-IEs.WarningType", "group": 5},
    {"id": "S1AP-IEs.WarningSecurityInfo", "group": 5},
@ -917,6 +964,8 @@
    {"id": "S1AP-PDU-Contents.NASNonDeliveryIndication-IEs", "group": 6},
    {"id": "S1AP-PDU-Contents.RerouteNASRequest", "group": 6},
    {"id": "S1AP-PDU-Contents.RerouteNASRequest-IEs", "group": 6},
+    {"id": "S1AP-PDU-Contents.NASDeliveryIndication", "group": 6},
+    {"id": "S1AP-PDU-Contents.NASDeliveryIndicationIEs", "group": 6},
    {"id": "S1AP-PDU-Contents.Reset", "group": 6},
    {"id": "S1AP-PDU-Contents.ResetIEs", "group": 6},
    {"id": "S1AP-PDU-Contents.ResetType", "group": 6},
@ -1048,6 +1097,14 @@
    {"id": "S1AP-PDU-Contents.UEContextResumeFailureIEs", "group": 6},
    {"id": "S1AP-PDU-Contents.ConnectionEstablishmentIndication", "group": 6},
    {"id": "S1AP-PDU-Contents.ConnectionEstablishmentIndicationIEs", "group": 6},
+    {"id": "S1AP-PDU-Contents.RetrieveUEInformation", "group": 6},
+    {"id": "S1AP-PDU-Contents.RetrieveUEInformationIEs", "group": 6},
+    {"id": "S1AP-PDU-Contents.UEInformationTransfer", "group": 6},
+    {"id": "S1AP-PDU-Contents.UEInformationTransferIEs", "group": 6},
+    {"id": "S1AP-PDU-Contents.ENBCPRelocationIndication", "group": 6},
+    {"id": "S1AP-PDU-Contents.ENBCPRelocationIndicationIEs", "group": 6},
+    {"id": "S1AP-PDU-Contents.MMECPRelocationIndication", "group": 6},
+    {"id": "S1AP-PDU-Contents.MMECPRelocationIndicationIEs", "group": 6},
    {"id": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURE", "group": 7},
    {"id": "S1AP-PDU-Descriptions.S1AP-PDU", "group": 7},
    {"id": "S1AP-PDU-Descriptions.InitiatingMessage", "group": 7},
@ -1113,6 +1170,11 @@
    {"id": "S1AP-PDU-Descriptions.uEContextSuspend", "group": 7},
    {"id": "S1AP-PDU-Descriptions.uEContextResume", "group": 7},
    {"id": "S1AP-PDU-Descriptions.connectionEstablishmentIndication", "group": 7},
+    {"id": "S1AP-PDU-Descriptions.nASDeliveryIndication", "group": 7},
+    {"id": "S1AP-PDU-Descriptions.retrieveUEInformation", "group": 7},
+    {"id": "S1AP-PDU-Descriptions.uEInformationTransfer", "group": 7},
+    {"id": "S1AP-PDU-Descriptions.eNBCPRelocationIndication", "group": 7},
+    {"id": "S1AP-PDU-Descriptions.mMECPRelocationIndication", "group": 7},
    {"id": "SonTransfer-IEs.SONtransferApplicationIdentity", "group": 8},
    {"id": "SonTransfer-IEs.SONtransferRequestContainer", "group": 8},
    {"id": "SonTransfer-IEs.SONtransferResponseContainer", "group": 8},
@ -1184,14 +1246,17 @@
    {"source": "S1AP-IEs.CGI-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
    {"source": "S1AP-PDU-Contents.HandoverRequestIEs", "target": "S1AP-IEs.ProSeAuthorized", "value": 1},
    {"source": "S1AP-PDU-Contents.HandoverRequestIEs", "target": "S1AP-IEs.TraceActivation", "value": 1},
+    {"source": "S1AP-PDU-Contents.HandoverRequestIEs", "target": "S1AP-IEs.V2XServicesAuthorized", "value": 1},
    {"source": "S1AP-PDU-Contents.HandoverRequestIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
    {"source": "S1AP-PDU-Contents.HandoverRequestIEs", "target": "S1AP-IEs.RequestType", "value": 1},
    {"source": "S1AP-PDU-Contents.HandoverRequestIEs", "target": "S1AP-IEs.GUMMEI", "value": 1},
    {"source": "S1AP-PDU-Contents.HandoverRequestIEs", "target": "S1AP-IEs.UESecurityCapabilities", "value": 1},
    {"source": "S1AP-PDU-Contents.HandoverRequestIEs", "target": "S1AP-IEs.CSG-Id", "value": 1},
+    {"source": "S1AP-PDU-Contents.HandoverRequestIEs", "target": "S1AP-IEs.PendingDataIndication", "value": 1},
    {"source": "S1AP-PDU-Contents.HandoverRequestIEs", "target": "S1AP-IEs.UEAggregateMaximumBitrate", "value": 1},
    {"source": "S1AP-PDU-Contents.HandoverRequestIEs", "target": "S1AP-IEs.CSGMembershipStatus", "value": 1},
    {"source": "S1AP-PDU-Contents.HandoverRequestIEs", "target": "S1AP-IEs.HandoverType", "value": 1},
+    {"source": "S1AP-PDU-Contents.HandoverRequestIEs", "target": "S1AP-IEs.CE-ModeBRestricted", "value": 1},
    {"source": "S1AP-PDU-Contents.HandoverRequestIEs", "target": "S1AP-IEs.Cause", "value": 1},
    {"source": "S1AP-PDU-Contents.HandoverRequestIEs", "target": "S1AP-IEs.NASSecurityParameterstoE-UTRAN", "value": 1},
    {"source": "S1AP-PDU-Contents.HandoverRequestIEs", "target": "S1AP-IEs.Source-ToTarget-TransparentContainer", "value": 1},
@ -1202,8 +1267,10 @@
    {"source": "S1AP-PDU-Contents.HandoverRequestIEs", "target": "S1AP-IEs.UEUserPlaneCIoTSupportIndicator", "value": 1},
    {"source": "S1AP-PDU-Contents.HandoverRequestIEs", "target": "S1AP-IEs.MME-UE-S1AP-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.HandoverRequestIEs", "target": "S1AP-PDU-Contents.E-RABToBeSetupListHOReq", "value": 1},
+    {"source": "S1AP-PDU-Contents.HandoverRequestIEs", "target": "S1AP-IEs.EnhancedCoverageRestricted", "value": 1},
    {"source": "S1AP-PDU-Contents.HandoverRequestIEs", "target": "S1AP-IEs.ExpectedUEBehaviour", "value": 1},
    {"source": "S1AP-PDU-Contents.HandoverRequestIEs", "target": "S1AP-IEs.HandoverRestrictionList", "value": 1},
+    {"source": "S1AP-PDU-Contents.HandoverRequestIEs", "target": "S1AP-IEs.UESidelinkAggregateMaximumBitrate", "value": 1},
    {"source": "S1AP-PDU-Contents.HandoverRequestIEs", "target": "S1AP-IEs.MDTPLMNList", "value": 1},
    {"source": "S1AP-Constants.id-PS-ServiceNotAvailable", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.UplinkS1cdma2000tunnelling", "target": "S1AP-PDU-Contents.UplinkS1cdma2000tunnellingIEs", "value": 1},
@ -1256,6 +1323,9 @@
    {"source": "S1AP-PDU-Descriptions.handoverCancel", "target": "S1AP-PDU-Contents.HandoverCancel", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABToBeSetupItemCtxtSUReqIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABToBeSetupItemCtxtSUReqIEs", "target": "S1AP-PDU-Contents.E-RABToBeSetupItemCtxtSUReq", "value": 1},
+    {"source": "S1AP-PDU-Contents.NASDeliveryIndicationIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
+    {"source": "S1AP-PDU-Contents.NASDeliveryIndicationIEs", "target": "S1AP-IEs.MME-UE-S1AP-ID", "value": 1},
+    {"source": "S1AP-PDU-Contents.NASDeliveryIndicationIEs", "target": "S1AP-IEs.ENB-UE-S1AP-ID", "value": 1},
    {"source": "S1AP-Constants.id-NASSecurityParameterstoE-UTRAN", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABSetupItemCtxtSUResIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABSetupItemCtxtSUResIEs", "target": "S1AP-PDU-Contents.E-RABSetupItemCtxtSURes", "value": 1},
@ -1263,12 +1333,15 @@
    {"source": "S1AP-Constants.id-SubscriberProfileIDforRFP", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Constants.id-TransportInformation", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.S1SetupResponseIEs", "target": "S1AP-IEs.UE-RetentionInformation", "value": 1},
+    {"source": "S1AP-PDU-Contents.S1SetupResponseIEs", "target": "S1AP-IEs.ServedDCNs", "value": 1},
    {"source": "S1AP-PDU-Contents.S1SetupResponseIEs", "target": "S1AP-IEs.ServedGUMMEIs", "value": 1},
    {"source": "S1AP-PDU-Contents.S1SetupResponseIEs", "target": "S1AP-IEs.MMERelaySupportIndicator", "value": 1},
    {"source": "S1AP-PDU-Contents.S1SetupResponseIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
    {"source": "S1AP-PDU-Contents.S1SetupResponseIEs", "target": "S1AP-IEs.CriticalityDiagnostics", "value": 1},
    {"source": "S1AP-PDU-Contents.S1SetupResponseIEs", "target": "S1AP-IEs.MMEname", "value": 1},
    {"source": "S1AP-PDU-Contents.S1SetupResponseIEs", "target": "S1AP-IEs.RelativeMMECapacity", "value": 1},
+    {"source": "S1AP-PDU-Contents.RetrieveUEInformationIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
+    {"source": "S1AP-PDU-Contents.RetrieveUEInformationIEs", "target": "S1AP-IEs.S-TMSI", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABFailedToResumeListResumeReq", "target": "S1AP-PDU-Contents.E-RAB-IE-ContainerList", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABFailedToResumeListResumeReq", "target": "S1AP-PDU-Contents.E-RABFailedToResumeItemResumeReqIEs", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABSetupItemCtxtSURes", "target": "S1AP-PDU-Contents.E-RABSetupItemCtxtSUResExtIEs", "value": 1},
@ -1348,7 +1421,7 @@
    {"source": "S1AP-IEs.ForbiddenLACs", "target": "S1AP-Constants.maxnoofForbLACs", "value": 1},
    {"source": "S1AP-IEs.ForbiddenLACs", "target": "S1AP-IEs.LAC", "value": 1},
    {"source": "S1AP-IEs.ForbiddenLAs-Item-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
-    {"source": "S1AP-IEs.Cdma2000OneXSRVCCInfo-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
+    {"source": "S1AP-Constants.id-GWContextReleaseIndication", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Constants.id-LocationReportingFailureIndication", "target": "S1AP-CommonDataTypes.ProcedureCode", "value": 1},
    {"source": "S1AP-Constants.id-S1Setup", "target": "S1AP-CommonDataTypes.ProcedureCode", "value": 1},
    {"source": "S1AP-IEs.LoggedMDT", "target": "S1AP-IEs.LoggingInterval", "value": 1},
@ -1379,9 +1452,7 @@
    {"source": "S1AP-Constants.id-UEContextReleaseRequest", "target": "S1AP-CommonDataTypes.ProcedureCode", "value": 1},
    {"source": "S1AP-PDU-Contents.NASNonDeliveryIndication", "target": "S1AP-PDU-Contents.NASNonDeliveryIndication-IEs", "value": 1},
    {"source": "S1AP-PDU-Contents.NASNonDeliveryIndication", "target": "S1AP-Containers.ProtocolIE-Container", "value": 1},
-    {"source": "S1AP-IEs.RecommendedCellItem", "target": "S1AP-IEs.RecommendedCellsForPagingItem-ExtIEs", "value": 1},
-    {"source": "S1AP-IEs.RecommendedCellItem", "target": "S1AP-Containers.ProtocolExtensionContainer", "value": 1},
-    {"source": "S1AP-IEs.RecommendedCellItem", "target": "S1AP-IEs.EUTRAN-CGI", "value": 1},
+    {"source": "S1AP-Constants.id-DL-CP-SecurityInformation", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Constants.id-extended-UEIdentityIndexValue", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABToBeModifiedItemBearerModIndIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABToBeModifiedItemBearerModIndIEs", "target": "S1AP-PDU-Contents.E-RABToBeModifiedItemBearerModInd", "value": 1},
@ -1405,6 +1476,8 @@
    {"source": "S1AP-PDU-Contents.E-RABReleaseListBearerRelComp", "target": "S1AP-Containers.ProtocolIE-SingleContainer", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABReleaseListBearerRelComp", "target": "S1AP-PDU-Contents.E-RABReleaseItemBearerRelCompIEs", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABReleaseListBearerRelComp", "target": "S1AP-Constants.maxnoofE-RABs", "value": 1},
+    {"source": "S1AP-PDU-Descriptions.eNBCPRelocationIndication", "target": "S1AP-PDU-Contents.ENBCPRelocationIndication", "value": 1},
+    {"source": "S1AP-PDU-Descriptions.eNBCPRelocationIndication", "target": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURE", "value": 1},
    {"source": "S1AP-IEs.GERAN-Cell-ID", "target": "S1AP-IEs.LAI", "value": 1},
    {"source": "S1AP-IEs.GERAN-Cell-ID", "target": "S1AP-IEs.RAC", "value": 1},
    {"source": "S1AP-IEs.GERAN-Cell-ID", "target": "S1AP-IEs.GERAN-Cell-ID-ExtIEs", "value": 1},
@ -1436,6 +1509,7 @@
    {"source": "S1AP-IEs.ListeningSubframePattern", "target": "S1AP-Containers.ProtocolExtensionContainer", "value": 1},
    {"source": "S1AP-IEs.ListeningSubframePattern", "target": "S1AP-IEs.ListeningSubframePattern-ExtIEs", "value": 1},
    {"source": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-2", "target": "S1AP-PDU-Descriptions.pWSRestartIndication", "value": 1},
+    {"source": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-2", "target": "S1AP-PDU-Descriptions.retrieveUEInformation", "value": 1},
    {"source": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-2", "target": "S1AP-PDU-Descriptions.nASNonDeliveryIndication", "value": 1},
    {"source": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-2", "target": "S1AP-PDU-Descriptions.uplinkS1cdma2000tunnelling", "value": 1},
    {"source": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-2", "target": "S1AP-PDU-Descriptions.uECapabilityInfoIndication", "value": 1},
@ -1444,6 +1518,7 @@
    {"source": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-2", "target": "S1AP-PDU-Descriptions.pWSFailureIndication", "value": 1},
    {"source": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-2", "target": "S1AP-PDU-Descriptions.traceFailureIndication", "value": 1},
    {"source": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-2", "target": "S1AP-PDU-Descriptions.downlinkS1cdma2000tunnelling", "value": 1},
+    {"source": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-2", "target": "S1AP-PDU-Descriptions.uEInformationTransfer", "value": 1},
    {"source": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-2", "target": "S1AP-PDU-Descriptions.overloadStop", "value": 1},
    {"source": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-2", "target": "S1AP-PDU-Descriptions.uEContextReleaseRequest", "value": 1},
    {"source": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-2", "target": "S1AP-PDU-Descriptions.initialUEMessage", "value": 1},
@ -1463,15 +1538,18 @@
    {"source": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-2", "target": "S1AP-PDU-Descriptions.uplinkUEAssociatedLPPaTransport", "value": 1},
    {"source": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-2", "target": "S1AP-PDU-Descriptions.overloadStart", "value": 1},
    {"source": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-2", "target": "S1AP-PDU-Descriptions.downlinkNASTransport", "value": 1},
+    {"source": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-2", "target": "S1AP-PDU-Descriptions.eNBCPRelocationIndication", "value": 1},
    {"source": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-2", "target": "S1AP-PDU-Descriptions.locationReport", "value": 1},
    {"source": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-2", "target": "S1AP-PDU-Descriptions.rerouteNASRequest", "value": 1},
    {"source": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-2", "target": "S1AP-PDU-Descriptions.mMEDirectInformationTransfer", "value": 1},
    {"source": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-2", "target": "S1AP-PDU-Descriptions.eNBDirectInformationTransfer", "value": 1},
    {"source": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-2", "target": "S1AP-PDU-Descriptions.handoverNotification", "value": 1},
+    {"source": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-2", "target": "S1AP-PDU-Descriptions.nASDeliveryIndication", "value": 1},
    {"source": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-2", "target": "S1AP-PDU-Descriptions.eNBStatusTransfer", "value": 1},
    {"source": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-2", "target": "S1AP-PDU-Descriptions.e-RABReleaseIndication", "value": 1},
    {"source": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-2", "target": "S1AP-PDU-Descriptions.mMEConfigurationTransfer", "value": 1},
    {"source": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-2", "target": "S1AP-PDU-Descriptions.eNBConfigurationTransfer", "value": 1},
+    {"source": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES-CLASS-2", "target": "S1AP-PDU-Descriptions.mMECPRelocationIndication", "value": 1},
    {"source": "S1AP-Constants.id-uplinkNASTransport", "target": "S1AP-CommonDataTypes.ProcedureCode", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABReleaseResponse", "target": "S1AP-PDU-Contents.E-RABReleaseResponseIEs", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABReleaseResponse", "target": "S1AP-Containers.ProtocolIE-Container", "value": 1},
@ -1482,10 +1560,7 @@
    {"source": "S1AP-IEs.LoggedMBSFNMDT", "target": "S1AP-Containers.ProtocolExtensionContainer", "value": 1},
    {"source": "S1AP-PDU-Contents.UplinkNASTransport", "target": "S1AP-PDU-Contents.UplinkNASTransport-IEs", "value": 1},
    {"source": "S1AP-PDU-Contents.UplinkNASTransport", "target": "S1AP-Containers.ProtocolIE-Container", "value": 1},
-    {"source": "S1AP-IEs.SourceeNB-ID", "target": "S1AP-IEs.TAI", "value": 1},
-    {"source": "S1AP-IEs.SourceeNB-ID", "target": "S1AP-IEs.SourceeNB-ID-ExtIEs", "value": 1},
-    {"source": "S1AP-IEs.SourceeNB-ID", "target": "S1AP-Containers.ProtocolExtensionContainer", "value": 1},
-    {"source": "S1AP-IEs.SourceeNB-ID", "target": "S1AP-IEs.Global-ENB-ID", "value": 1},
+    {"source": "S1AP-Constants.id-MMECPRelocationIndication", "target": "S1AP-CommonDataTypes.ProcedureCode", "value": 1},
    {"source": "S1AP-Constants.id-Target-ToSource-TransparentContainer", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Constants.id-Cause", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "SonTransfer-IEs.ReportingCellList-Item", "target": "SonTransfer-IEs.IRAT-Cell-ID", "value": 1},
@ -1496,12 +1571,15 @@
    {"source": "S1AP-IEs.HandoverRestrictionList", "target": "S1AP-IEs.ForbiddenTAs", "value": 1},
    {"source": "S1AP-IEs.HandoverRestrictionList", "target": "S1AP-IEs.HandoverRestrictionList-ExtIEs", "value": 1},
    {"source": "S1AP-IEs.HandoverRestrictionList", "target": "S1AP-IEs.EPLMNs", "value": 1},
+    {"source": "S1AP-Constants.id-DLNASPDUDeliveryAckRequest", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Constants.id-GW-TransportLayerAddress", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-IEs.COUNTvalue", "target": "S1AP-IEs.PDCP-SN", "value": 1},
    {"source": "S1AP-IEs.COUNTvalue", "target": "S1AP-Containers.ProtocolExtensionContainer", "value": 1},
    {"source": "S1AP-IEs.COUNTvalue", "target": "S1AP-IEs.HFN", "value": 1},
    {"source": "S1AP-IEs.COUNTvalue", "target": "S1AP-IEs.COUNTvalue-ExtIEs", "value": 1},
-    {"source": "S1AP-PDU-Contents.E-RABModifyItemBearerModResExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
+    {"source": "S1AP-IEs.UESidelinkAggregateMaximumBitrate", "target": "S1AP-IEs.UE-Sidelink-Aggregate-MaximumBitrates-ExtIEs", "value": 1},
+    {"source": "S1AP-IEs.UESidelinkAggregateMaximumBitrate", "target": "S1AP-IEs.BitRate", "value": 1},
+    {"source": "S1AP-IEs.UESidelinkAggregateMaximumBitrate", "target": "S1AP-Containers.ProtocolExtensionContainer", "value": 1},
    {"source": "S1AP-IEs.UE-associatedLogicalS1-ConnectionItem", "target": "S1AP-IEs.MME-UE-S1AP-ID", "value": 1},
    {"source": "S1AP-IEs.UE-associatedLogicalS1-ConnectionItem", "target": "S1AP-Containers.ProtocolExtensionContainer", "value": 1},
    {"source": "S1AP-IEs.UE-associatedLogicalS1-ConnectionItem", "target": "S1AP-IEs.UE-associatedLogicalS1-ConnectionItemExtIEs", "value": 1},
@ -1513,6 +1591,8 @@
    {"source": "S1AP-PDU-Contents.HandoverFailureIEs", "target": "S1AP-IEs.Cause", "value": 1},
    {"source": "S1AP-Constants.id-E-RABSubjecttoDataForwardingList", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Constants.id-NB-IoT-DefaultPagingDRX", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
+    {"source": "S1AP-PDU-Descriptions.retrieveUEInformation", "target": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURE", "value": 1},
+    {"source": "S1AP-PDU-Descriptions.retrieveUEInformation", "target": "S1AP-PDU-Contents.RetrieveUEInformation", "value": 1},
    {"source": "S1AP-IEs.UE-associatedLogicalS1-ConnectionItemExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
    {"source": "S1AP-PDU-Contents.DeactivateTraceIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
    {"source": "S1AP-PDU-Contents.DeactivateTraceIEs", "target": "S1AP-IEs.MME-UE-S1AP-ID", "value": 1},
@ -1553,6 +1633,7 @@
    {"source": "S1AP-PDU-Descriptions.reset", "target": "S1AP-PDU-Contents.Reset", "value": 1},
    {"source": "S1AP-PDU-Descriptions.reset", "target": "S1AP-PDU-Contents.ResetAcknowledge", "value": 1},
    {"source": "S1AP-PDU-Descriptions.reset", "target": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURE", "value": 1},
+    {"source": "S1AP-Constants.id-RetrieveUEInformation", "target": "S1AP-CommonDataTypes.ProcedureCode", "value": 1},
    {"source": "S1AP-PDU-Contents.CellTrafficTrace", "target": "S1AP-PDU-Contents.CellTrafficTraceIEs", "value": 1},
    {"source": "S1AP-PDU-Contents.CellTrafficTrace", "target": "S1AP-Containers.ProtocolIE-Container", "value": 1},
    {"source": "S1AP-Constants.id-EUTRANRoundTripDelayEstimationInfo", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
@ -1670,6 +1751,11 @@
    {"source": "S1AP-PDU-Contents.E-RABModifyItemBearerModConf", "target": "S1AP-Containers.ProtocolExtensionContainer", "value": 1},
    {"source": "S1AP-Constants.id-E-RABFailedToBeReleasedList", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Constants.id-E-RABToBeSwitchedULItem", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
+    {"source": "SonTransfer-IEs.HOReport", "target": "SonTransfer-IEs.CandidatePCIList", "value": 1},
+    {"source": "SonTransfer-IEs.HOReport", "target": "SonTransfer-IEs.HoReportType", "value": 1},
+    {"source": "SonTransfer-IEs.HOReport", "target": "SonTransfer-IEs.CandidateCellList", "value": 1},
+    {"source": "SonTransfer-IEs.HOReport", "target": "SonTransfer-IEs.IRAT-Cell-ID", "value": 1},
+    {"source": "SonTransfer-IEs.HOReport", "target": "SonTransfer-IEs.HoType", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABToBeSetupItemCtxtSUReq", "target": "S1AP-IEs.GTP-TEID", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABToBeSetupItemCtxtSUReq", "target": "S1AP-IEs.E-RAB-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABToBeSetupItemCtxtSUReq", "target": "S1AP-IEs.E-RABLevelQoSParameters", "value": 1},
@ -1704,6 +1790,7 @@
    {"source": "S1AP-PDU-Contents.ENBStatusTransferIEs", "target": "S1AP-IEs.ENB-StatusTransfer-TransparentContainer", "value": 1},
    {"source": "S1AP-PDU-Contents.ENBStatusTransferIEs", "target": "S1AP-IEs.ENB-UE-S1AP-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.PathSwitchRequestIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
+    {"source": "S1AP-PDU-Contents.PathSwitchRequestIEs", "target": "S1AP-IEs.RRC-Establishment-Cause", "value": 1},
    {"source": "S1AP-PDU-Contents.PathSwitchRequestIEs", "target": "S1AP-IEs.EUTRAN-CGI", "value": 1},
    {"source": "S1AP-PDU-Contents.PathSwitchRequestIEs", "target": "S1AP-IEs.LHN-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.PathSwitchRequestIEs", "target": "S1AP-IEs.TAI", "value": 1},
@ -1750,14 +1837,19 @@
    {"source": "S1AP-Constants.id-MessageIdentifier", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-IEs.ForbiddenTAs-Item-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
    {"source": "S1AP-Constants.id-PathSwitchRequest", "target": "S1AP-CommonDataTypes.ProcedureCode", "value": 1},
+    {"source": "S1AP-PDU-Contents.PathSwitchRequestAcknowledgeIEs", "target": "S1AP-IEs.CE-ModeBRestricted", "value": 1},
+    {"source": "S1AP-PDU-Contents.PathSwitchRequestAcknowledgeIEs", "target": "S1AP-IEs.UESidelinkAggregateMaximumBitrate", "value": 1},
    {"source": "S1AP-PDU-Contents.PathSwitchRequestAcknowledgeIEs", "target": "S1AP-IEs.ProSeAuthorized", "value": 1},
+    {"source": "S1AP-PDU-Contents.PathSwitchRequestAcknowledgeIEs", "target": "S1AP-IEs.V2XServicesAuthorized", "value": 1},
    {"source": "S1AP-PDU-Contents.PathSwitchRequestAcknowledgeIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
    {"source": "S1AP-PDU-Contents.PathSwitchRequestAcknowledgeIEs", "target": "S1AP-IEs.CriticalityDiagnostics", "value": 1},
    {"source": "S1AP-PDU-Contents.PathSwitchRequestAcknowledgeIEs", "target": "S1AP-IEs.E-RABList", "value": 1},
    {"source": "S1AP-PDU-Contents.PathSwitchRequestAcknowledgeIEs", "target": "S1AP-IEs.ENB-UE-S1AP-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.PathSwitchRequestAcknowledgeIEs", "target": "S1AP-IEs.UEUserPlaneCIoTSupportIndicator", "value": 1},
    {"source": "S1AP-PDU-Contents.PathSwitchRequestAcknowledgeIEs", "target": "S1AP-IEs.MME-UE-S1AP-ID", "value": 1},
+    {"source": "S1AP-PDU-Contents.PathSwitchRequestAcknowledgeIEs", "target": "S1AP-IEs.EnhancedCoverageRestricted", "value": 1},
    {"source": "S1AP-PDU-Contents.PathSwitchRequestAcknowledgeIEs", "target": "S1AP-IEs.UEAggregateMaximumBitrate", "value": 1},
+    {"source": "S1AP-PDU-Contents.PathSwitchRequestAcknowledgeIEs", "target": "S1AP-IEs.PendingDataIndication", "value": 1},
    {"source": "S1AP-PDU-Contents.PathSwitchRequestAcknowledgeIEs", "target": "S1AP-IEs.CSGMembershipStatus", "value": 1},
    {"source": "S1AP-PDU-Contents.PathSwitchRequestAcknowledgeIEs", "target": "S1AP-IEs.SecurityContext", "value": 1},
    {"source": "S1AP-PDU-Contents.PathSwitchRequestAcknowledgeIEs", "target": "S1AP-PDU-Contents.E-RABToBeSwitchedULList", "value": 1},
@ -1795,6 +1887,10 @@
    {"source": "S1AP-IEs.COUNTvaluePDCP-SNlength18", "target": "S1AP-IEs.COUNTvaluePDCP-SNlength18-ExtIEs", "value": 1},
    {"source": "S1AP-PDU-Descriptions.mMEConfigurationTransfer", "target": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURE", "value": 1},
    {"source": "S1AP-PDU-Descriptions.mMEConfigurationTransfer", "target": "S1AP-PDU-Contents.MMEConfigurationTransfer", "value": 1},
+    {"source": "S1AP-IEs.V2XServicesAuthorized", "target": "S1AP-IEs.PedestrianUE", "value": 1},
+    {"source": "S1AP-IEs.V2XServicesAuthorized", "target": "S1AP-IEs.VehicleUE", "value": 1},
+    {"source": "S1AP-IEs.V2XServicesAuthorized", "target": "S1AP-IEs.V2XServicesAuthorized-ExtIEs", "value": 1},
+    {"source": "S1AP-IEs.V2XServicesAuthorized", "target": "S1AP-Containers.ProtocolExtensionContainer", "value": 1},
    {"source": "S1AP-Constants.id-PagingPriority", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.PWSRestartIndicationIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
    {"source": "S1AP-PDU-Contents.PWSRestartIndicationIEs", "target": "S1AP-IEs.ECGIListForRestart", "value": 1},
@ -1993,6 +2089,7 @@
    {"source": "S1AP-IEs.CellID-Cancelled-Item", "target": "S1AP-IEs.CellID-Cancelled-Item-ExtIEs", "value": 1},
    {"source": "S1AP-IEs.CellID-Cancelled-Item", "target": "S1AP-Containers.ProtocolExtensionContainer", "value": 1},
    {"source": "S1AP-IEs.CellID-Cancelled-Item", "target": "S1AP-IEs.EUTRAN-CGI", "value": 1},
+    {"source": "S1AP-IEs.UL-CP-SecurityInformation-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
    {"source": "S1AP-IEs.CompletedCellinEAI-Item-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
    {"source": "S1AP-Constants.id-AssistanceDataForPaging", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-IEs.ECGIList", "target": "S1AP-Constants.maxnoofCellID", "value": 1},
@ -2001,6 +2098,7 @@
    {"source": "S1AP-IEs.UE-S1AP-IDs", "target": "S1AP-IEs.MME-UE-S1AP-ID", "value": 1},
    {"source": "SonTransfer-IEs.RequestedCellList", "target": "SonTransfer-IEs.maxnoofIRATReportingCells", "value": 1},
    {"source": "SonTransfer-IEs.RequestedCellList", "target": "SonTransfer-IEs.IRAT-Cell-ID", "value": 1},
+    {"source": "S1AP-Constants.id-CE-ModeBRestricted", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Constants.id-Additional-GUTI", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Constants.id-WarningType", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-IEs.ServedGUMMEIsItem-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
@ -2012,6 +2110,7 @@
    {"source": "S1AP-Constants.id-E-RABToBeSwitchedDLItem", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Constants.id-CNDomain", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Constants.id-UEContextSuspend", "target": "S1AP-CommonDataTypes.ProcedureCode", "value": 1},
+    {"source": "S1AP-Constants.id-UESidelinkAggregateMaximumBitrate", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-IEs.LastVisitedEUTRANCellInformation-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
    {"source": "S1AP-IEs.LastVisitedEUTRANCellInformation-ExtIEs", "target": "S1AP-IEs.Cause", "value": 1},
    {"source": "S1AP-IEs.LastVisitedEUTRANCellInformation-ExtIEs", "target": "S1AP-IEs.Time-UE-StayedInCell-EnhancedGranularity", "value": 1},
@ -2019,6 +2118,12 @@
    {"source": "S1AP-IEs.CancelledCellinTAI", "target": "S1AP-IEs.CancelledCellinTAI-Item", "value": 1},
    {"source": "S1AP-PDU-Contents.WriteReplaceWarningResponse", "target": "S1AP-PDU-Contents.WriteReplaceWarningResponseIEs", "value": 1},
    {"source": "S1AP-PDU-Contents.WriteReplaceWarningResponse", "target": "S1AP-Containers.ProtocolIE-Container", "value": 1},
+    {"source": "S1AP-PDU-Contents.ENBCPRelocationIndicationIEs", "target": "S1AP-IEs.TAI", "value": 1},
+    {"source": "S1AP-PDU-Contents.ENBCPRelocationIndicationIEs", "target": "S1AP-IEs.S-TMSI", "value": 1},
+    {"source": "S1AP-PDU-Contents.ENBCPRelocationIndicationIEs", "target": "S1AP-IEs.EUTRAN-CGI", "value": 1},
+    {"source": "S1AP-PDU-Contents.ENBCPRelocationIndicationIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
+    {"source": "S1AP-PDU-Contents.ENBCPRelocationIndicationIEs", "target": "S1AP-IEs.UL-CP-SecurityInformation", "value": 1},
+    {"source": "S1AP-PDU-Contents.ENBCPRelocationIndicationIEs", "target": "S1AP-IEs.ENB-UE-S1AP-ID", "value": 1},
    {"source": "S1AP-IEs.PagingAttemptInformation", "target": "S1AP-IEs.PagingAttemptInformation-ExtIEs", "value": 1},
    {"source": "S1AP-IEs.PagingAttemptInformation", "target": "S1AP-IEs.NextPagingAreaScope", "value": 1},
    {"source": "S1AP-IEs.PagingAttemptInformation", "target": "S1AP-IEs.PagingAttemptCount", "value": 1},
@ -2041,6 +2146,7 @@
    {"source": "S1AP-PDU-Descriptions.s1Setup", "target": "S1AP-PDU-Contents.S1SetupFailure", "value": 1},
    {"source": "S1AP-PDU-Contents.UEContextResumeRequestIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
    {"source": "S1AP-PDU-Contents.UEContextResumeRequestIEs", "target": "S1AP-IEs.MME-UE-S1AP-ID", "value": 1},
+    {"source": "S1AP-PDU-Contents.UEContextResumeRequestIEs", "target": "S1AP-IEs.RRC-Establishment-Cause", "value": 1},
    {"source": "S1AP-PDU-Contents.UEContextResumeRequestIEs", "target": "S1AP-PDU-Contents.E-RABFailedToResumeListResumeReq", "value": 1},
    {"source": "S1AP-PDU-Contents.UEContextResumeRequestIEs", "target": "S1AP-IEs.ENB-UE-S1AP-ID", "value": 1},
    {"source": "SonTransfer-IEs.FailureEventReport", "target": "SonTransfer-IEs.TooEarlyInterRATHOReportReportFromEUTRAN", "value": 1},
@ -2097,9 +2203,7 @@
    {"source": "S1AP-PDU-Contents.InitialContextSetupFailureIEs", "target": "S1AP-IEs.CriticalityDiagnostics", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialContextSetupFailureIEs", "target": "S1AP-IEs.Cause", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialContextSetupFailureIEs", "target": "S1AP-IEs.ENB-UE-S1AP-ID", "value": 1},
-    {"source": "S1AP-IEs.LastVisitedCell-Item", "target": "S1AP-IEs.LastVisitedGERANCellInformation", "value": 1},
-    {"source": "S1AP-IEs.LastVisitedCell-Item", "target": "S1AP-IEs.LastVisitedUTRANCellInformation", "value": 1},
-    {"source": "S1AP-IEs.LastVisitedCell-Item", "target": "S1AP-IEs.LastVisitedEUTRANCellInformation", "value": 1},
+    {"source": "S1AP-Constants.id-eNBCPRelocationIndication", "target": "S1AP-CommonDataTypes.ProcedureCode", "value": 1},
    {"source": "S1AP-IEs.SupportedTAs-Item", "target": "S1AP-IEs.SupportedTAs-Item-ExtIEs", "value": 1},
    {"source": "S1AP-IEs.SupportedTAs-Item", "target": "S1AP-IEs.BPLMNs", "value": 1},
    {"source": "S1AP-IEs.SupportedTAs-Item", "target": "S1AP-IEs.TAC", "value": 1},
@ -2118,11 +2222,11 @@
    {"source": "S1AP-IEs.TAI-Broadcast-Item", "target": "S1AP-IEs.TAI-Broadcast-Item-ExtIEs", "value": 1},
    {"source": "S1AP-IEs.TAI-Broadcast-Item", "target": "S1AP-Containers.ProtocolExtensionContainer", "value": 1},
    {"source": "S1AP-IEs.TAI-Broadcast-Item", "target": "S1AP-IEs.CompletedCellinTAI", "value": 1},
-    {"source": "S1AP-Constants.id-E-RABReleaseItemHOCmd", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
-    {"source": "S1AP-IEs.TargetID", "target": "S1AP-IEs.CGI", "value": 1},
-    {"source": "S1AP-IEs.TargetID", "target": "S1AP-IEs.TargeteNB-ID", "value": 1},
-    {"source": "S1AP-IEs.TargetID", "target": "S1AP-IEs.TargetRNC-ID", "value": 1},
+    {"source": "S1AP-Constants.id-UL-CP-SecurityInformation", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
+    {"source": "S1AP-Constants.id-ServedDCNs", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Constants.id-InitialContextSetup", "target": "S1AP-CommonDataTypes.ProcedureCode", "value": 1},
+    {"source": "S1AP-PDU-Contents.UEInformationTransfer", "target": "S1AP-Containers.ProtocolIE-Container", "value": 1},
+    {"source": "S1AP-PDU-Contents.UEInformationTransfer", "target": "S1AP-PDU-Contents.UEInformationTransferIEs", "value": 1},
    {"source": "S1AP-IEs.TAIListforMDT", "target": "S1AP-IEs.TAI", "value": 1},
    {"source": "S1AP-IEs.TAIListforMDT", "target": "S1AP-Constants.maxnoofTAforMDT", "value": 1},
    {"source": "S1AP-Constants.id-CSGMembershipStatus", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
@ -2136,9 +2240,11 @@
    {"source": "S1AP-PDU-Contents.E-RABToBeModifiedListBearerModReq", "target": "S1AP-Containers.ProtocolIE-SingleContainer", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABToBeModifiedListBearerModReq", "target": "S1AP-Constants.maxnoofE-RABs", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABToBeModifiedListBearerModReq", "target": "S1AP-PDU-Contents.E-RABToBeModifiedItemBearerModReqIEs", "value": 1},
-    {"source": "S1AP-Constants.id-GWContextReleaseIndication", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
+    {"source": "S1AP-IEs.Cdma2000OneXSRVCCInfo-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
    {"source": "S1AP-Constants.id-MDTConfiguration", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Constants.id-ServedPLMNs", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
+    {"source": "S1AP-PDU-Contents.MMECPRelocationIndication", "target": "S1AP-PDU-Contents.MMECPRelocationIndicationIEs", "value": 1},
+    {"source": "S1AP-PDU-Contents.MMECPRelocationIndication", "target": "S1AP-Containers.ProtocolIE-Container", "value": 1},
    {"source": "S1AP-IEs.Cause", "target": "S1AP-IEs.CauseRadioNetwork", "value": 1},
    {"source": "S1AP-IEs.Cause", "target": "S1AP-IEs.CauseProtocol", "value": 1},
    {"source": "S1AP-IEs.Cause", "target": "S1AP-IEs.CauseTransport", "value": 1},
@ -2173,6 +2279,7 @@
    {"source": "S1AP-IEs.RequestType", "target": "S1AP-Containers.ProtocolExtensionContainer", "value": 1},
    {"source": "S1AP-IEs.RequestType", "target": "S1AP-IEs.ReportArea", "value": 1},
    {"source": "S1AP-IEs.RequestType", "target": "S1AP-IEs.RequestType-ExtIEs", "value": 1},
+    {"source": "S1AP-PDU-Contents.PagingIEs", "target": "S1AP-IEs.CE-ModeBRestricted", "value": 1},
    {"source": "S1AP-PDU-Contents.PagingIEs", "target": "S1AP-IEs.UEIdentityIndexValue", "value": 1},
    {"source": "S1AP-PDU-Contents.PagingIEs", "target": "S1AP-IEs.CSG-IdList", "value": 1},
    {"source": "S1AP-PDU-Contents.PagingIEs", "target": "S1AP-IEs.PagingPriority", "value": 1},
@ -2183,6 +2290,8 @@
    {"source": "S1AP-PDU-Contents.PagingIEs", "target": "S1AP-IEs.Paging-eDRXInformation", "value": 1},
    {"source": "S1AP-PDU-Contents.PagingIEs", "target": "S1AP-PDU-Contents.TAIList", "value": 1},
    {"source": "S1AP-PDU-Contents.PagingIEs", "target": "S1AP-IEs.UEPagingID", "value": 1},
+    {"source": "S1AP-PDU-Contents.PagingIEs", "target": "S1AP-IEs.EnhancedCoverageRestricted", "value": 1},
+    {"source": "S1AP-PDU-Contents.PagingIEs", "target": "S1AP-IEs.NB-IoT-UEIdentityIndexValue", "value": 1},
    {"source": "S1AP-PDU-Contents.PagingIEs", "target": "S1AP-IEs.AssistanceDataForPaging", "value": 1},
    {"source": "S1AP-PDU-Contents.PagingIEs", "target": "S1AP-IEs.CNDomain", "value": 1},
    {"source": "S1AP-PDU-Contents.PagingIEs", "target": "S1AP-IEs.NB-IoT-Paging-eDRXInformation", "value": 1},
@ -2196,6 +2305,7 @@
    {"source": "S1AP-PDU-Descriptions.kill", "target": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURE", "value": 1},
    {"source": "S1AP-PDU-Descriptions.kill", "target": "S1AP-PDU-Contents.KillResponse", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABSetupItemCtxtSUResExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
+    {"source": "S1AP-Constants.id-DCN-ID", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Constants.id-Inter-SystemInformationTransferTypeEDT", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-IEs.CriticalityDiagnostics", "target": "S1AP-IEs.CriticalityDiagnostics-IE-List", "value": 1},
    {"source": "S1AP-IEs.CriticalityDiagnostics", "target": "S1AP-CommonDataTypes.TriggeringMessage", "value": 1},
@ -2212,6 +2322,7 @@
    {"source": "S1AP-PDU-Contents.E-RABReleaseIndication", "target": "S1AP-PDU-Contents.E-RABReleaseIndicationIEs", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABAdmittedItem-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
    {"source": "S1AP-Constants.id-UEContextRelease", "target": "S1AP-CommonDataTypes.ProcedureCode", "value": 1},
+    {"source": "S1AP-Constants.id-NASDeliveryIndication", "target": "S1AP-CommonDataTypes.ProcedureCode", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABModifyRequestIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABModifyRequestIEs", "target": "S1AP-IEs.MME-UE-S1AP-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABModifyRequestIEs", "target": "S1AP-IEs.UEAggregateMaximumBitrate", "value": 1},
@ -2291,6 +2402,9 @@
    {"source": "S1AP-Constants.id-LHN-ID", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Constants.id-Synchronisation-Information", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Constants.id-CellAccessMode", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
+    {"source": "S1AP-PDU-Contents.MMECPRelocationIndicationIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
+    {"source": "S1AP-PDU-Contents.MMECPRelocationIndicationIEs", "target": "S1AP-IEs.MME-UE-S1AP-ID", "value": 1},
+    {"source": "S1AP-PDU-Contents.MMECPRelocationIndicationIEs", "target": "S1AP-IEs.ENB-UE-S1AP-ID", "value": 1},
    {"source": "S1AP-Constants.id-E-RABReleaseItem", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.HandoverRequiredIEs", "target": "S1AP-IEs.HandoverType", "value": 1},
    {"source": "S1AP-PDU-Contents.HandoverRequiredIEs", "target": "S1AP-IEs.Cause", "value": 1},
@ -2374,19 +2488,29 @@
    {"source": "S1AP-Constants.id-EUTRAN-CGI", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABFailedtoSetupItemHOReqAckIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABFailedtoSetupItemHOReqAckIEs", "target": "S1AP-PDU-Contents.E-RABFailedToSetupItemHOReqAck", "value": 1},
+    {"source": "S1AP-Constants.id-SRVCCOperationNotPossible", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
+    {"source": "S1AP-IEs.UE-Sidelink-Aggregate-MaximumBitrates-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
    {"source": "S1AP-PDU-Contents.UplinkNonUEAssociatedLPPaTransport", "target": "S1AP-PDU-Contents.UplinkNonUEAssociatedLPPaTransport-IEs", "value": 1},
    {"source": "S1AP-PDU-Contents.UplinkNonUEAssociatedLPPaTransport", "target": "S1AP-Containers.ProtocolIE-Container", "value": 1},
    {"source": "S1AP-IEs.COUNTValueExtended-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
+    {"source": "S1AP-Constants.id-UE-Level-QoS-Parameters", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Constants.id-Source-ToTarget-TransparentContainer-Secondary", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Constants.id-HandoverNotification", "target": "S1AP-CommonDataTypes.ProcedureCode", "value": 1},
    {"source": "S1AP-IEs.AssistanceDataForPaging-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
+    {"source": "S1AP-IEs.RecommendedCellItem", "target": "S1AP-IEs.RecommendedCellsForPagingItem-ExtIEs", "value": 1},
+    {"source": "S1AP-IEs.RecommendedCellItem", "target": "S1AP-Containers.ProtocolExtensionContainer", "value": 1},
+    {"source": "S1AP-IEs.RecommendedCellItem", "target": "S1AP-IEs.EUTRAN-CGI", "value": 1},
    {"source": "SonTransfer-IEs.CellsToActivateList", "target": "SonTransfer-IEs.maxnoofCellineNB", "value": 1},
    {"source": "SonTransfer-IEs.CellsToActivateList", "target": "SonTransfer-IEs.CellsToActivateList-Item", "value": 1},
+    {"source": "S1AP-PDU-Contents.HandoverRequired", "target": "S1AP-PDU-Contents.HandoverRequiredIEs", "value": 1},
+    {"source": "S1AP-PDU-Contents.HandoverRequired", "target": "S1AP-Containers.ProtocolIE-Container", "value": 1},
    {"source": "S1AP-PDU-Descriptions.uEContextModification", "target": "S1AP-PDU-Contents.UEContextModificationFailure", "value": 1},
    {"source": "S1AP-PDU-Descriptions.uEContextModification", "target": "S1AP-PDU-Contents.UEContextModificationRequest", "value": 1},
    {"source": "S1AP-PDU-Descriptions.uEContextModification", "target": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURE", "value": 1},
    {"source": "S1AP-PDU-Descriptions.uEContextModification", "target": "S1AP-PDU-Contents.UEContextModificationResponse", "value": 1},
    {"source": "S1AP-Constants.id-KillAllWarningMessages", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
+    {"source": "S1AP-PDU-Descriptions.mMECPRelocationIndication", "target": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURE", "value": 1},
+    {"source": "S1AP-PDU-Descriptions.mMECPRelocationIndication", "target": "S1AP-PDU-Contents.MMECPRelocationIndication", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABToBeSwitchedULItem", "target": "S1AP-PDU-Contents.E-RABToBeSwitchedULItem-ExtIEs", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABToBeSwitchedULItem", "target": "S1AP-IEs.GTP-TEID", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABToBeSwitchedULItem", "target": "S1AP-IEs.E-RAB-ID", "value": 1},
@ -2405,19 +2529,25 @@
    {"source": "S1AP-IEs.ServedGroupIDs", "target": "S1AP-Constants.maxnoofGroupIDs", "value": 1},
    {"source": "S1AP-PDU-Contents.ENBStatusTransfer", "target": "S1AP-PDU-Contents.ENBStatusTransferIEs", "value": 1},
    {"source": "S1AP-PDU-Contents.ENBStatusTransfer", "target": "S1AP-Containers.ProtocolIE-Container", "value": 1},
+    {"source": "S1AP-IEs.ServedDCNs", "target": "S1AP-Constants.maxnoofDCNs", "value": 1},
+    {"source": "S1AP-IEs.ServedDCNs", "target": "S1AP-IEs.ServedDCNsItem", "value": 1},
    {"source": "S1AP-IEs.TargeteNB-ID", "target": "S1AP-IEs.TAI", "value": 1},
    {"source": "S1AP-IEs.TargeteNB-ID", "target": "S1AP-IEs.TargeteNB-ID-ExtIEs", "value": 1},
    {"source": "S1AP-IEs.TargeteNB-ID", "target": "S1AP-Containers.ProtocolExtensionContainer", "value": 1},
    {"source": "S1AP-IEs.TargeteNB-ID", "target": "S1AP-IEs.Global-ENB-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.UEContextModificationRequestIEs", "target": "S1AP-IEs.LAI", "value": 1},
    {"source": "S1AP-PDU-Contents.UEContextModificationRequestIEs", "target": "S1AP-IEs.AdditionalCSFallbackIndicator", "value": 1},
+    {"source": "S1AP-PDU-Contents.UEContextModificationRequestIEs", "target": "S1AP-IEs.UESidelinkAggregateMaximumBitrate", "value": 1},
    {"source": "S1AP-PDU-Contents.UEContextModificationRequestIEs", "target": "S1AP-IEs.ProSeAuthorized", "value": 1},
    {"source": "S1AP-PDU-Contents.UEContextModificationRequestIEs", "target": "S1AP-IEs.SubscriberProfileIDforRFP", "value": 1},
    {"source": "S1AP-PDU-Contents.UEContextModificationRequestIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
+    {"source": "S1AP-PDU-Contents.UEContextModificationRequestIEs", "target": "S1AP-IEs.SRVCCOperationPossible", "value": 1},
+    {"source": "S1AP-PDU-Contents.UEContextModificationRequestIEs", "target": "S1AP-IEs.V2XServicesAuthorized", "value": 1},
    {"source": "S1AP-PDU-Contents.UEContextModificationRequestIEs", "target": "S1AP-IEs.UESecurityCapabilities", "value": 1},
    {"source": "S1AP-PDU-Contents.UEContextModificationRequestIEs", "target": "S1AP-IEs.SecurityKey", "value": 1},
    {"source": "S1AP-PDU-Contents.UEContextModificationRequestIEs", "target": "S1AP-IEs.MME-UE-S1AP-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.UEContextModificationRequestIEs", "target": "S1AP-IEs.CSFallbackIndicator", "value": 1},
+    {"source": "S1AP-PDU-Contents.UEContextModificationRequestIEs", "target": "S1AP-IEs.SRVCCOperationNotPossible", "value": 1},
    {"source": "S1AP-PDU-Contents.UEContextModificationRequestIEs", "target": "S1AP-IEs.UEAggregateMaximumBitrate", "value": 1},
    {"source": "S1AP-PDU-Contents.UEContextModificationRequestIEs", "target": "S1AP-IEs.ENB-UE-S1AP-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.UEContextModificationRequestIEs", "target": "S1AP-IEs.CSGMembershipStatus", "value": 1},
@ -2428,13 +2558,16 @@
    {"source": "S1AP-PDU-Contents.InitialUEMessage-IEs", "target": "S1AP-IEs.LHN-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialUEMessage-IEs", "target": "S1AP-IEs.TAI", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialUEMessage-IEs", "target": "S1AP-IEs.GUMMEI", "value": 1},
+    {"source": "S1AP-PDU-Contents.InitialUEMessage-IEs", "target": "S1AP-IEs.DCN-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialUEMessage-IEs", "target": "S1AP-IEs.UE-Usage-Type", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialUEMessage-IEs", "target": "S1AP-IEs.ENB-UE-S1AP-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialUEMessage-IEs", "target": "S1AP-IEs.TunnelInformation", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialUEMessage-IEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialUEMessage-IEs", "target": "S1AP-IEs.S-TMSI", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialUEMessage-IEs", "target": "S1AP-IEs.CellAccessMode", "value": 1},
+    {"source": "S1AP-PDU-Contents.InitialUEMessage-IEs", "target": "S1AP-IEs.CE-mode-B-SupportIndicator", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialUEMessage-IEs", "target": "S1AP-IEs.MME-Group-ID", "value": 1},
+    {"source": "S1AP-PDU-Contents.InitialUEMessage-IEs", "target": "S1AP-IEs.Coverage-Level", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialUEMessage-IEs", "target": "S1AP-IEs.CSG-Id", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialUEMessage-IEs", "target": "S1AP-IEs.GUMMEIType", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialUEMessage-IEs", "target": "S1AP-IEs.RRC-Establishment-Cause", "value": 1},
@ -2454,6 +2587,7 @@
    {"source": "S1AP-PDU-Contents.UEContextSuspendResponseIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
    {"source": "S1AP-PDU-Contents.UEContextSuspendResponseIEs", "target": "S1AP-IEs.MME-UE-S1AP-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.UEContextSuspendResponseIEs", "target": "S1AP-IEs.CriticalityDiagnostics", "value": 1},
+    {"source": "S1AP-PDU-Contents.UEContextSuspendResponseIEs", "target": "S1AP-IEs.SecurityContext", "value": 1},
    {"source": "S1AP-PDU-Contents.UEContextSuspendResponseIEs", "target": "S1AP-IEs.ENB-UE-S1AP-ID", "value": 1},
    {"source": "S1AP-Constants.id-E-RABToBeSwitchedULList", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Constants.id-LocationReport", "target": "S1AP-CommonDataTypes.ProcedureCode", "value": 1},
@ -2481,6 +2615,10 @@
    {"source": "S1AP-IEs.MDTMode-Extension", "target": "S1AP-Containers.ProtocolIE-SingleContainer", "value": 1},
    {"source": "S1AP-Constants.id-RepetitionPeriod", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-IEs.ExpectedUEBehaviour-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
+    {"source": "S1AP-IEs.UL-CP-SecurityInformation", "target": "S1AP-IEs.UL-NAS-Count", "value": 1},
+    {"source": "S1AP-IEs.UL-CP-SecurityInformation", "target": "S1AP-IEs.UL-CP-SecurityInformation-ExtIEs", "value": 1},
+    {"source": "S1AP-IEs.UL-CP-SecurityInformation", "target": "S1AP-Containers.ProtocolExtensionContainer", "value": 1},
+    {"source": "S1AP-IEs.UL-CP-SecurityInformation", "target": "S1AP-IEs.UL-NAS-MAC", "value": 1},
    {"source": "S1AP-Constants.id-E-RABToBeSetupItemCtxtSUReq", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.ENBConfigurationTransfer", "target": "S1AP-Containers.ProtocolIE-Container", "value": 1},
    {"source": "S1AP-PDU-Contents.ENBConfigurationTransfer", "target": "S1AP-PDU-Contents.ENBConfigurationTransferIEs", "value": 1},
@ -2500,11 +2638,9 @@
    {"source": "S1AP-IEs.TAI", "target": "S1AP-Containers.ProtocolExtensionContainer", "value": 1},
    {"source": "S1AP-PDU-Contents.HandoverCancelAcknowledge", "target": "S1AP-PDU-Contents.HandoverCancelAcknowledgeIEs", "value": 1},
    {"source": "S1AP-PDU-Contents.HandoverCancelAcknowledge", "target": "S1AP-Containers.ProtocolIE-Container", "value": 1},
-    {"source": "SonTransfer-IEs.HOReport", "target": "SonTransfer-IEs.CandidatePCIList", "value": 1},
-    {"source": "SonTransfer-IEs.HOReport", "target": "SonTransfer-IEs.HoReportType", "value": 1},
-    {"source": "SonTransfer-IEs.HOReport", "target": "SonTransfer-IEs.CandidateCellList", "value": 1},
-    {"source": "SonTransfer-IEs.HOReport", "target": "SonTransfer-IEs.IRAT-Cell-ID", "value": 1},
-    {"source": "SonTransfer-IEs.HOReport", "target": "SonTransfer-IEs.HoType", "value": 1},
+    {"source": "S1AP-Constants.id-GUMMEIList", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
+    {"source": "S1AP-PDU-Contents.RetrieveUEInformation", "target": "S1AP-PDU-Contents.RetrieveUEInformationIEs", "value": 1},
+    {"source": "S1AP-PDU-Contents.RetrieveUEInformation", "target": "S1AP-Containers.ProtocolIE-Container", "value": 1},
    {"source": "S1AP-IEs.CriticalityDiagnostics-IE-Item-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
    {"source": "S1AP-IEs.Paging-eDRXInformation-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
    {"source": "S1AP-IEs.RecommendedCellsForPagingItem-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
@ -2522,14 +2658,18 @@
    {"source": "S1AP-PDU-Contents.DownlinkNonUEAssociatedLPPaTransport", "target": "S1AP-Containers.ProtocolIE-Container", "value": 1},
    {"source": "S1AP-PDU-Contents.UEContextModificationRequest", "target": "S1AP-PDU-Contents.UEContextModificationRequestIEs", "value": 1},
    {"source": "S1AP-PDU-Contents.UEContextModificationRequest", "target": "S1AP-Containers.ProtocolIE-Container", "value": 1},
+    {"source": "S1AP-PDU-Contents.InitialContextSetupRequestIEs", "target": "S1AP-IEs.UESidelinkAggregateMaximumBitrate", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialContextSetupRequestIEs", "target": "S1AP-IEs.ProSeAuthorized", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialContextSetupRequestIEs", "target": "S1AP-IEs.TraceActivation", "value": 1},
+    {"source": "S1AP-PDU-Contents.InitialContextSetupRequestIEs", "target": "S1AP-IEs.V2XServicesAuthorized", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialContextSetupRequestIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialContextSetupRequestIEs", "target": "S1AP-IEs.GUMMEI", "value": 1},
+    {"source": "S1AP-PDU-Contents.InitialContextSetupRequestIEs", "target": "S1AP-IEs.CE-ModeBRestricted", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialContextSetupRequestIEs", "target": "S1AP-IEs.UESecurityCapabilities", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialContextSetupRequestIEs", "target": "S1AP-IEs.SubscriberProfileIDforRFP", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialContextSetupRequestIEs", "target": "S1AP-IEs.SecurityKey", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialContextSetupRequestIEs", "target": "S1AP-IEs.UEAggregateMaximumBitrate", "value": 1},
+    {"source": "S1AP-PDU-Contents.InitialContextSetupRequestIEs", "target": "S1AP-IEs.PendingDataIndication", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialContextSetupRequestIEs", "target": "S1AP-IEs.CSGMembershipStatus", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialContextSetupRequestIEs", "target": "S1AP-IEs.UERadioCapability", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialContextSetupRequestIEs", "target": "S1AP-IEs.LAI", "value": 1},
@ -2540,6 +2680,7 @@
    {"source": "S1AP-PDU-Contents.InitialContextSetupRequestIEs", "target": "S1AP-IEs.ENB-UE-S1AP-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialContextSetupRequestIEs", "target": "S1AP-IEs.UEUserPlaneCIoTSupportIndicator", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialContextSetupRequestIEs", "target": "S1AP-IEs.MME-UE-S1AP-ID", "value": 1},
+    {"source": "S1AP-PDU-Contents.InitialContextSetupRequestIEs", "target": "S1AP-IEs.EnhancedCoverageRestricted", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialContextSetupRequestIEs", "target": "S1AP-IEs.CSFallbackIndicator", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialContextSetupRequestIEs", "target": "S1AP-IEs.HandoverRestrictionList", "value": 1},
    {"source": "S1AP-PDU-Contents.InitialContextSetupRequestIEs", "target": "S1AP-PDU-Contents.E-RABToBeSetupListCtxtSUReq", "value": 1},
@ -2552,6 +2693,10 @@
    {"source": "S1AP-IEs.MBSFN-ResultToLog", "target": "S1AP-Constants.maxnoofMBSFNAreaMDT", "value": 1},
    {"source": "S1AP-Constants.id-E-RABDataForwardingItem", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Constants.id-SignallingBasedMDTPLMNList", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
+    {"source": "S1AP-IEs.ServedDCNsItem", "target": "S1AP-IEs.DCN-ID", "value": 1},
+    {"source": "S1AP-IEs.ServedDCNsItem", "target": "S1AP-IEs.ServedDCNsItem-ExtIEs", "value": 1},
+    {"source": "S1AP-IEs.ServedDCNsItem", "target": "S1AP-IEs.RelativeMMECapacity", "value": 1},
+    {"source": "S1AP-IEs.ServedDCNsItem", "target": "S1AP-Containers.ProtocolExtensionContainer", "value": 1},
    {"source": "S1AP-Constants.id-UECapabilityInfoIndication", "target": "S1AP-CommonDataTypes.ProcedureCode", "value": 1},
    {"source": "S1AP-Constants.id-HandoverType", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-IEs.CellIdentifierAndCELevelForCECapableUEs", "target": "S1AP-IEs.CellIdentifierAndCELevelForCECapableUEs-ExtIEs", "value": 1},
@ -2580,6 +2725,7 @@
    {"source": "S1AP-IEs.ENBX2ExtTLAs", "target": "S1AP-Constants.maxnoofeNBX2ExtTLAs", "value": 1},
    {"source": "S1AP-IEs.ENBX2ExtTLAs", "target": "S1AP-IEs.ENBX2ExtTLA", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABFailedToResumeItemResumeReq-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
+    {"source": "S1AP-Constants.id-Coverage-Level", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-IEs.RecommendedCellsForPaging-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
    {"source": "S1AP-IEs.SONInformationReply-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
    {"source": "S1AP-IEs.SONInformationReply-ExtIEs", "target": "S1AP-IEs.TimeSynchronisationInfo", "value": 1},
@ -2650,8 +2796,7 @@
    {"source": "S1AP-PDU-Contents.E-RABToBeModifiedItemBearerModReq", "target": "S1AP-IEs.E-RABLevelQoSParameters", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABToBeModifiedItemBearerModReq", "target": "S1AP-Containers.ProtocolExtensionContainer", "value": 1},
    {"source": "S1AP-Constants.id-SON-Information-Report", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
-    {"source": "S1AP-IEs.MeasurementThresholdA2", "target": "S1AP-IEs.Threshold-RSRQ", "value": 1},
-    {"source": "S1AP-IEs.MeasurementThresholdA2", "target": "S1AP-IEs.Threshold-RSRP", "value": 1},
+    {"source": "S1AP-Constants.id-EnhancedCoverageRestricted", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Constants.id-cdma2000OneXSRVCCInfo", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-IEs.CellBasedMDT-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
    {"source": "S1AP-PDU-Contents.PWSRestartIndication", "target": "S1AP-PDU-Contents.PWSRestartIndicationIEs", "value": 1},
@ -2667,6 +2812,7 @@
    {"source": "S1AP-PDU-Contents.E-RABReleaseIndicationIEs", "target": "S1AP-IEs.E-RABList", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABReleaseIndicationIEs", "target": "S1AP-IEs.ENB-UE-S1AP-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.MMEConfigurationUpdateIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
+    {"source": "S1AP-PDU-Contents.MMEConfigurationUpdateIEs", "target": "S1AP-IEs.ServedDCNs", "value": 1},
    {"source": "S1AP-PDU-Contents.MMEConfigurationUpdateIEs", "target": "S1AP-IEs.MMEname", "value": 1},
    {"source": "S1AP-PDU-Contents.MMEConfigurationUpdateIEs", "target": "S1AP-IEs.RelativeMMECapacity", "value": 1},
    {"source": "S1AP-PDU-Contents.MMEConfigurationUpdateIEs", "target": "S1AP-IEs.ServedGUMMEIs", "value": 1},
@ -2690,6 +2836,8 @@
    {"source": "S1AP-IEs.CGI", "target": "S1AP-IEs.CGI-ExtIEs", "value": 1},
    {"source": "S1AP-IEs.CGI", "target": "S1AP-IEs.LAC", "value": 1},
    {"source": "S1AP-Constants.id-E-RABSetup", "target": "S1AP-CommonDataTypes.ProcedureCode", "value": 1},
+    {"source": "S1AP-PDU-Contents.ENBCPRelocationIndication", "target": "S1AP-PDU-Contents.ENBCPRelocationIndicationIEs", "value": 1},
+    {"source": "S1AP-PDU-Contents.ENBCPRelocationIndication", "target": "S1AP-Containers.ProtocolIE-Container", "value": 1},
    {"source": "S1AP-IEs.AssistanceDataForRecommendedCells-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
    {"source": "S1AP-IEs.TraceActivation", "target": "S1AP-IEs.TraceDepth", "value": 1},
    {"source": "S1AP-IEs.TraceActivation", "target": "S1AP-IEs.E-UTRAN-Trace-ID", "value": 1},
@ -2739,6 +2887,8 @@
    {"source": "S1AP-PDU-Descriptions.deactivateTrace", "target": "S1AP-PDU-Contents.DeactivateTrace", "value": 1},
    {"source": "S1AP-PDU-Descriptions.locationReportingFailureIndication", "target": "S1AP-PDU-Contents.LocationReportingFailureIndication", "value": 1},
    {"source": "S1AP-PDU-Descriptions.locationReportingFailureIndication", "target": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURE", "value": 1},
+    {"source": "S1AP-PDU-Descriptions.uEInformationTransfer", "target": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURE", "value": 1},
+    {"source": "S1AP-PDU-Descriptions.uEInformationTransfer", "target": "S1AP-PDU-Contents.UEInformationTransfer", "value": 1},
    {"source": "S1AP-Containers.ProtocolExtensionContainer", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
    {"source": "S1AP-Containers.ProtocolExtensionContainer", "target": "S1AP-Containers.ProtocolExtensionField", "value": 1},
    {"source": "S1AP-Containers.ProtocolExtensionContainer", "target": "S1AP-Constants.maxProtocolExtensions", "value": 1},
@ -2769,6 +2919,7 @@
    {"source": "SonTransfer-IEs.CandidatePCIList", "target": "SonTransfer-IEs.CandidatePCI", "value": 1},
    {"source": "S1AP-PDU-Contents.MMEConfigurationUpdateAcknowledge", "target": "S1AP-PDU-Contents.MMEConfigurationUpdateAcknowledgeIEs", "value": 1},
    {"source": "S1AP-PDU-Contents.MMEConfigurationUpdateAcknowledge", "target": "S1AP-Containers.ProtocolIE-Container", "value": 1},
+    {"source": "S1AP-Constants.id-PendingDataIndication", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-IEs.ForbiddenTAs-Item", "target": "S1AP-IEs.ForbiddenTACs", "value": 1},
    {"source": "S1AP-IEs.ForbiddenTAs-Item", "target": "S1AP-IEs.ForbiddenTAs-Item-ExtIEs", "value": 1},
    {"source": "S1AP-IEs.ForbiddenTAs-Item", "target": "S1AP-Containers.ProtocolExtensionContainer", "value": 1},
@ -2810,8 +2961,10 @@
    {"source": "S1AP-IEs.ServedGUMMEIsItem", "target": "S1AP-IEs.ServedGroupIDs", "value": 1},
    {"source": "S1AP-IEs.ServedGUMMEIsItem", "target": "S1AP-IEs.ServedMMECs", "value": 1},
    {"source": "S1AP-IEs.ServedGUMMEIsItem", "target": "S1AP-Containers.ProtocolExtensionContainer", "value": 1},
-    {"source": "S1AP-PDU-Contents.HandoverRequired", "target": "S1AP-PDU-Contents.HandoverRequiredIEs", "value": 1},
-    {"source": "S1AP-PDU-Contents.HandoverRequired", "target": "S1AP-Containers.ProtocolIE-Container", "value": 1},
+    {"source": "S1AP-IEs.SourceeNB-ID", "target": "S1AP-IEs.TAI", "value": 1},
+    {"source": "S1AP-IEs.SourceeNB-ID", "target": "S1AP-IEs.SourceeNB-ID-ExtIEs", "value": 1},
+    {"source": "S1AP-IEs.SourceeNB-ID", "target": "S1AP-Containers.ProtocolExtensionContainer", "value": 1},
+    {"source": "S1AP-IEs.SourceeNB-ID", "target": "S1AP-IEs.Global-ENB-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.RerouteNASRequest-IEs", "target": "S1AP-IEs.MME-UE-S1AP-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.RerouteNASRequest-IEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
    {"source": "S1AP-PDU-Contents.RerouteNASRequest-IEs", "target": "S1AP-IEs.ENB-UE-S1AP-ID", "value": 1},
@ -2827,14 +2980,18 @@
    {"source": "S1AP-PDU-Contents.UE-associatedLogicalS1-ConnectionListRes", "target": "S1AP-PDU-Contents.UE-associatedLogicalS1-ConnectionItemRes", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABAdmittedList", "target": "S1AP-PDU-Contents.E-RAB-IE-ContainerList", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABAdmittedList", "target": "S1AP-PDU-Contents.E-RABAdmittedItemIEs", "value": 1},
-    {"source": "S1AP-PDU-Contents.DownlinkNASTransport-IEs", "target": "S1AP-IEs.MME-UE-S1AP-ID", "value": 1},
+    {"source": "S1AP-PDU-Contents.DownlinkNASTransport-IEs", "target": "S1AP-IEs.CE-ModeBRestricted", "value": 1},
    {"source": "S1AP-PDU-Contents.DownlinkNASTransport-IEs", "target": "S1AP-IEs.UERadioCapability", "value": 1},
    {"source": "S1AP-PDU-Contents.DownlinkNASTransport-IEs", "target": "S1AP-IEs.NAS-PDU", "value": 1},
-    {"source": "S1AP-PDU-Contents.DownlinkNASTransport-IEs", "target": "S1AP-IEs.HandoverRestrictionList", "value": 1},
+    {"source": "S1AP-PDU-Contents.DownlinkNASTransport-IEs", "target": "S1AP-IEs.SubscriberProfileIDforRFP", "value": 1},
    {"source": "S1AP-PDU-Contents.DownlinkNASTransport-IEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
    {"source": "S1AP-PDU-Contents.DownlinkNASTransport-IEs", "target": "S1AP-IEs.SRVCCOperationPossible", "value": 1},
-    {"source": "S1AP-PDU-Contents.DownlinkNASTransport-IEs", "target": "S1AP-IEs.SubscriberProfileIDforRFP", "value": 1},
+    {"source": "S1AP-PDU-Contents.DownlinkNASTransport-IEs", "target": "S1AP-IEs.DLNASPDUDeliveryAckRequest", "value": 1},
    {"source": "S1AP-PDU-Contents.DownlinkNASTransport-IEs", "target": "S1AP-IEs.ENB-UE-S1AP-ID", "value": 1},
+    {"source": "S1AP-PDU-Contents.DownlinkNASTransport-IEs", "target": "S1AP-IEs.MME-UE-S1AP-ID", "value": 1},
+    {"source": "S1AP-PDU-Contents.DownlinkNASTransport-IEs", "target": "S1AP-IEs.EnhancedCoverageRestricted", "value": 1},
+    {"source": "S1AP-PDU-Contents.DownlinkNASTransport-IEs", "target": "S1AP-IEs.HandoverRestrictionList", "value": 1},
+    {"source": "S1AP-PDU-Contents.DownlinkNASTransport-IEs", "target": "S1AP-IEs.PendingDataIndication", "value": 1},
    {"source": "SonTransfer-IEs.NotificationCellList", "target": "SonTransfer-IEs.maxnoofCellineNB", "value": 1},
    {"source": "SonTransfer-IEs.NotificationCellList", "target": "SonTransfer-IEs.NotificationCellList-Item", "value": 1},
    {"source": "S1AP-Containers.PrivateIE-Container", "target": "S1AP-Constants.maxPrivateIEs", "value": 1},
@ -2910,6 +3067,8 @@
    {"source": "S1AP-PDU-Contents.UEContextModificationResponseIEs", "target": "S1AP-IEs.ENB-UE-S1AP-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.UEContextSuspendRequest", "target": "S1AP-PDU-Contents.UEContextSuspendRequestIEs", "value": 1},
    {"source": "S1AP-PDU-Contents.UEContextSuspendRequest", "target": "S1AP-Containers.ProtocolIE-Container", "value": 1},
+    {"source": "S1AP-PDU-Contents.E-RABModifyItemBearerModResExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
+    {"source": "S1AP-Constants.id-RRC-Resume-Cause", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Constants.id-SIPTO-Correlation-ID", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Constants.id-DLCOUNTValuePDCP-SNlength18", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.ErrorIndication", "target": "S1AP-PDU-Contents.ErrorIndicationIEs", "value": 1},
@ -2936,6 +3095,8 @@
    {"source": "S1AP-PDU-Descriptions.uEContextRelease", "target": "S1AP-PDU-Contents.UEContextReleaseCommand", "value": 1},
    {"source": "S1AP-PDU-Descriptions.uEContextRelease", "target": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURE", "value": 1},
    {"source": "S1AP-PDU-Descriptions.uEContextRelease", "target": "S1AP-PDU-Contents.UEContextReleaseComplete", "value": 1},
+    {"source": "S1AP-PDU-Contents.NASDeliveryIndication", "target": "S1AP-PDU-Contents.NASDeliveryIndicationIEs", "value": 1},
+    {"source": "S1AP-PDU-Contents.NASDeliveryIndication", "target": "S1AP-Containers.ProtocolIE-Container", "value": 1},
    {"source": "S1AP-PDU-Descriptions.cellTrafficTrace", "target": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURE", "value": 1},
    {"source": "S1AP-PDU-Descriptions.cellTrafficTrace", "target": "S1AP-PDU-Contents.CellTrafficTrace", "value": 1},
    {"source": "S1AP-Constants.id-MSClassmark3", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
@ -2964,6 +3125,7 @@
    {"source": "S1AP-IEs.TAIListForRestart", "target": "S1AP-Constants.maxnoofRestartTAIs", "value": 1},
    {"source": "S1AP-PDU-Descriptions.initialUEMessage", "target": "S1AP-PDU-Contents.InitialUEMessage", "value": 1},
    {"source": "S1AP-PDU-Descriptions.initialUEMessage", "target": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURE", "value": 1},
+    {"source": "S1AP-IEs.V2XServicesAuthorized-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABModifyItemBearerModConfExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
    {"source": "S1AP-Constants.id-cdma2000RATType", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURES", "target": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURE", "value": 1},
@ -2985,6 +3147,9 @@
    {"source": "SonTransfer-IEs.CellActivationRequest", "target": "SonTransfer-IEs.CellsToActivateList", "value": 1},
    {"source": "S1AP-PDU-Contents.UplinkUEAssociatedLPPaTransport", "target": "S1AP-PDU-Contents.UplinkUEAssociatedLPPaTransport-IEs", "value": 1},
    {"source": "S1AP-PDU-Contents.UplinkUEAssociatedLPPaTransport", "target": "S1AP-Containers.ProtocolIE-Container", "value": 1},
+    {"source": "S1AP-IEs.TargetID", "target": "S1AP-IEs.CGI", "value": 1},
+    {"source": "S1AP-IEs.TargetID", "target": "S1AP-IEs.TargeteNB-ID", "value": 1},
+    {"source": "S1AP-IEs.TargetID", "target": "S1AP-IEs.TargetRNC-ID", "value": 1},
    {"source": "S1AP-IEs.PagingAttemptInformation-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
    {"source": "S1AP-Constants.id-E-RABFailedToSetupListBearerSURes", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-IEs.BroadcastCompletedAreaList", "target": "S1AP-IEs.CellID-Broadcast", "value": 1},
@ -3000,7 +3165,7 @@
    {"source": "S1AP-PDU-Contents.UplinkUEAssociatedLPPaTransport-IEs", "target": "S1AP-IEs.ENB-UE-S1AP-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.KillResponse", "target": "S1AP-PDU-Contents.KillResponseIEs", "value": 1},
    {"source": "S1AP-PDU-Contents.KillResponse", "target": "S1AP-Containers.ProtocolIE-Container", "value": 1},
-    {"source": "S1AP-Constants.id-GUMMEIList", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
+    {"source": "S1AP-Constants.id-V2XServicesAuthorized", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Constants.id-NAS-PDU", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-PDU-Descriptions.uEContextSuspend", "target": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURE", "value": 1},
    {"source": "S1AP-PDU-Descriptions.uEContextSuspend", "target": "S1AP-PDU-Contents.UEContextSuspendResponse", "value": 1},
@ -3044,6 +3209,8 @@
    {"source": "S1AP-IEs.Cdma2000OneXSRVCCInfo", "target": "S1AP-IEs.Cdma2000OneXMEID", "value": 1},
    {"source": "S1AP-IEs.Cdma2000OneXSRVCCInfo", "target": "S1AP-IEs.Cdma2000OneXSRVCCInfo-ExtIEs", "value": 1},
    {"source": "S1AP-IEs.Cdma2000OneXSRVCCInfo", "target": "S1AP-Containers.ProtocolExtensionContainer", "value": 1},
+    {"source": "S1AP-IEs.MeasurementThresholdA2", "target": "S1AP-IEs.Threshold-RSRQ", "value": 1},
+    {"source": "S1AP-IEs.MeasurementThresholdA2", "target": "S1AP-IEs.Threshold-RSRP", "value": 1},
    {"source": "S1AP-Constants.id-SecurityKey", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-IEs.PWSfailedECGIList", "target": "S1AP-Constants.maxnoofCellsineNB", "value": 1},
    {"source": "S1AP-IEs.PWSfailedECGIList", "target": "S1AP-IEs.EUTRAN-CGI", "value": 1},
@ -3139,6 +3306,9 @@
    {"source": "S1AP-IEs.CSG-IdList-Item", "target": "S1AP-IEs.CSG-IdList-Item-ExtIEs", "value": 1},
    {"source": "S1AP-PDU-Contents.ENBConfigurationUpdateAcknowledgeIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
    {"source": "S1AP-PDU-Contents.ENBConfigurationUpdateAcknowledgeIEs", "target": "S1AP-IEs.CriticalityDiagnostics", "value": 1},
+    {"source": "S1AP-IEs.LastVisitedCell-Item", "target": "S1AP-IEs.LastVisitedGERANCellInformation", "value": 1},
+    {"source": "S1AP-IEs.LastVisitedCell-Item", "target": "S1AP-IEs.LastVisitedUTRANCellInformation", "value": 1},
+    {"source": "S1AP-IEs.LastVisitedCell-Item", "target": "S1AP-IEs.LastVisitedEUTRANCellInformation", "value": 1},
    {"source": "S1AP-IEs.E-RABInformationListItem", "target": "S1AP-IEs.DL-Forwarding", "value": 1},
    {"source": "S1AP-IEs.E-RABInformationListItem", "target": "S1AP-IEs.E-RAB-ID", "value": 1},
    {"source": "S1AP-IEs.E-RABInformationListItem", "target": "S1AP-Containers.ProtocolExtensionContainer", "value": 1},
@ -3146,6 +3316,7 @@
    {"source": "S1AP-PDU-Contents.E-RABReleaseItemBearerRelComp", "target": "S1AP-PDU-Contents.E-RABReleaseItemBearerRelCompExtIEs", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABReleaseItemBearerRelComp", "target": "S1AP-IEs.E-RAB-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABReleaseItemBearerRelComp", "target": "S1AP-Containers.ProtocolExtensionContainer", "value": 1},
+    {"source": "S1AP-IEs.DL-CP-SecurityInformation-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
    {"source": "S1AP-Constants.id-PrivacyIndicator", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Containers.ProtocolIE-FieldPair", "target": "S1AP-Containers.S1AP-PROTOCOL-IES-PAIR", "value": 1},
    {"source": "S1AP-Containers.ProtocolIE-FieldPair", "target": "S1AP-Containers.S1AP-PROTOCOL-IES-PAIR", "value": 1},
@ -3169,6 +3340,7 @@
    {"source": "S1AP-PDU-Contents.KillResponseIEs", "target": "S1AP-IEs.SerialNumber", "value": 1},
    {"source": "S1AP-PDU-Contents.KillResponseIEs", "target": "S1AP-IEs.CriticalityDiagnostics", "value": 1},
    {"source": "S1AP-PDU-Contents.KillResponseIEs", "target": "S1AP-IEs.BroadcastCancelledAreaList", "value": 1},
+    {"source": "S1AP-Constants.id-CE-mode-B-SupportIndicator", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Constants.id-TraceCollectionEntityIPAddress", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.UEContextModificationConfirm", "target": "S1AP-PDU-Contents.UEContextModificationConfirmIEs", "value": 1},
    {"source": "S1AP-PDU-Contents.UEContextModificationConfirm", "target": "S1AP-Containers.ProtocolIE-Container", "value": 1},
@ -3177,9 +3349,12 @@
    {"source": "S1AP-IEs.RecommendedCellList", "target": "S1AP-Containers.ProtocolIE-SingleContainer", "value": 1},
    {"source": "S1AP-IEs.RecommendedCellList", "target": "S1AP-Constants.maxnoofRecommendedCells", "value": 1},
    {"source": "S1AP-IEs.RecommendedCellList", "target": "S1AP-IEs.RecommendedCellItemIEs", "value": 1},
-    {"source": "S1AP-PDU-Contents.ConnectionEstablishmentIndicationIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
    {"source": "S1AP-PDU-Contents.ConnectionEstablishmentIndicationIEs", "target": "S1AP-IEs.MME-UE-S1AP-ID", "value": 1},
+    {"source": "S1AP-PDU-Contents.ConnectionEstablishmentIndicationIEs", "target": "S1AP-IEs.CE-ModeBRestricted", "value": 1},
+    {"source": "S1AP-PDU-Contents.ConnectionEstablishmentIndicationIEs", "target": "S1AP-IEs.DL-CP-SecurityInformation", "value": 1},
+    {"source": "S1AP-PDU-Contents.ConnectionEstablishmentIndicationIEs", "target": "S1AP-IEs.EnhancedCoverageRestricted", "value": 1},
    {"source": "S1AP-PDU-Contents.ConnectionEstablishmentIndicationIEs", "target": "S1AP-IEs.UERadioCapability", "value": 1},
+    {"source": "S1AP-PDU-Contents.ConnectionEstablishmentIndicationIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
    {"source": "S1AP-PDU-Contents.ConnectionEstablishmentIndicationIEs", "target": "S1AP-IEs.ENB-UE-S1AP-ID", "value": 1},
    {"source": "S1AP-Constants.id-E-RABFailedToSetupListCtxtSURes", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.MMEConfigurationTransfer", "target": "S1AP-PDU-Contents.MMEConfigurationTransferIEs", "value": 1},
@ -3227,6 +3402,7 @@
    {"source": "S1AP-PDU-Descriptions.nASNonDeliveryIndication", "target": "S1AP-PDU-Contents.NASNonDeliveryIndication", "value": 1},
    {"source": "S1AP-PDU-Descriptions.nASNonDeliveryIndication", "target": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURE", "value": 1},
    {"source": "S1AP-IEs.SourceeNB-ID-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
+    {"source": "S1AP-Constants.id-UEInformationTransfer", "target": "S1AP-CommonDataTypes.ProcedureCode", "value": 1},
    {"source": "S1AP-Constants.id-MMEname", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Constants.id-HandoverRestrictionList", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Containers.ProtocolIE-Container", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
@ -3235,6 +3411,11 @@
    {"source": "S1AP-IEs.ForbiddenLAs", "target": "S1AP-Constants.maxnoofEPLMNsPlusOne", "value": 1},
    {"source": "S1AP-IEs.ForbiddenLAs", "target": "S1AP-IEs.ForbiddenLAs-Item", "value": 1},
    {"source": "S1AP-Constants.id-VoiceSupportMatchIndicator", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
+    {"source": "S1AP-PDU-Contents.UEInformationTransferIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
+    {"source": "S1AP-PDU-Contents.UEInformationTransferIEs", "target": "S1AP-IEs.S-TMSI", "value": 1},
+    {"source": "S1AP-PDU-Contents.UEInformationTransferIEs", "target": "S1AP-IEs.PendingDataIndication", "value": 1},
+    {"source": "S1AP-PDU-Contents.UEInformationTransferIEs", "target": "S1AP-IEs.UERadioCapability", "value": 1},
+    {"source": "S1AP-PDU-Contents.UEInformationTransferIEs", "target": "S1AP-IEs.E-RABLevelQoSParameters", "value": 1},
    {"source": "S1AP-IEs.CSG-IdList-Item-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
    {"source": "S1AP-IEs.TAI-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
    {"source": "S1AP-Constants.id-Inter-SystemInformationTransferTypeMDT", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
@ -3253,6 +3434,8 @@
    {"source": "S1AP-Constants.id-TAI", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-IEs.TimeSynchronisationInfo-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
    {"source": "S1AP-IEs.TimeSynchronisationInfo-ExtIEs", "target": "S1AP-IEs.MutingAvailabilityIndication", "value": 1},
+    {"source": "S1AP-PDU-Descriptions.nASDeliveryIndication", "target": "S1AP-PDU-Contents.NASDeliveryIndication", "value": 1},
+    {"source": "S1AP-PDU-Descriptions.nASDeliveryIndication", "target": "S1AP-PDU-Descriptions.S1AP-ELEMENTARY-PROCEDURE", "value": 1},
    {"source": "S1AP-PDU-Contents.CSGMembershipInfo-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
    {"source": "S1AP-IEs.S-TMSI", "target": "S1AP-IEs.S-TMSI-ExtIEs", "value": 1},
    {"source": "S1AP-IEs.S-TMSI", "target": "S1AP-IEs.MME-Code", "value": 1},
@ -3264,6 +3447,7 @@
    {"source": "S1AP-PDU-Contents.HandoverRequestAcknowledgeIEs", "target": "S1AP-IEs.MME-UE-S1AP-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.HandoverRequestAcknowledgeIEs", "target": "S1AP-IEs.Target-ToSource-TransparentContainer", "value": 1},
    {"source": "S1AP-PDU-Contents.HandoverRequestAcknowledgeIEs", "target": "S1AP-IEs.CellAccessMode", "value": 1},
+    {"source": "S1AP-PDU-Contents.HandoverRequestAcknowledgeIEs", "target": "S1AP-IEs.CE-mode-B-SupportIndicator", "value": 1},
    {"source": "S1AP-PDU-Contents.HandoverRequestAcknowledgeIEs", "target": "S1AP-PDU-Contents.E-RABAdmittedList", "value": 1},
    {"source": "S1AP-PDU-Contents.HandoverRequestAcknowledgeIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
    {"source": "S1AP-PDU-Contents.HandoverRequestAcknowledgeIEs", "target": "S1AP-IEs.CSG-Id", "value": 1},
@ -3277,19 +3461,23 @@
    {"source": "S1AP-IEs.SONInformation", "target": "S1AP-IEs.SONInformationRequest", "value": 1},
    {"source": "S1AP-IEs.SONInformation", "target": "S1AP-IEs.SONInformation-Extension", "value": 1},
    {"source": "S1AP-IEs.SONInformation", "target": "S1AP-IEs.SONInformationReply", "value": 1},
+    {"source": "S1AP-IEs.ServedDCNsItem-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
    {"source": "S1AP-Constants.id-Time-UE-StayedInCell-EnhancedGranularity", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "SonTransfer-IEs.TooEarlyInterRATHOReportReportFromEUTRAN", "target": "SonTransfer-IEs.MobilityInformation", "value": 1},
    {"source": "S1AP-Constants.id-cdma2000HORequiredIndication", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
+    {"source": "S1AP-Constants.id-E-RABReleaseItemHOCmd", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.UplinkNonUEAssociatedLPPaTransport-IEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
    {"source": "S1AP-PDU-Contents.UplinkNonUEAssociatedLPPaTransport-IEs", "target": "S1AP-IEs.Routing-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.UplinkNonUEAssociatedLPPaTransport-IEs", "target": "S1AP-IEs.LPPa-PDU", "value": 1},
    {"source": "S1AP-IEs.ServedMMECs", "target": "S1AP-IEs.MME-Code", "value": 1},
    {"source": "S1AP-IEs.ServedMMECs", "target": "S1AP-Constants.maxnoofMMECs", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABToBeModifiedItemBearerModInd-ExtIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-EXTENSION", "value": 1},
-    {"source": "S1AP-PDU-Contents.UEContextResumeResponseIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
-    {"source": "S1AP-PDU-Contents.UEContextResumeResponseIEs", "target": "S1AP-IEs.MME-UE-S1AP-ID", "value": 1},
-    {"source": "S1AP-PDU-Contents.UEContextResumeResponseIEs", "target": "S1AP-IEs.CriticalityDiagnostics", "value": 1},
    {"source": "S1AP-PDU-Contents.UEContextResumeResponseIEs", "target": "S1AP-PDU-Contents.E-RABFailedToResumeListResumeRes", "value": 1},
+    {"source": "S1AP-PDU-Contents.UEContextResumeResponseIEs", "target": "S1AP-IEs.MME-UE-S1AP-ID", "value": 1},
+    {"source": "S1AP-PDU-Contents.UEContextResumeResponseIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
+    {"source": "S1AP-PDU-Contents.UEContextResumeResponseIEs", "target": "S1AP-IEs.PendingDataIndication", "value": 1},
+    {"source": "S1AP-PDU-Contents.UEContextResumeResponseIEs", "target": "S1AP-IEs.CriticalityDiagnostics", "value": 1},
+    {"source": "S1AP-PDU-Contents.UEContextResumeResponseIEs", "target": "S1AP-IEs.SecurityContext", "value": 1},
    {"source": "S1AP-PDU-Contents.UEContextResumeResponseIEs", "target": "S1AP-IEs.ENB-UE-S1AP-ID", "value": 1},
    {"source": "S1AP-Constants.id-E-RABReleaseListBearerRelComp", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-Constants.id-UEIdentityIndexValue", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
@ -3326,10 +3514,14 @@
    {"source": "S1AP-PDU-Contents.UplinkS1cdma2000tunnellingIEs", "target": "S1AP-IEs.Cdma2000RATType", "value": 1},
    {"source": "S1AP-PDU-Contents.UplinkS1cdma2000tunnellingIEs", "target": "S1AP-IEs.Cdma2000OneXSRVCCInfo", "value": 1},
    {"source": "S1AP-PDU-Contents.UplinkS1cdma2000tunnellingIEs", "target": "S1AP-IEs.ENB-UE-S1AP-ID", "value": 1},
+    {"source": "S1AP-Constants.id-NB-IoT-UEIdentityIndexValue", "target": "S1AP-CommonDataTypes.ProtocolIE-ID", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABNotToBeModifiedItemBearerModIndIEs", "target": "S1AP-Containers.S1AP-PROTOCOL-IES", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABNotToBeModifiedItemBearerModIndIEs", "target": "S1AP-PDU-Contents.E-RABNotToBeModifiedItemBearerModInd", "value": 1},
    {"source": "SonTransfer-IEs.ReportingCellList", "target": "SonTransfer-IEs.maxnoofIRATReportingCells", "value": 1},
    {"source": "SonTransfer-IEs.ReportingCellList", "target": "SonTransfer-IEs.ReportingCellList-Item", "value": 1},
+    {"source": "S1AP-IEs.DL-CP-SecurityInformation", "target": "S1AP-IEs.DL-NAS-MAC", "value": 1},
+    {"source": "S1AP-IEs.DL-CP-SecurityInformation", "target": "S1AP-Containers.ProtocolExtensionContainer", "value": 1},
+    {"source": "S1AP-IEs.DL-CP-SecurityInformation", "target": "S1AP-IEs.DL-CP-SecurityInformation-ExtIEs", "value": 1},
    {"source": "S1AP-Constants.id-MMEStatusTransfer", "target": "S1AP-CommonDataTypes.ProcedureCode", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABFailedtoSetupListHOReqAck", "target": "S1AP-PDU-Contents.E-RABFailedtoSetupItemHOReqAckIEs", "value": 1},
    {"source": "S1AP-PDU-Contents.E-RABFailedtoSetupListHOReqAck", "target": "S1AP-PDU-Contents.E-RAB-IE-ContainerList", "value": 1},
--- a/pycrate_asn1dir/S1AP.py
+++ b/pycrate_asn1dir/S1AP.py
--- a/pycrate_asn1dir/init.py
+++ b/pycrate_asn1dir/init.py
@ -1 +1 @@
-__all__ = ['LPPa', 'TAP3', 'Kerberos', 'RNSAP', 'ERS', 'CAP', 'PKIXAttrCert08', 'TCAP_RAW', 'CMSFirmWrap', 'TCAP_ANSI', 'H225', 'ILP', 'CMSAlgs', 'TCAP_MAP', 'HNBAP', 'RRCNR', 'S1AP', 'XwAP', 'H248', 'X509', 'PCAP', 'SABP', 'PKIXAlgo08', 'F1AP', 'H245', 'CMSAndPKIX08', 'RRLP', 'NCBI', 'LPPe', 'RRC3G', 'ExtSecServices', 'X520', 'NBAP', 'MAPv2', 'RFC5911', 'RRCLTE', 'RFC5912', 'ULP', 'AESCCMGCM', 'LPP', 'SLmAP', 'X509_2016', 'RANAP', 'H235', 'X2AP', 'PKCS1', 'TCAP', 'AuthEnvData', 'M3AP', 'PKIX1', 'CMSAes', 'CMS2004', 'MAP', 'SS', 'RNA', 'RUA', 'SNMP', 'TCAPExt', 'M2AP', 'NCBI_all', 'TCAP_CAP', 'CDR', 'LDAP', 'PKIXAttrCert', 'ITS', 'AsymKeyPkg', ]
+__all__ = ['S1AP', ]