FCA_RIC-434 Add support for Submgr's C-codes with ORAN E2SM-gNB-NRT spec

FCA_RIC-435 Add support for Submgr's GO-codes with ORAN E2SM-gNB-NRT spec

Change-Id: Ieb72c32e8a82aaa9d6feab4be27da8fdbdff9c02
Signed-off-by: Anssi Mannila <anssi.mannila@nokia.com>
diff --git a/3rdparty/E2AP-v01.00.00/Makefile.am.libasncodec b/3rdparty/E2AP-v01.00.00/Makefile.am.libasncodec
deleted file mode 100644
index c390b17..0000000
--- a/3rdparty/E2AP-v01.00.00/Makefile.am.libasncodec
+++ /dev/null
@@ -1,273 +0,0 @@
-ASN_MODULE_SRCS=	\
-	E2AP-PDU.c	\
-	InitiatingMessage.c	\
-	SuccessfulOutcome.c	\
-	UnsuccessfulOutcome.c	\
-	RICsubscriptionRequest.c	\
-	RICsubscriptionDetails.c	\
-	RICactions-ToBeSetup-List.c	\
-	RICaction-ToBeSetup-Item.c	\
-	RICsubscriptionResponse.c	\
-	RICaction-Admitted-List.c	\
-	RICaction-Admitted-Item.c	\
-	RICaction-NotAdmitted-List.c	\
-	RICaction-NotAdmitted-Item.c	\
-	RICsubscriptionFailure.c	\
-	RICsubscriptionDeleteRequest.c	\
-	RICsubscriptionDeleteResponse.c	\
-	RICsubscriptionDeleteFailure.c	\
-	RICindication.c	\
-	RICcontrolRequest.c	\
-	RICcontrolAcknowledge.c	\
-	RICcontrolFailure.c	\
-	ErrorIndication.c	\
-	E2setupRequest.c	\
-	E2setupResponse.c	\
-	E2setupFailure.c	\
-	ResetRequest.c	\
-	ResetResponse.c	\
-	RICserviceUpdate.c	\
-	RANfunctions-List.c	\
-	RANfunction-Item.c	\
-	RANfunctionsID-List.c	\
-	RANfunctionID-Item.c	\
-	RICserviceUpdateAcknowledge.c	\
-	RANfunctionsIDcause-List.c	\
-	RANfunctionIDcause-Item.c	\
-	RICserviceUpdateFailure.c	\
-	RICserviceQuery.c	\
-	Cause.c	\
-	CauseMisc.c	\
-	CauseProtocol.c	\
-	CauseRIC.c	\
-	CauseRICservice.c	\
-	CauseTransport.c	\
-	CriticalityDiagnostics.c	\
-	CriticalityDiagnostics-IE-List.c	\
-	CriticalityDiagnostics-IE-Item.c	\
-	ENB-ID.c	\
-	ENB-ID-Choice.c	\
-	ENGNB-ID.c	\
-	GlobalE2node-ID.c	\
-	GlobalE2node-en-gNB-ID.c	\
-	GlobalE2node-eNB-ID.c	\
-	GlobalE2node-gNB-ID.c	\
-	GlobalE2node-ng-eNB-ID.c	\
-	GlobalENB-ID.c	\
-	GlobalenGNB-ID.c	\
-	GlobalgNB-ID.c	\
-	GlobalngeNB-ID.c	\
-	GlobalRIC-ID.c	\
-	GNB-CU-UP-ID.c	\
-	GNB-DU-ID.c	\
-	GNB-ID-Choice.c	\
-	PLMN-Identity.c	\
-	RANfunctionDefinition.c	\
-	RANfunctionID.c	\
-	RANfunctionRevision.c	\
-	RICactionDefinition.c	\
-	RICactionID.c	\
-	RICactionType.c	\
-	RICcallProcessID.c	\
-	RICcontrolAckRequest.c	\
-	RICcontrolHeader.c	\
-	RICcontrolMessage.c	\
-	RICcontrolOutcome.c	\
-	RICcontrolStatus.c	\
-	RICeventTriggerDefinition.c	\
-	RICindicationHeader.c	\
-	RICindicationMessage.c	\
-	RICindicationSN.c	\
-	RICindicationType.c	\
-	RICrequestID.c	\
-	RICsubsequentAction.c	\
-	RICsubsequentActionType.c	\
-	RICtimeToWait.c	\
-	TimeToWait.c	\
-	TypeOfError.c	\
-	Criticality.c	\
-	Presence.c	\
-	ProcedureCode.c	\
-	ProtocolIE-ID.c	\
-	TriggeringMessage.c	\
-	ProtocolIE-Container.c	\
-	ProtocolIE-SingleContainer.c	\
-	ProtocolIE-Field.c	\
-	ProtocolIE-ContainerPair.c	\
-	ProtocolIE-FieldPair.c	\
-	ProtocolIE-ContainerList.c	\
-	ProtocolIE-ContainerPairList.c
-
-ASN_MODULE_HDRS=	\
-	E2AP-PDU.h	\
-	InitiatingMessage.h	\
-	SuccessfulOutcome.h	\
-	UnsuccessfulOutcome.h	\
-	RICsubscriptionRequest.h	\
-	RICsubscriptionDetails.h	\
-	RICactions-ToBeSetup-List.h	\
-	RICaction-ToBeSetup-Item.h	\
-	RICsubscriptionResponse.h	\
-	RICaction-Admitted-List.h	\
-	RICaction-Admitted-Item.h	\
-	RICaction-NotAdmitted-List.h	\
-	RICaction-NotAdmitted-Item.h	\
-	RICsubscriptionFailure.h	\
-	RICsubscriptionDeleteRequest.h	\
-	RICsubscriptionDeleteResponse.h	\
-	RICsubscriptionDeleteFailure.h	\
-	RICindication.h	\
-	RICcontrolRequest.h	\
-	RICcontrolAcknowledge.h	\
-	RICcontrolFailure.h	\
-	ErrorIndication.h	\
-	E2setupRequest.h	\
-	E2setupResponse.h	\
-	E2setupFailure.h	\
-	ResetRequest.h	\
-	ResetResponse.h	\
-	RICserviceUpdate.h	\
-	RANfunctions-List.h	\
-	RANfunction-Item.h	\
-	RANfunctionsID-List.h	\
-	RANfunctionID-Item.h	\
-	RICserviceUpdateAcknowledge.h	\
-	RANfunctionsIDcause-List.h	\
-	RANfunctionIDcause-Item.h	\
-	RICserviceUpdateFailure.h	\
-	RICserviceQuery.h	\
-	Cause.h	\
-	CauseMisc.h	\
-	CauseProtocol.h	\
-	CauseRIC.h	\
-	CauseRICservice.h	\
-	CauseTransport.h	\
-	CriticalityDiagnostics.h	\
-	CriticalityDiagnostics-IE-List.h	\
-	CriticalityDiagnostics-IE-Item.h	\
-	ENB-ID.h	\
-	ENB-ID-Choice.h	\
-	ENGNB-ID.h	\
-	GlobalE2node-ID.h	\
-	GlobalE2node-en-gNB-ID.h	\
-	GlobalE2node-eNB-ID.h	\
-	GlobalE2node-gNB-ID.h	\
-	GlobalE2node-ng-eNB-ID.h	\
-	GlobalENB-ID.h	\
-	GlobalenGNB-ID.h	\
-	GlobalgNB-ID.h	\
-	GlobalngeNB-ID.h	\
-	GlobalRIC-ID.h	\
-	GNB-CU-UP-ID.h	\
-	GNB-DU-ID.h	\
-	GNB-ID-Choice.h	\
-	PLMN-Identity.h	\
-	RANfunctionDefinition.h	\
-	RANfunctionID.h	\
-	RANfunctionRevision.h	\
-	RICactionDefinition.h	\
-	RICactionID.h	\
-	RICactionType.h	\
-	RICcallProcessID.h	\
-	RICcontrolAckRequest.h	\
-	RICcontrolHeader.h	\
-	RICcontrolMessage.h	\
-	RICcontrolOutcome.h	\
-	RICcontrolStatus.h	\
-	RICeventTriggerDefinition.h	\
-	RICindicationHeader.h	\
-	RICindicationMessage.h	\
-	RICindicationSN.h	\
-	RICindicationType.h	\
-	RICrequestID.h	\
-	RICsubsequentAction.h	\
-	RICsubsequentActionType.h	\
-	RICtimeToWait.h	\
-	TimeToWait.h	\
-	TypeOfError.h	\
-	Criticality.h	\
-	Presence.h	\
-	ProcedureCode.h	\
-	ProtocolIE-ID.h	\
-	TriggeringMessage.h	\
-	ProtocolIE-Container.h	\
-	ProtocolIE-SingleContainer.h	\
-	ProtocolIE-Field.h	\
-	ProtocolIE-ContainerPair.h	\
-	ProtocolIE-FieldPair.h	\
-	ProtocolIE-ContainerList.h	\
-	ProtocolIE-ContainerPairList.h
-
-ASN_MODULE_HDRS+=ANY.h
-ASN_MODULE_SRCS+=ANY.c
-ASN_MODULE_HDRS+=OCTET_STRING.h
-ASN_MODULE_HDRS+=OPEN_TYPE.h
-ASN_MODULE_SRCS+=OPEN_TYPE.c
-ASN_MODULE_HDRS+=constr_CHOICE.h
-ASN_MODULE_HDRS+=INTEGER.h
-ASN_MODULE_SRCS+=INTEGER.c
-ASN_MODULE_HDRS+=NativeEnumerated.h
-ASN_MODULE_SRCS+=NativeEnumerated.c
-ASN_MODULE_HDRS+=NativeInteger.h
-ASN_MODULE_SRCS+=NativeInteger.c
-ASN_MODULE_HDRS+=asn_SEQUENCE_OF.h
-ASN_MODULE_SRCS+=asn_SEQUENCE_OF.c
-ASN_MODULE_HDRS+=asn_SET_OF.h
-ASN_MODULE_SRCS+=asn_SET_OF.c
-ASN_MODULE_SRCS+=constr_CHOICE.c
-ASN_MODULE_HDRS+=constr_SEQUENCE.h
-ASN_MODULE_SRCS+=constr_SEQUENCE.c
-ASN_MODULE_HDRS+=constr_SEQUENCE_OF.h
-ASN_MODULE_SRCS+=constr_SEQUENCE_OF.c
-ASN_MODULE_HDRS+=constr_SET_OF.h
-ASN_MODULE_SRCS+=constr_SET_OF.c
-ASN_MODULE_HDRS+=asn_application.h
-ASN_MODULE_SRCS+=asn_application.c
-ASN_MODULE_HDRS+=asn_ioc.h
-ASN_MODULE_HDRS+=asn_system.h
-ASN_MODULE_HDRS+=asn_codecs.h
-ASN_MODULE_HDRS+=asn_internal.h
-ASN_MODULE_SRCS+=asn_internal.c
-ASN_MODULE_HDRS+=asn_random_fill.h
-ASN_MODULE_SRCS+=asn_random_fill.c
-ASN_MODULE_HDRS+=asn_bit_data.h
-ASN_MODULE_SRCS+=asn_bit_data.c
-ASN_MODULE_SRCS+=OCTET_STRING.c
-ASN_MODULE_HDRS+=BIT_STRING.h
-ASN_MODULE_SRCS+=BIT_STRING.c
-ASN_MODULE_SRCS+=asn_codecs_prim.c
-ASN_MODULE_HDRS+=asn_codecs_prim.h
-ASN_MODULE_HDRS+=ber_tlv_length.h
-ASN_MODULE_SRCS+=ber_tlv_length.c
-ASN_MODULE_HDRS+=ber_tlv_tag.h
-ASN_MODULE_SRCS+=ber_tlv_tag.c
-ASN_MODULE_HDRS+=ber_decoder.h
-ASN_MODULE_SRCS+=ber_decoder.c
-ASN_MODULE_HDRS+=der_encoder.h
-ASN_MODULE_SRCS+=der_encoder.c
-ASN_MODULE_HDRS+=constr_TYPE.h
-ASN_MODULE_SRCS+=constr_TYPE.c
-ASN_MODULE_HDRS+=constraints.h
-ASN_MODULE_SRCS+=constraints.c
-ASN_MODULE_HDRS+=xer_support.h
-ASN_MODULE_SRCS+=xer_support.c
-ASN_MODULE_HDRS+=xer_decoder.h
-ASN_MODULE_SRCS+=xer_decoder.c
-ASN_MODULE_HDRS+=xer_encoder.h
-ASN_MODULE_SRCS+=xer_encoder.c
-ASN_MODULE_HDRS+=per_support.h
-ASN_MODULE_SRCS+=per_support.c
-ASN_MODULE_HDRS+=per_decoder.h
-ASN_MODULE_SRCS+=per_decoder.c
-ASN_MODULE_HDRS+=per_encoder.h
-ASN_MODULE_SRCS+=per_encoder.c
-ASN_MODULE_HDRS+=per_opentype.h
-ASN_MODULE_SRCS+=per_opentype.c
-
-ASN_MODULE_CFLAGS=-DASN_DISABLE_OER_SUPPORT 
-
-lib_LTLIBRARIES+=libasncodec.la
-libasncodec_la_SOURCES=$(ASN_MODULE_SRCS) $(ASN_MODULE_HDRS)
-libasncodec_la_CPPFLAGS=-I$(top_srcdir)/
-libasncodec_la_CFLAGS=$(ASN_MODULE_CFLAGS)
-libasncodec_la_LDFLAGS=-lm
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/BIT_STRING.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/BIT_STRING.c
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/BIT_STRING.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/BIT_STRING.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/BIT_STRING.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/BIT_STRING.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/BIT_STRING.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/BIT_STRING.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/BOOLEAN.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/BOOLEAN.c
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/BOOLEAN.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/BOOLEAN.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/BOOLEAN.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/BOOLEAN.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/BOOLEAN.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/BOOLEAN.h
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ActionDefinition-Format1.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ActionDefinition-Format1.c
new file mode 100644
index 0000000..5be9f73
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ActionDefinition-Format1.c
@@ -0,0 +1,126 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_E2SM-gNB-NRT-ActionDefinition-Format1.h"
+
+#include "E2_RANparameter-Item.h"
+static int
+memb_E2_ranParameter_List_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	/* Determine the number of elements */
+	size = _A_CSEQUENCE_FROM_VOID(sptr)->count;
+	
+	if((size >= 1 && size <= 255)) {
+		/* Perform validation of the inner elements */
+		return td->encoding_constraints.general_constraints(td, sptr, ctfailcb, app_key);
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static asn_per_constraints_t asn_PER_type_E2_ranParameter_List_constr_2 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 8,  8,  1,  255 }	/* (SIZE(1..255)) */,
+	0, 0	/* No PER value map */
+};
+static asn_per_constraints_t asn_PER_memb_E2_ranParameter_List_constr_2 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 8,  8,  1,  255 }	/* (SIZE(1..255)) */,
+	0, 0	/* No PER value map */
+};
+static asn_TYPE_member_t asn_MBR_E2_ranParameter_List_2[] = {
+	{ ATF_POINTER, 0, 0,
+		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		0,
+		&asn_DEF_E2_RANparameter_Item,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		""
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_ranParameter_List_tags_2[] = {
+	(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static asn_SET_OF_specifics_t asn_SPC_E2_ranParameter_List_specs_2 = {
+	sizeof(struct E2_E2SM_gNB_NRT_ActionDefinition_Format1__ranParameter_List),
+	offsetof(struct E2_E2SM_gNB_NRT_ActionDefinition_Format1__ranParameter_List, _asn_ctx),
+	0,	/* XER encoding is XMLDelimitedItemList */
+};
+static /* Use -fall-defs-global to expose */
+asn_TYPE_descriptor_t asn_DEF_E2_ranParameter_List_2 = {
+	"ranParameter-List",
+	"ranParameter-List",
+	&asn_OP_SEQUENCE_OF,
+	asn_DEF_E2_ranParameter_List_tags_2,
+	sizeof(asn_DEF_E2_ranParameter_List_tags_2)
+		/sizeof(asn_DEF_E2_ranParameter_List_tags_2[0]) - 1, /* 1 */
+	asn_DEF_E2_ranParameter_List_tags_2,	/* Same as above */
+	sizeof(asn_DEF_E2_ranParameter_List_tags_2)
+		/sizeof(asn_DEF_E2_ranParameter_List_tags_2[0]), /* 2 */
+	{ 0, &asn_PER_type_E2_ranParameter_List_constr_2, SEQUENCE_OF_constraint },
+	asn_MBR_E2_ranParameter_List_2,
+	1,	/* Single element */
+	&asn_SPC_E2_ranParameter_List_specs_2	/* Additional specs */
+};
+
+asn_TYPE_member_t asn_MBR_E2_E2SM_gNB_NRT_ActionDefinition_Format1_1[] = {
+	{ ATF_POINTER, 1, offsetof(struct E2_E2SM_gNB_NRT_ActionDefinition_Format1, ranParameter_List),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		0,
+		&asn_DEF_E2_ranParameter_List_2,
+		0,
+		{ 0, &asn_PER_memb_E2_ranParameter_List_constr_2,  memb_E2_ranParameter_List_constraint_1 },
+		0, 0, /* No default value */
+		"ranParameter-List"
+		},
+};
+static const int asn_MAP_E2_E2SM_gNB_NRT_ActionDefinition_Format1_oms_1[] = { 0 };
+static const ber_tlv_tag_t asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition_Format1_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_E2SM_gNB_NRT_ActionDefinition_Format1_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* ranParameter-List */
+};
+asn_SEQUENCE_specifics_t asn_SPC_E2_E2SM_gNB_NRT_ActionDefinition_Format1_specs_1 = {
+	sizeof(struct E2_E2SM_gNB_NRT_ActionDefinition_Format1),
+	offsetof(struct E2_E2SM_gNB_NRT_ActionDefinition_Format1, _asn_ctx),
+	asn_MAP_E2_E2SM_gNB_NRT_ActionDefinition_Format1_tag2el_1,
+	1,	/* Count of tags in the map */
+	asn_MAP_E2_E2SM_gNB_NRT_ActionDefinition_Format1_oms_1,	/* Optional members */
+	1, 0,	/* Root/Additions */
+	1,	/* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition_Format1 = {
+	"E2SM-gNB-NRT-ActionDefinition-Format1",
+	"E2SM-gNB-NRT-ActionDefinition-Format1",
+	&asn_OP_SEQUENCE,
+	asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition_Format1_tags_1,
+	sizeof(asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition_Format1_tags_1)
+		/sizeof(asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition_Format1_tags_1[0]), /* 1 */
+	asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition_Format1_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition_Format1_tags_1)
+		/sizeof(asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition_Format1_tags_1[0]), /* 1 */
+	{ 0, 0, SEQUENCE_constraint },
+	asn_MBR_E2_E2SM_gNB_NRT_ActionDefinition_Format1_1,
+	1,	/* Elements count */
+	&asn_SPC_E2_E2SM_gNB_NRT_ActionDefinition_Format1_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ActionDefinition-Format1.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ActionDefinition-Format1.h
new file mode 100644
index 0000000..f0414b0
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ActionDefinition-Format1.h
@@ -0,0 +1,53 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_E2SM_gNB_NRT_ActionDefinition_Format1_H_
+#define	_E2_E2SM_gNB_NRT_ActionDefinition_Format1_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "asn_SEQUENCE_OF.h"
+#include "constr_SEQUENCE_OF.h"
+#include "constr_SEQUENCE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct E2_RANparameter_Item;
+
+/* E2_E2SM-gNB-NRT-ActionDefinition-Format1 */
+typedef struct E2_E2SM_gNB_NRT_ActionDefinition_Format1 {
+	struct E2_E2SM_gNB_NRT_ActionDefinition_Format1__ranParameter_List {
+		A_SEQUENCE_OF(struct E2_RANparameter_Item) list;
+		
+		/* Context for parsing across buffer boundaries */
+		asn_struct_ctx_t _asn_ctx;
+	} *ranParameter_List;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_E2SM_gNB_NRT_ActionDefinition_Format1_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition_Format1;
+extern asn_SEQUENCE_specifics_t asn_SPC_E2_E2SM_gNB_NRT_ActionDefinition_Format1_specs_1;
+extern asn_TYPE_member_t asn_MBR_E2_E2SM_gNB_NRT_ActionDefinition_Format1_1[1];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_E2SM_gNB_NRT_ActionDefinition_Format1_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ActionDefinition.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ActionDefinition.c
new file mode 100644
index 0000000..95b3097
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ActionDefinition.c
@@ -0,0 +1,52 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_E2SM-gNB-NRT-ActionDefinition.h"
+
+static asn_per_constraints_t asn_PER_type_E2_E2SM_gNB_NRT_ActionDefinition_constr_1 CC_NOTUSED = {
+	{ APC_CONSTRAINED | APC_EXTENSIBLE,  0,  0,  0,  0 }	/* (0..0,...) */,
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	0, 0	/* No PER value map */
+};
+static asn_TYPE_member_t asn_MBR_E2_E2SM_gNB_NRT_ActionDefinition_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_E2SM_gNB_NRT_ActionDefinition, choice.actionDefinition_Format1),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition_Format1,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"actionDefinition-Format1"
+		},
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_E2SM_gNB_NRT_ActionDefinition_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* actionDefinition-Format1 */
+};
+static asn_CHOICE_specifics_t asn_SPC_E2_E2SM_gNB_NRT_ActionDefinition_specs_1 = {
+	sizeof(struct E2_E2SM_gNB_NRT_ActionDefinition),
+	offsetof(struct E2_E2SM_gNB_NRT_ActionDefinition, _asn_ctx),
+	offsetof(struct E2_E2SM_gNB_NRT_ActionDefinition, present),
+	sizeof(((struct E2_E2SM_gNB_NRT_ActionDefinition *)0)->present),
+	asn_MAP_E2_E2SM_gNB_NRT_ActionDefinition_tag2el_1,
+	1,	/* Count of tags in the map */
+	0, 0,
+	1	/* Extensions start */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition = {
+	"E2SM-gNB-NRT-ActionDefinition",
+	"E2SM-gNB-NRT-ActionDefinition",
+	&asn_OP_CHOICE,
+	0,	/* No effective tags (pointer) */
+	0,	/* No effective tags (count) */
+	0,	/* No tags (pointer) */
+	0,	/* No tags (count) */
+	{ 0, &asn_PER_type_E2_E2SM_gNB_NRT_ActionDefinition_constr_1, CHOICE_constraint },
+	asn_MBR_E2_E2SM_gNB_NRT_ActionDefinition_1,
+	1,	/* Elements count */
+	&asn_SPC_E2_E2SM_gNB_NRT_ActionDefinition_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ActionDefinition.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ActionDefinition.h
new file mode 100644
index 0000000..30f4f79
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ActionDefinition.h
@@ -0,0 +1,53 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_E2SM_gNB_NRT_ActionDefinition_H_
+#define	_E2_E2SM_gNB_NRT_ActionDefinition_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_E2SM-gNB-NRT-ActionDefinition-Format1.h"
+#include "constr_CHOICE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dependencies */
+typedef enum E2_E2SM_gNB_NRT_ActionDefinition_PR {
+	E2_E2SM_gNB_NRT_ActionDefinition_PR_NOTHING,	/* No components present */
+	E2_E2SM_gNB_NRT_ActionDefinition_PR_actionDefinition_Format1
+	/* Extensions may appear below */
+	
+} E2_E2SM_gNB_NRT_ActionDefinition_PR;
+
+/* E2_E2SM-gNB-NRT-ActionDefinition */
+typedef struct E2_E2SM_gNB_NRT_ActionDefinition {
+	E2_E2SM_gNB_NRT_ActionDefinition_PR present;
+	union E2_E2SM_gNB_NRT_ActionDefinition_u {
+		E2_E2SM_gNB_NRT_ActionDefinition_Format1_t	 actionDefinition_Format1;
+		/*
+		 * This type is extensible,
+		 * possible extensions are below.
+		 */
+	} choice;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_E2SM_gNB_NRT_ActionDefinition_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_E2SM_gNB_NRT_ActionDefinition_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ControlHeader-Format1.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ControlHeader-Format1.c
new file mode 100644
index 0000000..7194c67
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ControlHeader-Format1.c
@@ -0,0 +1,70 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_E2SM-gNB-NRT-ControlHeader-Format1.h"
+
+asn_TYPE_member_t asn_MBR_E2_E2SM_gNB_NRT_ControlHeader_Format1_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_E2SM_gNB_NRT_ControlHeader_Format1, command),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_NRT_ControlCommand,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"command"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_E2SM_gNB_NRT_ControlHeader_Format1, servedCellID),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		+1,	/* EXPLICIT tag at current level */
+		&asn_DEF_E2_NRT_Cell_ID,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"servedCellID"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_E2SM_gNB_NRT_ControlHeader_Format1, neighbourCellID),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		+1,	/* EXPLICIT tag at current level */
+		&asn_DEF_E2_NRT_Cell_ID,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"neighbourCellID"
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_E2SM_gNB_NRT_ControlHeader_Format1_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_E2SM_gNB_NRT_ControlHeader_Format1_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* command */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* servedCellID */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* neighbourCellID */
+};
+asn_SEQUENCE_specifics_t asn_SPC_E2_E2SM_gNB_NRT_ControlHeader_Format1_specs_1 = {
+	sizeof(struct E2_E2SM_gNB_NRT_ControlHeader_Format1),
+	offsetof(struct E2_E2SM_gNB_NRT_ControlHeader_Format1, _asn_ctx),
+	asn_MAP_E2_E2SM_gNB_NRT_ControlHeader_Format1_tag2el_1,
+	3,	/* Count of tags in the map */
+	0, 0, 0,	/* Optional elements (not needed) */
+	3,	/* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_E2SM_gNB_NRT_ControlHeader_Format1 = {
+	"E2SM-gNB-NRT-ControlHeader-Format1",
+	"E2SM-gNB-NRT-ControlHeader-Format1",
+	&asn_OP_SEQUENCE,
+	asn_DEF_E2_E2SM_gNB_NRT_ControlHeader_Format1_tags_1,
+	sizeof(asn_DEF_E2_E2SM_gNB_NRT_ControlHeader_Format1_tags_1)
+		/sizeof(asn_DEF_E2_E2SM_gNB_NRT_ControlHeader_Format1_tags_1[0]), /* 1 */
+	asn_DEF_E2_E2SM_gNB_NRT_ControlHeader_Format1_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_E2SM_gNB_NRT_ControlHeader_Format1_tags_1)
+		/sizeof(asn_DEF_E2_E2SM_gNB_NRT_ControlHeader_Format1_tags_1[0]), /* 1 */
+	{ 0, 0, SEQUENCE_constraint },
+	asn_MBR_E2_E2SM_gNB_NRT_ControlHeader_Format1_1,
+	3,	/* Elements count */
+	&asn_SPC_E2_E2SM_gNB_NRT_ControlHeader_Format1_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ControlHeader-Format1.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ControlHeader-Format1.h
new file mode 100644
index 0000000..1ff4984
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ControlHeader-Format1.h
@@ -0,0 +1,47 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_E2SM_gNB_NRT_ControlHeader_Format1_H_
+#define	_E2_E2SM_gNB_NRT_ControlHeader_Format1_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_NRT-ControlCommand.h"
+#include "E2_NRT-Cell-ID.h"
+#include "constr_SEQUENCE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_E2SM-gNB-NRT-ControlHeader-Format1 */
+typedef struct E2_E2SM_gNB_NRT_ControlHeader_Format1 {
+	E2_NRT_ControlCommand_t	 command;
+	E2_NRT_Cell_ID_t	 servedCellID;
+	E2_NRT_Cell_ID_t	 neighbourCellID;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_E2SM_gNB_NRT_ControlHeader_Format1_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_E2SM_gNB_NRT_ControlHeader_Format1;
+extern asn_SEQUENCE_specifics_t asn_SPC_E2_E2SM_gNB_NRT_ControlHeader_Format1_specs_1;
+extern asn_TYPE_member_t asn_MBR_E2_E2SM_gNB_NRT_ControlHeader_Format1_1[3];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_E2SM_gNB_NRT_ControlHeader_Format1_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ControlHeader.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ControlHeader.c
new file mode 100644
index 0000000..212d7a8
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ControlHeader.c
@@ -0,0 +1,52 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_E2SM-gNB-NRT-ControlHeader.h"
+
+static asn_per_constraints_t asn_PER_type_E2_E2SM_gNB_NRT_ControlHeader_constr_1 CC_NOTUSED = {
+	{ APC_CONSTRAINED | APC_EXTENSIBLE,  0,  0,  0,  0 }	/* (0..0,...) */,
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	0, 0	/* No PER value map */
+};
+static asn_TYPE_member_t asn_MBR_E2_E2SM_gNB_NRT_ControlHeader_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_E2SM_gNB_NRT_ControlHeader, choice.controlHeader_Format1),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_E2SM_gNB_NRT_ControlHeader_Format1,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"controlHeader-Format1"
+		},
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_E2SM_gNB_NRT_ControlHeader_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* controlHeader-Format1 */
+};
+static asn_CHOICE_specifics_t asn_SPC_E2_E2SM_gNB_NRT_ControlHeader_specs_1 = {
+	sizeof(struct E2_E2SM_gNB_NRT_ControlHeader),
+	offsetof(struct E2_E2SM_gNB_NRT_ControlHeader, _asn_ctx),
+	offsetof(struct E2_E2SM_gNB_NRT_ControlHeader, present),
+	sizeof(((struct E2_E2SM_gNB_NRT_ControlHeader *)0)->present),
+	asn_MAP_E2_E2SM_gNB_NRT_ControlHeader_tag2el_1,
+	1,	/* Count of tags in the map */
+	0, 0,
+	1	/* Extensions start */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_E2SM_gNB_NRT_ControlHeader = {
+	"E2SM-gNB-NRT-ControlHeader",
+	"E2SM-gNB-NRT-ControlHeader",
+	&asn_OP_CHOICE,
+	0,	/* No effective tags (pointer) */
+	0,	/* No effective tags (count) */
+	0,	/* No tags (pointer) */
+	0,	/* No tags (count) */
+	{ 0, &asn_PER_type_E2_E2SM_gNB_NRT_ControlHeader_constr_1, CHOICE_constraint },
+	asn_MBR_E2_E2SM_gNB_NRT_ControlHeader_1,
+	1,	/* Elements count */
+	&asn_SPC_E2_E2SM_gNB_NRT_ControlHeader_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ControlHeader.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ControlHeader.h
new file mode 100644
index 0000000..db7a740
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ControlHeader.h
@@ -0,0 +1,53 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_E2SM_gNB_NRT_ControlHeader_H_
+#define	_E2_E2SM_gNB_NRT_ControlHeader_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_E2SM-gNB-NRT-ControlHeader-Format1.h"
+#include "constr_CHOICE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dependencies */
+typedef enum E2_E2SM_gNB_NRT_ControlHeader_PR {
+	E2_E2SM_gNB_NRT_ControlHeader_PR_NOTHING,	/* No components present */
+	E2_E2SM_gNB_NRT_ControlHeader_PR_controlHeader_Format1
+	/* Extensions may appear below */
+	
+} E2_E2SM_gNB_NRT_ControlHeader_PR;
+
+/* E2_E2SM-gNB-NRT-ControlHeader */
+typedef struct E2_E2SM_gNB_NRT_ControlHeader {
+	E2_E2SM_gNB_NRT_ControlHeader_PR present;
+	union E2_E2SM_gNB_NRT_ControlHeader_u {
+		E2_E2SM_gNB_NRT_ControlHeader_Format1_t	 controlHeader_Format1;
+		/*
+		 * This type is extensible,
+		 * possible extensions are below.
+		 */
+	} choice;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_E2SM_gNB_NRT_ControlHeader_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_E2SM_gNB_NRT_ControlHeader;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_E2SM_gNB_NRT_ControlHeader_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ControlMessage-Format1.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ControlMessage-Format1.c
new file mode 100644
index 0000000..b0f96e8
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ControlMessage-Format1.c
@@ -0,0 +1,50 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_E2SM-gNB-NRT-ControlMessage-Format1.h"
+
+asn_TYPE_member_t asn_MBR_E2_E2SM_gNB_NRT_ControlMessage_Format1_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_E2SM_gNB_NRT_ControlMessage_Format1, tablerecord),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_NRT_TableRecord,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"tablerecord"
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_E2SM_gNB_NRT_ControlMessage_Format1_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_E2SM_gNB_NRT_ControlMessage_Format1_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* tablerecord */
+};
+asn_SEQUENCE_specifics_t asn_SPC_E2_E2SM_gNB_NRT_ControlMessage_Format1_specs_1 = {
+	sizeof(struct E2_E2SM_gNB_NRT_ControlMessage_Format1),
+	offsetof(struct E2_E2SM_gNB_NRT_ControlMessage_Format1, _asn_ctx),
+	asn_MAP_E2_E2SM_gNB_NRT_ControlMessage_Format1_tag2el_1,
+	1,	/* Count of tags in the map */
+	0, 0, 0,	/* Optional elements (not needed) */
+	1,	/* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_E2SM_gNB_NRT_ControlMessage_Format1 = {
+	"E2SM-gNB-NRT-ControlMessage-Format1",
+	"E2SM-gNB-NRT-ControlMessage-Format1",
+	&asn_OP_SEQUENCE,
+	asn_DEF_E2_E2SM_gNB_NRT_ControlMessage_Format1_tags_1,
+	sizeof(asn_DEF_E2_E2SM_gNB_NRT_ControlMessage_Format1_tags_1)
+		/sizeof(asn_DEF_E2_E2SM_gNB_NRT_ControlMessage_Format1_tags_1[0]), /* 1 */
+	asn_DEF_E2_E2SM_gNB_NRT_ControlMessage_Format1_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_E2SM_gNB_NRT_ControlMessage_Format1_tags_1)
+		/sizeof(asn_DEF_E2_E2SM_gNB_NRT_ControlMessage_Format1_tags_1[0]), /* 1 */
+	{ 0, 0, SEQUENCE_constraint },
+	asn_MBR_E2_E2SM_gNB_NRT_ControlMessage_Format1_1,
+	1,	/* Elements count */
+	&asn_SPC_E2_E2SM_gNB_NRT_ControlMessage_Format1_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ControlMessage-Format1.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ControlMessage-Format1.h
new file mode 100644
index 0000000..ec62dca
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ControlMessage-Format1.h
@@ -0,0 +1,44 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_E2SM_gNB_NRT_ControlMessage_Format1_H_
+#define	_E2_E2SM_gNB_NRT_ControlMessage_Format1_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_NRT-TableRecord.h"
+#include "constr_SEQUENCE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_E2SM-gNB-NRT-ControlMessage-Format1 */
+typedef struct E2_E2SM_gNB_NRT_ControlMessage_Format1 {
+	E2_NRT_TableRecord_t	 tablerecord;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_E2SM_gNB_NRT_ControlMessage_Format1_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_E2SM_gNB_NRT_ControlMessage_Format1;
+extern asn_SEQUENCE_specifics_t asn_SPC_E2_E2SM_gNB_NRT_ControlMessage_Format1_specs_1;
+extern asn_TYPE_member_t asn_MBR_E2_E2SM_gNB_NRT_ControlMessage_Format1_1[1];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_E2SM_gNB_NRT_ControlMessage_Format1_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ControlMessage.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ControlMessage.c
new file mode 100644
index 0000000..1f2d3ff
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ControlMessage.c
@@ -0,0 +1,52 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_E2SM-gNB-NRT-ControlMessage.h"
+
+static asn_per_constraints_t asn_PER_type_E2_E2SM_gNB_NRT_ControlMessage_constr_1 CC_NOTUSED = {
+	{ APC_CONSTRAINED | APC_EXTENSIBLE,  0,  0,  0,  0 }	/* (0..0,...) */,
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	0, 0	/* No PER value map */
+};
+static asn_TYPE_member_t asn_MBR_E2_E2SM_gNB_NRT_ControlMessage_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_E2SM_gNB_NRT_ControlMessage, choice.controlMessage_Format1),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_E2SM_gNB_NRT_ControlMessage_Format1,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"controlMessage-Format1"
+		},
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_E2SM_gNB_NRT_ControlMessage_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* controlMessage-Format1 */
+};
+static asn_CHOICE_specifics_t asn_SPC_E2_E2SM_gNB_NRT_ControlMessage_specs_1 = {
+	sizeof(struct E2_E2SM_gNB_NRT_ControlMessage),
+	offsetof(struct E2_E2SM_gNB_NRT_ControlMessage, _asn_ctx),
+	offsetof(struct E2_E2SM_gNB_NRT_ControlMessage, present),
+	sizeof(((struct E2_E2SM_gNB_NRT_ControlMessage *)0)->present),
+	asn_MAP_E2_E2SM_gNB_NRT_ControlMessage_tag2el_1,
+	1,	/* Count of tags in the map */
+	0, 0,
+	1	/* Extensions start */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_E2SM_gNB_NRT_ControlMessage = {
+	"E2SM-gNB-NRT-ControlMessage",
+	"E2SM-gNB-NRT-ControlMessage",
+	&asn_OP_CHOICE,
+	0,	/* No effective tags (pointer) */
+	0,	/* No effective tags (count) */
+	0,	/* No tags (pointer) */
+	0,	/* No tags (count) */
+	{ 0, &asn_PER_type_E2_E2SM_gNB_NRT_ControlMessage_constr_1, CHOICE_constraint },
+	asn_MBR_E2_E2SM_gNB_NRT_ControlMessage_1,
+	1,	/* Elements count */
+	&asn_SPC_E2_E2SM_gNB_NRT_ControlMessage_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ControlMessage.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ControlMessage.h
new file mode 100644
index 0000000..062ce85
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-ControlMessage.h
@@ -0,0 +1,53 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_E2SM_gNB_NRT_ControlMessage_H_
+#define	_E2_E2SM_gNB_NRT_ControlMessage_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_E2SM-gNB-NRT-ControlMessage-Format1.h"
+#include "constr_CHOICE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dependencies */
+typedef enum E2_E2SM_gNB_NRT_ControlMessage_PR {
+	E2_E2SM_gNB_NRT_ControlMessage_PR_NOTHING,	/* No components present */
+	E2_E2SM_gNB_NRT_ControlMessage_PR_controlMessage_Format1
+	/* Extensions may appear below */
+	
+} E2_E2SM_gNB_NRT_ControlMessage_PR;
+
+/* E2_E2SM-gNB-NRT-ControlMessage */
+typedef struct E2_E2SM_gNB_NRT_ControlMessage {
+	E2_E2SM_gNB_NRT_ControlMessage_PR present;
+	union E2_E2SM_gNB_NRT_ControlMessage_u {
+		E2_E2SM_gNB_NRT_ControlMessage_Format1_t	 controlMessage_Format1;
+		/*
+		 * This type is extensible,
+		 * possible extensions are below.
+		 */
+	} choice;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_E2SM_gNB_NRT_ControlMessage_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_E2SM_gNB_NRT_ControlMessage;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_E2SM_gNB_NRT_ControlMessage_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-EventTriggerDefinition-Format1.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-EventTriggerDefinition-Format1.c
new file mode 100644
index 0000000..80a9986
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-EventTriggerDefinition-Format1.c
@@ -0,0 +1,50 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_E2SM-gNB-NRT-EventTriggerDefinition-Format1.h"
+
+asn_TYPE_member_t asn_MBR_E2_E2SM_gNB_NRT_EventTriggerDefinition_Format1_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_E2SM_gNB_NRT_EventTriggerDefinition_Format1, triggerNature),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_NRT_TriggerNature,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"triggerNature"
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition_Format1_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_E2SM_gNB_NRT_EventTriggerDefinition_Format1_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* triggerNature */
+};
+asn_SEQUENCE_specifics_t asn_SPC_E2_E2SM_gNB_NRT_EventTriggerDefinition_Format1_specs_1 = {
+	sizeof(struct E2_E2SM_gNB_NRT_EventTriggerDefinition_Format1),
+	offsetof(struct E2_E2SM_gNB_NRT_EventTriggerDefinition_Format1, _asn_ctx),
+	asn_MAP_E2_E2SM_gNB_NRT_EventTriggerDefinition_Format1_tag2el_1,
+	1,	/* Count of tags in the map */
+	0, 0, 0,	/* Optional elements (not needed) */
+	1,	/* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition_Format1 = {
+	"E2SM-gNB-NRT-EventTriggerDefinition-Format1",
+	"E2SM-gNB-NRT-EventTriggerDefinition-Format1",
+	&asn_OP_SEQUENCE,
+	asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition_Format1_tags_1,
+	sizeof(asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition_Format1_tags_1)
+		/sizeof(asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition_Format1_tags_1[0]), /* 1 */
+	asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition_Format1_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition_Format1_tags_1)
+		/sizeof(asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition_Format1_tags_1[0]), /* 1 */
+	{ 0, 0, SEQUENCE_constraint },
+	asn_MBR_E2_E2SM_gNB_NRT_EventTriggerDefinition_Format1_1,
+	1,	/* Elements count */
+	&asn_SPC_E2_E2SM_gNB_NRT_EventTriggerDefinition_Format1_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-EventTriggerDefinition-Format1.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-EventTriggerDefinition-Format1.h
new file mode 100644
index 0000000..6e6b03d
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-EventTriggerDefinition-Format1.h
@@ -0,0 +1,44 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_E2SM_gNB_NRT_EventTriggerDefinition_Format1_H_
+#define	_E2_E2SM_gNB_NRT_EventTriggerDefinition_Format1_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_NRT-TriggerNature.h"
+#include "constr_SEQUENCE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_E2SM-gNB-NRT-EventTriggerDefinition-Format1 */
+typedef struct E2_E2SM_gNB_NRT_EventTriggerDefinition_Format1 {
+	E2_NRT_TriggerNature_t	 triggerNature;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_E2SM_gNB_NRT_EventTriggerDefinition_Format1_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition_Format1;
+extern asn_SEQUENCE_specifics_t asn_SPC_E2_E2SM_gNB_NRT_EventTriggerDefinition_Format1_specs_1;
+extern asn_TYPE_member_t asn_MBR_E2_E2SM_gNB_NRT_EventTriggerDefinition_Format1_1[1];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_E2SM_gNB_NRT_EventTriggerDefinition_Format1_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-EventTriggerDefinition.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-EventTriggerDefinition.c
new file mode 100644
index 0000000..831e12b
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-EventTriggerDefinition.c
@@ -0,0 +1,52 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_E2SM-gNB-NRT-EventTriggerDefinition.h"
+
+static asn_per_constraints_t asn_PER_type_E2_E2SM_gNB_NRT_EventTriggerDefinition_constr_1 CC_NOTUSED = {
+	{ APC_CONSTRAINED | APC_EXTENSIBLE,  0,  0,  0,  0 }	/* (0..0,...) */,
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	0, 0	/* No PER value map */
+};
+static asn_TYPE_member_t asn_MBR_E2_E2SM_gNB_NRT_EventTriggerDefinition_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_E2SM_gNB_NRT_EventTriggerDefinition, choice.eventDefinition_Format1),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition_Format1,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"eventDefinition-Format1"
+		},
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_E2SM_gNB_NRT_EventTriggerDefinition_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* eventDefinition-Format1 */
+};
+static asn_CHOICE_specifics_t asn_SPC_E2_E2SM_gNB_NRT_EventTriggerDefinition_specs_1 = {
+	sizeof(struct E2_E2SM_gNB_NRT_EventTriggerDefinition),
+	offsetof(struct E2_E2SM_gNB_NRT_EventTriggerDefinition, _asn_ctx),
+	offsetof(struct E2_E2SM_gNB_NRT_EventTriggerDefinition, present),
+	sizeof(((struct E2_E2SM_gNB_NRT_EventTriggerDefinition *)0)->present),
+	asn_MAP_E2_E2SM_gNB_NRT_EventTriggerDefinition_tag2el_1,
+	1,	/* Count of tags in the map */
+	0, 0,
+	1	/* Extensions start */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition = {
+	"E2SM-gNB-NRT-EventTriggerDefinition",
+	"E2SM-gNB-NRT-EventTriggerDefinition",
+	&asn_OP_CHOICE,
+	0,	/* No effective tags (pointer) */
+	0,	/* No effective tags (count) */
+	0,	/* No tags (pointer) */
+	0,	/* No tags (count) */
+	{ 0, &asn_PER_type_E2_E2SM_gNB_NRT_EventTriggerDefinition_constr_1, CHOICE_constraint },
+	asn_MBR_E2_E2SM_gNB_NRT_EventTriggerDefinition_1,
+	1,	/* Elements count */
+	&asn_SPC_E2_E2SM_gNB_NRT_EventTriggerDefinition_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-EventTriggerDefinition.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-EventTriggerDefinition.h
new file mode 100644
index 0000000..c6840da
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-EventTriggerDefinition.h
@@ -0,0 +1,53 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_E2SM_gNB_NRT_EventTriggerDefinition_H_
+#define	_E2_E2SM_gNB_NRT_EventTriggerDefinition_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_E2SM-gNB-NRT-EventTriggerDefinition-Format1.h"
+#include "constr_CHOICE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dependencies */
+typedef enum E2_E2SM_gNB_NRT_EventTriggerDefinition_PR {
+	E2_E2SM_gNB_NRT_EventTriggerDefinition_PR_NOTHING,	/* No components present */
+	E2_E2SM_gNB_NRT_EventTriggerDefinition_PR_eventDefinition_Format1
+	/* Extensions may appear below */
+	
+} E2_E2SM_gNB_NRT_EventTriggerDefinition_PR;
+
+/* E2_E2SM-gNB-NRT-EventTriggerDefinition */
+typedef struct E2_E2SM_gNB_NRT_EventTriggerDefinition {
+	E2_E2SM_gNB_NRT_EventTriggerDefinition_PR present;
+	union E2_E2SM_gNB_NRT_EventTriggerDefinition_u {
+		E2_E2SM_gNB_NRT_EventTriggerDefinition_Format1_t	 eventDefinition_Format1;
+		/*
+		 * This type is extensible,
+		 * possible extensions are below.
+		 */
+	} choice;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_E2SM_gNB_NRT_EventTriggerDefinition_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_E2SM_gNB_NRT_EventTriggerDefinition_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-IndicationHeader-Format1.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-IndicationHeader-Format1.c
new file mode 100644
index 0000000..1c2e597
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-IndicationHeader-Format1.c
@@ -0,0 +1,52 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_E2SM-gNB-NRT-IndicationHeader-Format1.h"
+
+asn_TYPE_member_t asn_MBR_E2_E2SM_gNB_NRT_IndicationHeader_Format1_1[] = {
+	{ ATF_POINTER, 1, offsetof(struct E2_E2SM_gNB_NRT_IndicationHeader_Format1, timestamp),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_NRT_TimeStamp,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"timestamp"
+		},
+};
+static const int asn_MAP_E2_E2SM_gNB_NRT_IndicationHeader_Format1_oms_1[] = { 0 };
+static const ber_tlv_tag_t asn_DEF_E2_E2SM_gNB_NRT_IndicationHeader_Format1_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_E2SM_gNB_NRT_IndicationHeader_Format1_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* timestamp */
+};
+asn_SEQUENCE_specifics_t asn_SPC_E2_E2SM_gNB_NRT_IndicationHeader_Format1_specs_1 = {
+	sizeof(struct E2_E2SM_gNB_NRT_IndicationHeader_Format1),
+	offsetof(struct E2_E2SM_gNB_NRT_IndicationHeader_Format1, _asn_ctx),
+	asn_MAP_E2_E2SM_gNB_NRT_IndicationHeader_Format1_tag2el_1,
+	1,	/* Count of tags in the map */
+	asn_MAP_E2_E2SM_gNB_NRT_IndicationHeader_Format1_oms_1,	/* Optional members */
+	1, 0,	/* Root/Additions */
+	1,	/* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_E2SM_gNB_NRT_IndicationHeader_Format1 = {
+	"E2SM-gNB-NRT-IndicationHeader-Format1",
+	"E2SM-gNB-NRT-IndicationHeader-Format1",
+	&asn_OP_SEQUENCE,
+	asn_DEF_E2_E2SM_gNB_NRT_IndicationHeader_Format1_tags_1,
+	sizeof(asn_DEF_E2_E2SM_gNB_NRT_IndicationHeader_Format1_tags_1)
+		/sizeof(asn_DEF_E2_E2SM_gNB_NRT_IndicationHeader_Format1_tags_1[0]), /* 1 */
+	asn_DEF_E2_E2SM_gNB_NRT_IndicationHeader_Format1_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_E2SM_gNB_NRT_IndicationHeader_Format1_tags_1)
+		/sizeof(asn_DEF_E2_E2SM_gNB_NRT_IndicationHeader_Format1_tags_1[0]), /* 1 */
+	{ 0, 0, SEQUENCE_constraint },
+	asn_MBR_E2_E2SM_gNB_NRT_IndicationHeader_Format1_1,
+	1,	/* Elements count */
+	&asn_SPC_E2_E2SM_gNB_NRT_IndicationHeader_Format1_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-IndicationHeader-Format1.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-IndicationHeader-Format1.h
new file mode 100644
index 0000000..139f24e
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-IndicationHeader-Format1.h
@@ -0,0 +1,44 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_E2SM_gNB_NRT_IndicationHeader_Format1_H_
+#define	_E2_E2SM_gNB_NRT_IndicationHeader_Format1_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_NRT-TimeStamp.h"
+#include "constr_SEQUENCE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_E2SM-gNB-NRT-IndicationHeader-Format1 */
+typedef struct E2_E2SM_gNB_NRT_IndicationHeader_Format1 {
+	E2_NRT_TimeStamp_t	*timestamp;	/* OPTIONAL */
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_E2SM_gNB_NRT_IndicationHeader_Format1_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_E2SM_gNB_NRT_IndicationHeader_Format1;
+extern asn_SEQUENCE_specifics_t asn_SPC_E2_E2SM_gNB_NRT_IndicationHeader_Format1_specs_1;
+extern asn_TYPE_member_t asn_MBR_E2_E2SM_gNB_NRT_IndicationHeader_Format1_1[1];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_E2SM_gNB_NRT_IndicationHeader_Format1_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-IndicationHeader.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-IndicationHeader.c
new file mode 100644
index 0000000..4ec7901
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-IndicationHeader.c
@@ -0,0 +1,52 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_E2SM-gNB-NRT-IndicationHeader.h"
+
+static asn_per_constraints_t asn_PER_type_E2_E2SM_gNB_NRT_IndicationHeader_constr_1 CC_NOTUSED = {
+	{ APC_CONSTRAINED | APC_EXTENSIBLE,  0,  0,  0,  0 }	/* (0..0,...) */,
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	0, 0	/* No PER value map */
+};
+static asn_TYPE_member_t asn_MBR_E2_E2SM_gNB_NRT_IndicationHeader_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_E2SM_gNB_NRT_IndicationHeader, choice.indicationHeader_Format1),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_E2SM_gNB_NRT_IndicationHeader_Format1,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"indicationHeader-Format1"
+		},
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_E2SM_gNB_NRT_IndicationHeader_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* indicationHeader-Format1 */
+};
+static asn_CHOICE_specifics_t asn_SPC_E2_E2SM_gNB_NRT_IndicationHeader_specs_1 = {
+	sizeof(struct E2_E2SM_gNB_NRT_IndicationHeader),
+	offsetof(struct E2_E2SM_gNB_NRT_IndicationHeader, _asn_ctx),
+	offsetof(struct E2_E2SM_gNB_NRT_IndicationHeader, present),
+	sizeof(((struct E2_E2SM_gNB_NRT_IndicationHeader *)0)->present),
+	asn_MAP_E2_E2SM_gNB_NRT_IndicationHeader_tag2el_1,
+	1,	/* Count of tags in the map */
+	0, 0,
+	1	/* Extensions start */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_E2SM_gNB_NRT_IndicationHeader = {
+	"E2SM-gNB-NRT-IndicationHeader",
+	"E2SM-gNB-NRT-IndicationHeader",
+	&asn_OP_CHOICE,
+	0,	/* No effective tags (pointer) */
+	0,	/* No effective tags (count) */
+	0,	/* No tags (pointer) */
+	0,	/* No tags (count) */
+	{ 0, &asn_PER_type_E2_E2SM_gNB_NRT_IndicationHeader_constr_1, CHOICE_constraint },
+	asn_MBR_E2_E2SM_gNB_NRT_IndicationHeader_1,
+	1,	/* Elements count */
+	&asn_SPC_E2_E2SM_gNB_NRT_IndicationHeader_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-IndicationHeader.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-IndicationHeader.h
new file mode 100644
index 0000000..38c803a
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-IndicationHeader.h
@@ -0,0 +1,53 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_E2SM_gNB_NRT_IndicationHeader_H_
+#define	_E2_E2SM_gNB_NRT_IndicationHeader_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_E2SM-gNB-NRT-IndicationHeader-Format1.h"
+#include "constr_CHOICE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dependencies */
+typedef enum E2_E2SM_gNB_NRT_IndicationHeader_PR {
+	E2_E2SM_gNB_NRT_IndicationHeader_PR_NOTHING,	/* No components present */
+	E2_E2SM_gNB_NRT_IndicationHeader_PR_indicationHeader_Format1
+	/* Extensions may appear below */
+	
+} E2_E2SM_gNB_NRT_IndicationHeader_PR;
+
+/* E2_E2SM-gNB-NRT-IndicationHeader */
+typedef struct E2_E2SM_gNB_NRT_IndicationHeader {
+	E2_E2SM_gNB_NRT_IndicationHeader_PR present;
+	union E2_E2SM_gNB_NRT_IndicationHeader_u {
+		E2_E2SM_gNB_NRT_IndicationHeader_Format1_t	 indicationHeader_Format1;
+		/*
+		 * This type is extensible,
+		 * possible extensions are below.
+		 */
+	} choice;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_E2SM_gNB_NRT_IndicationHeader_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_E2SM_gNB_NRT_IndicationHeader;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_E2SM_gNB_NRT_IndicationHeader_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-IndicationMessage-Format1.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-IndicationMessage-Format1.c
new file mode 100644
index 0000000..a0d92d6
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-IndicationMessage-Format1.c
@@ -0,0 +1,124 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_E2SM-gNB-NRT-IndicationMessage-Format1.h"
+
+#include "E2_NRT-Record-List-item.h"
+static int
+memb_E2_nrt_Record_List_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	/* Determine the number of elements */
+	size = _A_CSEQUENCE_FROM_VOID(sptr)->count;
+	
+	if((size >= 1 && size <= 16384)) {
+		/* Perform validation of the inner elements */
+		return td->encoding_constraints.general_constraints(td, sptr, ctfailcb, app_key);
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static asn_per_constraints_t asn_PER_type_E2_nrt_Record_List_constr_2 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 14,  14,  1,  16384 }	/* (SIZE(1..16384)) */,
+	0, 0	/* No PER value map */
+};
+static asn_per_constraints_t asn_PER_memb_E2_nrt_Record_List_constr_2 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 14,  14,  1,  16384 }	/* (SIZE(1..16384)) */,
+	0, 0	/* No PER value map */
+};
+static asn_TYPE_member_t asn_MBR_E2_nrt_Record_List_2[] = {
+	{ ATF_POINTER, 0, 0,
+		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		0,
+		&asn_DEF_E2_NRT_Record_List_item,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		""
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_nrt_Record_List_tags_2[] = {
+	(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static asn_SET_OF_specifics_t asn_SPC_E2_nrt_Record_List_specs_2 = {
+	sizeof(struct E2_E2SM_gNB_NRT_IndicationMessage_Format1__nrt_Record_List),
+	offsetof(struct E2_E2SM_gNB_NRT_IndicationMessage_Format1__nrt_Record_List, _asn_ctx),
+	0,	/* XER encoding is XMLDelimitedItemList */
+};
+static /* Use -fall-defs-global to expose */
+asn_TYPE_descriptor_t asn_DEF_E2_nrt_Record_List_2 = {
+	"nrt-Record-List",
+	"nrt-Record-List",
+	&asn_OP_SEQUENCE_OF,
+	asn_DEF_E2_nrt_Record_List_tags_2,
+	sizeof(asn_DEF_E2_nrt_Record_List_tags_2)
+		/sizeof(asn_DEF_E2_nrt_Record_List_tags_2[0]) - 1, /* 1 */
+	asn_DEF_E2_nrt_Record_List_tags_2,	/* Same as above */
+	sizeof(asn_DEF_E2_nrt_Record_List_tags_2)
+		/sizeof(asn_DEF_E2_nrt_Record_List_tags_2[0]), /* 2 */
+	{ 0, &asn_PER_type_E2_nrt_Record_List_constr_2, SEQUENCE_OF_constraint },
+	asn_MBR_E2_nrt_Record_List_2,
+	1,	/* Single element */
+	&asn_SPC_E2_nrt_Record_List_specs_2	/* Additional specs */
+};
+
+asn_TYPE_member_t asn_MBR_E2_E2SM_gNB_NRT_IndicationMessage_Format1_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_E2SM_gNB_NRT_IndicationMessage_Format1, nrt_Record_List),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		0,
+		&asn_DEF_E2_nrt_Record_List_2,
+		0,
+		{ 0, &asn_PER_memb_E2_nrt_Record_List_constr_2,  memb_E2_nrt_Record_List_constraint_1 },
+		0, 0, /* No default value */
+		"nrt-Record-List"
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_E2SM_gNB_NRT_IndicationMessage_Format1_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_E2SM_gNB_NRT_IndicationMessage_Format1_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* nrt-Record-List */
+};
+asn_SEQUENCE_specifics_t asn_SPC_E2_E2SM_gNB_NRT_IndicationMessage_Format1_specs_1 = {
+	sizeof(struct E2_E2SM_gNB_NRT_IndicationMessage_Format1),
+	offsetof(struct E2_E2SM_gNB_NRT_IndicationMessage_Format1, _asn_ctx),
+	asn_MAP_E2_E2SM_gNB_NRT_IndicationMessage_Format1_tag2el_1,
+	1,	/* Count of tags in the map */
+	0, 0, 0,	/* Optional elements (not needed) */
+	1,	/* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_E2SM_gNB_NRT_IndicationMessage_Format1 = {
+	"E2SM-gNB-NRT-IndicationMessage-Format1",
+	"E2SM-gNB-NRT-IndicationMessage-Format1",
+	&asn_OP_SEQUENCE,
+	asn_DEF_E2_E2SM_gNB_NRT_IndicationMessage_Format1_tags_1,
+	sizeof(asn_DEF_E2_E2SM_gNB_NRT_IndicationMessage_Format1_tags_1)
+		/sizeof(asn_DEF_E2_E2SM_gNB_NRT_IndicationMessage_Format1_tags_1[0]), /* 1 */
+	asn_DEF_E2_E2SM_gNB_NRT_IndicationMessage_Format1_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_E2SM_gNB_NRT_IndicationMessage_Format1_tags_1)
+		/sizeof(asn_DEF_E2_E2SM_gNB_NRT_IndicationMessage_Format1_tags_1[0]), /* 1 */
+	{ 0, 0, SEQUENCE_constraint },
+	asn_MBR_E2_E2SM_gNB_NRT_IndicationMessage_Format1_1,
+	1,	/* Elements count */
+	&asn_SPC_E2_E2SM_gNB_NRT_IndicationMessage_Format1_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-IndicationMessage-Format1.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-IndicationMessage-Format1.h
new file mode 100644
index 0000000..98b7bd5
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-IndicationMessage-Format1.h
@@ -0,0 +1,53 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_E2SM_gNB_NRT_IndicationMessage_Format1_H_
+#define	_E2_E2SM_gNB_NRT_IndicationMessage_Format1_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "asn_SEQUENCE_OF.h"
+#include "constr_SEQUENCE_OF.h"
+#include "constr_SEQUENCE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct E2_NRT_Record_List_item;
+
+/* E2_E2SM-gNB-NRT-IndicationMessage-Format1 */
+typedef struct E2_E2SM_gNB_NRT_IndicationMessage_Format1 {
+	struct E2_E2SM_gNB_NRT_IndicationMessage_Format1__nrt_Record_List {
+		A_SEQUENCE_OF(struct E2_NRT_Record_List_item) list;
+		
+		/* Context for parsing across buffer boundaries */
+		asn_struct_ctx_t _asn_ctx;
+	} nrt_Record_List;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_E2SM_gNB_NRT_IndicationMessage_Format1_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_E2SM_gNB_NRT_IndicationMessage_Format1;
+extern asn_SEQUENCE_specifics_t asn_SPC_E2_E2SM_gNB_NRT_IndicationMessage_Format1_specs_1;
+extern asn_TYPE_member_t asn_MBR_E2_E2SM_gNB_NRT_IndicationMessage_Format1_1[1];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_E2SM_gNB_NRT_IndicationMessage_Format1_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-IndicationMessage.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-IndicationMessage.c
new file mode 100644
index 0000000..146fac9
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-IndicationMessage.c
@@ -0,0 +1,52 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_E2SM-gNB-NRT-IndicationMessage.h"
+
+static asn_per_constraints_t asn_PER_type_E2_E2SM_gNB_NRT_IndicationMessage_constr_1 CC_NOTUSED = {
+	{ APC_CONSTRAINED | APC_EXTENSIBLE,  0,  0,  0,  0 }	/* (0..0,...) */,
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	0, 0	/* No PER value map */
+};
+static asn_TYPE_member_t asn_MBR_E2_E2SM_gNB_NRT_IndicationMessage_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_E2SM_gNB_NRT_IndicationMessage, choice.indicationMessage_Format1),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_E2SM_gNB_NRT_IndicationMessage_Format1,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"indicationMessage-Format1"
+		},
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_E2SM_gNB_NRT_IndicationMessage_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* indicationMessage-Format1 */
+};
+static asn_CHOICE_specifics_t asn_SPC_E2_E2SM_gNB_NRT_IndicationMessage_specs_1 = {
+	sizeof(struct E2_E2SM_gNB_NRT_IndicationMessage),
+	offsetof(struct E2_E2SM_gNB_NRT_IndicationMessage, _asn_ctx),
+	offsetof(struct E2_E2SM_gNB_NRT_IndicationMessage, present),
+	sizeof(((struct E2_E2SM_gNB_NRT_IndicationMessage *)0)->present),
+	asn_MAP_E2_E2SM_gNB_NRT_IndicationMessage_tag2el_1,
+	1,	/* Count of tags in the map */
+	0, 0,
+	1	/* Extensions start */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_E2SM_gNB_NRT_IndicationMessage = {
+	"E2SM-gNB-NRT-IndicationMessage",
+	"E2SM-gNB-NRT-IndicationMessage",
+	&asn_OP_CHOICE,
+	0,	/* No effective tags (pointer) */
+	0,	/* No effective tags (count) */
+	0,	/* No tags (pointer) */
+	0,	/* No tags (count) */
+	{ 0, &asn_PER_type_E2_E2SM_gNB_NRT_IndicationMessage_constr_1, CHOICE_constraint },
+	asn_MBR_E2_E2SM_gNB_NRT_IndicationMessage_1,
+	1,	/* Elements count */
+	&asn_SPC_E2_E2SM_gNB_NRT_IndicationMessage_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-IndicationMessage.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-IndicationMessage.h
new file mode 100644
index 0000000..b23c2e8
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-IndicationMessage.h
@@ -0,0 +1,53 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_E2SM_gNB_NRT_IndicationMessage_H_
+#define	_E2_E2SM_gNB_NRT_IndicationMessage_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_E2SM-gNB-NRT-IndicationMessage-Format1.h"
+#include "constr_CHOICE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dependencies */
+typedef enum E2_E2SM_gNB_NRT_IndicationMessage_PR {
+	E2_E2SM_gNB_NRT_IndicationMessage_PR_NOTHING,	/* No components present */
+	E2_E2SM_gNB_NRT_IndicationMessage_PR_indicationMessage_Format1
+	/* Extensions may appear below */
+	
+} E2_E2SM_gNB_NRT_IndicationMessage_PR;
+
+/* E2_E2SM-gNB-NRT-IndicationMessage */
+typedef struct E2_E2SM_gNB_NRT_IndicationMessage {
+	E2_E2SM_gNB_NRT_IndicationMessage_PR present;
+	union E2_E2SM_gNB_NRT_IndicationMessage_u {
+		E2_E2SM_gNB_NRT_IndicationMessage_Format1_t	 indicationMessage_Format1;
+		/*
+		 * This type is extensible,
+		 * possible extensions are below.
+		 */
+	} choice;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_E2SM_gNB_NRT_IndicationMessage_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_E2SM_gNB_NRT_IndicationMessage;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_E2SM_gNB_NRT_IndicationMessage_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-RANfunction-Definition.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-RANfunction-Definition.c
new file mode 100644
index 0000000..da5d7da
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-RANfunction-Definition.c
@@ -0,0 +1,472 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_E2SM-gNB-NRT-RANfunction-Definition.h"
+
+#include "E2_RIC-EventTriggerStyle-List.h"
+#include "E2_RIC-ReportStyle-List.h"
+#include "E2_RIC-InsertStyle-List.h"
+#include "E2_RIC-ControlStyle-List.h"
+#include "E2_RIC-PolicyStyle-List.h"
+static int
+memb_E2_ric_EventTriggerStyle_List_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	/* Determine the number of elements */
+	size = _A_CSEQUENCE_FROM_VOID(sptr)->count;
+	
+	if((size >= 1 && size <= 63)) {
+		/* Perform validation of the inner elements */
+		return td->encoding_constraints.general_constraints(td, sptr, ctfailcb, app_key);
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static int
+memb_E2_ric_ReportStyle_List_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	/* Determine the number of elements */
+	size = _A_CSEQUENCE_FROM_VOID(sptr)->count;
+	
+	if((size >= 1 && size <= 63)) {
+		/* Perform validation of the inner elements */
+		return td->encoding_constraints.general_constraints(td, sptr, ctfailcb, app_key);
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static int
+memb_E2_ric_InsertStyle_List_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	/* Determine the number of elements */
+	size = _A_CSEQUENCE_FROM_VOID(sptr)->count;
+	
+	if((size >= 1 && size <= 63)) {
+		/* Perform validation of the inner elements */
+		return td->encoding_constraints.general_constraints(td, sptr, ctfailcb, app_key);
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static int
+memb_E2_ric_ControlStyle_List_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	/* Determine the number of elements */
+	size = _A_CSEQUENCE_FROM_VOID(sptr)->count;
+	
+	if((size >= 1 && size <= 63)) {
+		/* Perform validation of the inner elements */
+		return td->encoding_constraints.general_constraints(td, sptr, ctfailcb, app_key);
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static int
+memb_E2_ric_PolicyStyle_List_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	/* Determine the number of elements */
+	size = _A_CSEQUENCE_FROM_VOID(sptr)->count;
+	
+	if((size >= 1 && size <= 63)) {
+		/* Perform validation of the inner elements */
+		return td->encoding_constraints.general_constraints(td, sptr, ctfailcb, app_key);
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static asn_per_constraints_t asn_PER_type_E2_ric_EventTriggerStyle_List_constr_3 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 6,  6,  1,  63 }	/* (SIZE(1..63)) */,
+	0, 0	/* No PER value map */
+};
+static asn_per_constraints_t asn_PER_type_E2_ric_ReportStyle_List_constr_5 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 6,  6,  1,  63 }	/* (SIZE(1..63)) */,
+	0, 0	/* No PER value map */
+};
+static asn_per_constraints_t asn_PER_type_E2_ric_InsertStyle_List_constr_7 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 6,  6,  1,  63 }	/* (SIZE(1..63)) */,
+	0, 0	/* No PER value map */
+};
+static asn_per_constraints_t asn_PER_type_E2_ric_ControlStyle_List_constr_9 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 6,  6,  1,  63 }	/* (SIZE(1..63)) */,
+	0, 0	/* No PER value map */
+};
+static asn_per_constraints_t asn_PER_type_E2_ric_PolicyStyle_List_constr_11 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 6,  6,  1,  63 }	/* (SIZE(1..63)) */,
+	0, 0	/* No PER value map */
+};
+static asn_per_constraints_t asn_PER_memb_E2_ric_EventTriggerStyle_List_constr_3 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 6,  6,  1,  63 }	/* (SIZE(1..63)) */,
+	0, 0	/* No PER value map */
+};
+static asn_per_constraints_t asn_PER_memb_E2_ric_ReportStyle_List_constr_5 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 6,  6,  1,  63 }	/* (SIZE(1..63)) */,
+	0, 0	/* No PER value map */
+};
+static asn_per_constraints_t asn_PER_memb_E2_ric_InsertStyle_List_constr_7 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 6,  6,  1,  63 }	/* (SIZE(1..63)) */,
+	0, 0	/* No PER value map */
+};
+static asn_per_constraints_t asn_PER_memb_E2_ric_ControlStyle_List_constr_9 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 6,  6,  1,  63 }	/* (SIZE(1..63)) */,
+	0, 0	/* No PER value map */
+};
+static asn_per_constraints_t asn_PER_memb_E2_ric_PolicyStyle_List_constr_11 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 6,  6,  1,  63 }	/* (SIZE(1..63)) */,
+	0, 0	/* No PER value map */
+};
+static asn_TYPE_member_t asn_MBR_E2_ric_EventTriggerStyle_List_3[] = {
+	{ ATF_POINTER, 0, 0,
+		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		0,
+		&asn_DEF_E2_RIC_EventTriggerStyle_List,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		""
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_ric_EventTriggerStyle_List_tags_3[] = {
+	(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static asn_SET_OF_specifics_t asn_SPC_E2_ric_EventTriggerStyle_List_specs_3 = {
+	sizeof(struct E2_E2SM_gNB_NRT_RANfunction_Definition__ric_EventTriggerStyle_List),
+	offsetof(struct E2_E2SM_gNB_NRT_RANfunction_Definition__ric_EventTriggerStyle_List, _asn_ctx),
+	0,	/* XER encoding is XMLDelimitedItemList */
+};
+static /* Use -fall-defs-global to expose */
+asn_TYPE_descriptor_t asn_DEF_E2_ric_EventTriggerStyle_List_3 = {
+	"ric-EventTriggerStyle-List",
+	"ric-EventTriggerStyle-List",
+	&asn_OP_SEQUENCE_OF,
+	asn_DEF_E2_ric_EventTriggerStyle_List_tags_3,
+	sizeof(asn_DEF_E2_ric_EventTriggerStyle_List_tags_3)
+		/sizeof(asn_DEF_E2_ric_EventTriggerStyle_List_tags_3[0]) - 1, /* 1 */
+	asn_DEF_E2_ric_EventTriggerStyle_List_tags_3,	/* Same as above */
+	sizeof(asn_DEF_E2_ric_EventTriggerStyle_List_tags_3)
+		/sizeof(asn_DEF_E2_ric_EventTriggerStyle_List_tags_3[0]), /* 2 */
+	{ 0, &asn_PER_type_E2_ric_EventTriggerStyle_List_constr_3, SEQUENCE_OF_constraint },
+	asn_MBR_E2_ric_EventTriggerStyle_List_3,
+	1,	/* Single element */
+	&asn_SPC_E2_ric_EventTriggerStyle_List_specs_3	/* Additional specs */
+};
+
+static asn_TYPE_member_t asn_MBR_E2_ric_ReportStyle_List_5[] = {
+	{ ATF_POINTER, 0, 0,
+		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		0,
+		&asn_DEF_E2_RIC_ReportStyle_List,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		""
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_ric_ReportStyle_List_tags_5[] = {
+	(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static asn_SET_OF_specifics_t asn_SPC_E2_ric_ReportStyle_List_specs_5 = {
+	sizeof(struct E2_E2SM_gNB_NRT_RANfunction_Definition__ric_ReportStyle_List),
+	offsetof(struct E2_E2SM_gNB_NRT_RANfunction_Definition__ric_ReportStyle_List, _asn_ctx),
+	0,	/* XER encoding is XMLDelimitedItemList */
+};
+static /* Use -fall-defs-global to expose */
+asn_TYPE_descriptor_t asn_DEF_E2_ric_ReportStyle_List_5 = {
+	"ric-ReportStyle-List",
+	"ric-ReportStyle-List",
+	&asn_OP_SEQUENCE_OF,
+	asn_DEF_E2_ric_ReportStyle_List_tags_5,
+	sizeof(asn_DEF_E2_ric_ReportStyle_List_tags_5)
+		/sizeof(asn_DEF_E2_ric_ReportStyle_List_tags_5[0]) - 1, /* 1 */
+	asn_DEF_E2_ric_ReportStyle_List_tags_5,	/* Same as above */
+	sizeof(asn_DEF_E2_ric_ReportStyle_List_tags_5)
+		/sizeof(asn_DEF_E2_ric_ReportStyle_List_tags_5[0]), /* 2 */
+	{ 0, &asn_PER_type_E2_ric_ReportStyle_List_constr_5, SEQUENCE_OF_constraint },
+	asn_MBR_E2_ric_ReportStyle_List_5,
+	1,	/* Single element */
+	&asn_SPC_E2_ric_ReportStyle_List_specs_5	/* Additional specs */
+};
+
+static asn_TYPE_member_t asn_MBR_E2_ric_InsertStyle_List_7[] = {
+	{ ATF_POINTER, 0, 0,
+		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		0,
+		&asn_DEF_E2_RIC_InsertStyle_List,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		""
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_ric_InsertStyle_List_tags_7[] = {
+	(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static asn_SET_OF_specifics_t asn_SPC_E2_ric_InsertStyle_List_specs_7 = {
+	sizeof(struct E2_E2SM_gNB_NRT_RANfunction_Definition__ric_InsertStyle_List),
+	offsetof(struct E2_E2SM_gNB_NRT_RANfunction_Definition__ric_InsertStyle_List, _asn_ctx),
+	0,	/* XER encoding is XMLDelimitedItemList */
+};
+static /* Use -fall-defs-global to expose */
+asn_TYPE_descriptor_t asn_DEF_E2_ric_InsertStyle_List_7 = {
+	"ric-InsertStyle-List",
+	"ric-InsertStyle-List",
+	&asn_OP_SEQUENCE_OF,
+	asn_DEF_E2_ric_InsertStyle_List_tags_7,
+	sizeof(asn_DEF_E2_ric_InsertStyle_List_tags_7)
+		/sizeof(asn_DEF_E2_ric_InsertStyle_List_tags_7[0]) - 1, /* 1 */
+	asn_DEF_E2_ric_InsertStyle_List_tags_7,	/* Same as above */
+	sizeof(asn_DEF_E2_ric_InsertStyle_List_tags_7)
+		/sizeof(asn_DEF_E2_ric_InsertStyle_List_tags_7[0]), /* 2 */
+	{ 0, &asn_PER_type_E2_ric_InsertStyle_List_constr_7, SEQUENCE_OF_constraint },
+	asn_MBR_E2_ric_InsertStyle_List_7,
+	1,	/* Single element */
+	&asn_SPC_E2_ric_InsertStyle_List_specs_7	/* Additional specs */
+};
+
+static asn_TYPE_member_t asn_MBR_E2_ric_ControlStyle_List_9[] = {
+	{ ATF_POINTER, 0, 0,
+		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		0,
+		&asn_DEF_E2_RIC_ControlStyle_List,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		""
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_ric_ControlStyle_List_tags_9[] = {
+	(ASN_TAG_CLASS_CONTEXT | (4 << 2)),
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static asn_SET_OF_specifics_t asn_SPC_E2_ric_ControlStyle_List_specs_9 = {
+	sizeof(struct E2_E2SM_gNB_NRT_RANfunction_Definition__ric_ControlStyle_List),
+	offsetof(struct E2_E2SM_gNB_NRT_RANfunction_Definition__ric_ControlStyle_List, _asn_ctx),
+	0,	/* XER encoding is XMLDelimitedItemList */
+};
+static /* Use -fall-defs-global to expose */
+asn_TYPE_descriptor_t asn_DEF_E2_ric_ControlStyle_List_9 = {
+	"ric-ControlStyle-List",
+	"ric-ControlStyle-List",
+	&asn_OP_SEQUENCE_OF,
+	asn_DEF_E2_ric_ControlStyle_List_tags_9,
+	sizeof(asn_DEF_E2_ric_ControlStyle_List_tags_9)
+		/sizeof(asn_DEF_E2_ric_ControlStyle_List_tags_9[0]) - 1, /* 1 */
+	asn_DEF_E2_ric_ControlStyle_List_tags_9,	/* Same as above */
+	sizeof(asn_DEF_E2_ric_ControlStyle_List_tags_9)
+		/sizeof(asn_DEF_E2_ric_ControlStyle_List_tags_9[0]), /* 2 */
+	{ 0, &asn_PER_type_E2_ric_ControlStyle_List_constr_9, SEQUENCE_OF_constraint },
+	asn_MBR_E2_ric_ControlStyle_List_9,
+	1,	/* Single element */
+	&asn_SPC_E2_ric_ControlStyle_List_specs_9	/* Additional specs */
+};
+
+static asn_TYPE_member_t asn_MBR_E2_ric_PolicyStyle_List_11[] = {
+	{ ATF_POINTER, 0, 0,
+		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		0,
+		&asn_DEF_E2_RIC_PolicyStyle_List,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		""
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_ric_PolicyStyle_List_tags_11[] = {
+	(ASN_TAG_CLASS_CONTEXT | (5 << 2)),
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static asn_SET_OF_specifics_t asn_SPC_E2_ric_PolicyStyle_List_specs_11 = {
+	sizeof(struct E2_E2SM_gNB_NRT_RANfunction_Definition__ric_PolicyStyle_List),
+	offsetof(struct E2_E2SM_gNB_NRT_RANfunction_Definition__ric_PolicyStyle_List, _asn_ctx),
+	0,	/* XER encoding is XMLDelimitedItemList */
+};
+static /* Use -fall-defs-global to expose */
+asn_TYPE_descriptor_t asn_DEF_E2_ric_PolicyStyle_List_11 = {
+	"ric-PolicyStyle-List",
+	"ric-PolicyStyle-List",
+	&asn_OP_SEQUENCE_OF,
+	asn_DEF_E2_ric_PolicyStyle_List_tags_11,
+	sizeof(asn_DEF_E2_ric_PolicyStyle_List_tags_11)
+		/sizeof(asn_DEF_E2_ric_PolicyStyle_List_tags_11[0]) - 1, /* 1 */
+	asn_DEF_E2_ric_PolicyStyle_List_tags_11,	/* Same as above */
+	sizeof(asn_DEF_E2_ric_PolicyStyle_List_tags_11)
+		/sizeof(asn_DEF_E2_ric_PolicyStyle_List_tags_11[0]), /* 2 */
+	{ 0, &asn_PER_type_E2_ric_PolicyStyle_List_constr_11, SEQUENCE_OF_constraint },
+	asn_MBR_E2_ric_PolicyStyle_List_11,
+	1,	/* Single element */
+	&asn_SPC_E2_ric_PolicyStyle_List_specs_11	/* Additional specs */
+};
+
+static asn_TYPE_member_t asn_MBR_E2_E2SM_gNB_NRT_RANfunction_Definition_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_E2SM_gNB_NRT_RANfunction_Definition, ranFunction_Name),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RANfunction_Name,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ranFunction-Name"
+		},
+	{ ATF_POINTER, 5, offsetof(struct E2_E2SM_gNB_NRT_RANfunction_Definition, ric_EventTriggerStyle_List),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		0,
+		&asn_DEF_E2_ric_EventTriggerStyle_List_3,
+		0,
+		{ 0, &asn_PER_memb_E2_ric_EventTriggerStyle_List_constr_3,  memb_E2_ric_EventTriggerStyle_List_constraint_1 },
+		0, 0, /* No default value */
+		"ric-EventTriggerStyle-List"
+		},
+	{ ATF_POINTER, 4, offsetof(struct E2_E2SM_gNB_NRT_RANfunction_Definition, ric_ReportStyle_List),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		0,
+		&asn_DEF_E2_ric_ReportStyle_List_5,
+		0,
+		{ 0, &asn_PER_memb_E2_ric_ReportStyle_List_constr_5,  memb_E2_ric_ReportStyle_List_constraint_1 },
+		0, 0, /* No default value */
+		"ric-ReportStyle-List"
+		},
+	{ ATF_POINTER, 3, offsetof(struct E2_E2SM_gNB_NRT_RANfunction_Definition, ric_InsertStyle_List),
+		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
+		0,
+		&asn_DEF_E2_ric_InsertStyle_List_7,
+		0,
+		{ 0, &asn_PER_memb_E2_ric_InsertStyle_List_constr_7,  memb_E2_ric_InsertStyle_List_constraint_1 },
+		0, 0, /* No default value */
+		"ric-InsertStyle-List"
+		},
+	{ ATF_POINTER, 2, offsetof(struct E2_E2SM_gNB_NRT_RANfunction_Definition, ric_ControlStyle_List),
+		(ASN_TAG_CLASS_CONTEXT | (4 << 2)),
+		0,
+		&asn_DEF_E2_ric_ControlStyle_List_9,
+		0,
+		{ 0, &asn_PER_memb_E2_ric_ControlStyle_List_constr_9,  memb_E2_ric_ControlStyle_List_constraint_1 },
+		0, 0, /* No default value */
+		"ric-ControlStyle-List"
+		},
+	{ ATF_POINTER, 1, offsetof(struct E2_E2SM_gNB_NRT_RANfunction_Definition, ric_PolicyStyle_List),
+		(ASN_TAG_CLASS_CONTEXT | (5 << 2)),
+		0,
+		&asn_DEF_E2_ric_PolicyStyle_List_11,
+		0,
+		{ 0, &asn_PER_memb_E2_ric_PolicyStyle_List_constr_11,  memb_E2_ric_PolicyStyle_List_constraint_1 },
+		0, 0, /* No default value */
+		"ric-PolicyStyle-List"
+		},
+};
+static const int asn_MAP_E2_E2SM_gNB_NRT_RANfunction_Definition_oms_1[] = { 1, 2, 3, 4, 5 };
+static const ber_tlv_tag_t asn_DEF_E2_E2SM_gNB_NRT_RANfunction_Definition_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_E2SM_gNB_NRT_RANfunction_Definition_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* ranFunction-Name */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* ric-EventTriggerStyle-List */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* ric-ReportStyle-List */
+    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 }, /* ric-InsertStyle-List */
+    { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 4, 0, 0 }, /* ric-ControlStyle-List */
+    { (ASN_TAG_CLASS_CONTEXT | (5 << 2)), 5, 0, 0 } /* ric-PolicyStyle-List */
+};
+static asn_SEQUENCE_specifics_t asn_SPC_E2_E2SM_gNB_NRT_RANfunction_Definition_specs_1 = {
+	sizeof(struct E2_E2SM_gNB_NRT_RANfunction_Definition),
+	offsetof(struct E2_E2SM_gNB_NRT_RANfunction_Definition, _asn_ctx),
+	asn_MAP_E2_E2SM_gNB_NRT_RANfunction_Definition_tag2el_1,
+	6,	/* Count of tags in the map */
+	asn_MAP_E2_E2SM_gNB_NRT_RANfunction_Definition_oms_1,	/* Optional members */
+	5, 0,	/* Root/Additions */
+	6,	/* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_E2SM_gNB_NRT_RANfunction_Definition = {
+	"E2SM-gNB-NRT-RANfunction-Definition",
+	"E2SM-gNB-NRT-RANfunction-Definition",
+	&asn_OP_SEQUENCE,
+	asn_DEF_E2_E2SM_gNB_NRT_RANfunction_Definition_tags_1,
+	sizeof(asn_DEF_E2_E2SM_gNB_NRT_RANfunction_Definition_tags_1)
+		/sizeof(asn_DEF_E2_E2SM_gNB_NRT_RANfunction_Definition_tags_1[0]), /* 1 */
+	asn_DEF_E2_E2SM_gNB_NRT_RANfunction_Definition_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_E2SM_gNB_NRT_RANfunction_Definition_tags_1)
+		/sizeof(asn_DEF_E2_E2SM_gNB_NRT_RANfunction_Definition_tags_1[0]), /* 1 */
+	{ 0, 0, SEQUENCE_constraint },
+	asn_MBR_E2_E2SM_gNB_NRT_RANfunction_Definition_1,
+	6,	/* Elements count */
+	&asn_SPC_E2_E2SM_gNB_NRT_RANfunction_Definition_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-RANfunction-Definition.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-RANfunction-Definition.h
new file mode 100644
index 0000000..69eece7
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_E2SM-gNB-NRT-RANfunction-Definition.h
@@ -0,0 +1,81 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_E2SM_gNB_NRT_RANfunction_Definition_H_
+#define	_E2_E2SM_gNB_NRT_RANfunction_Definition_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_RANfunction-Name.h"
+#include "asn_SEQUENCE_OF.h"
+#include "constr_SEQUENCE_OF.h"
+#include "constr_SEQUENCE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct E2_RIC_EventTriggerStyle_List;
+struct E2_RIC_ReportStyle_List;
+struct E2_RIC_InsertStyle_List;
+struct E2_RIC_ControlStyle_List;
+struct E2_RIC_PolicyStyle_List;
+
+/* E2_E2SM-gNB-NRT-RANfunction-Definition */
+typedef struct E2_E2SM_gNB_NRT_RANfunction_Definition {
+	E2_RANfunction_Name_t	 ranFunction_Name;
+	struct E2_E2SM_gNB_NRT_RANfunction_Definition__ric_EventTriggerStyle_List {
+		A_SEQUENCE_OF(struct E2_RIC_EventTriggerStyle_List) list;
+		
+		/* Context for parsing across buffer boundaries */
+		asn_struct_ctx_t _asn_ctx;
+	} *ric_EventTriggerStyle_List;
+	struct E2_E2SM_gNB_NRT_RANfunction_Definition__ric_ReportStyle_List {
+		A_SEQUENCE_OF(struct E2_RIC_ReportStyle_List) list;
+		
+		/* Context for parsing across buffer boundaries */
+		asn_struct_ctx_t _asn_ctx;
+	} *ric_ReportStyle_List;
+	struct E2_E2SM_gNB_NRT_RANfunction_Definition__ric_InsertStyle_List {
+		A_SEQUENCE_OF(struct E2_RIC_InsertStyle_List) list;
+		
+		/* Context for parsing across buffer boundaries */
+		asn_struct_ctx_t _asn_ctx;
+	} *ric_InsertStyle_List;
+	struct E2_E2SM_gNB_NRT_RANfunction_Definition__ric_ControlStyle_List {
+		A_SEQUENCE_OF(struct E2_RIC_ControlStyle_List) list;
+		
+		/* Context for parsing across buffer boundaries */
+		asn_struct_ctx_t _asn_ctx;
+	} *ric_ControlStyle_List;
+	struct E2_E2SM_gNB_NRT_RANfunction_Definition__ric_PolicyStyle_List {
+		A_SEQUENCE_OF(struct E2_RIC_PolicyStyle_List) list;
+		
+		/* Context for parsing across buffer boundaries */
+		asn_struct_ctx_t _asn_ctx;
+	} *ric_PolicyStyle_List;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_E2SM_gNB_NRT_RANfunction_Definition_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_E2SM_gNB_NRT_RANfunction_Definition;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_E2SM_gNB_NRT_RANfunction_Definition_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_ECGI.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_ECGI.c
new file mode 100644
index 0000000..88ea36d
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_ECGI.c
@@ -0,0 +1,60 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_ECGI.h"
+
+asn_TYPE_member_t asn_MBR_E2_ECGI_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_ECGI, pLMN_Identity),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_PLMN_Identity,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"pLMN-Identity"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_ECGI, eUTRANcellIdentifier),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_EUTRANCellIdentifier,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"eUTRANcellIdentifier"
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_ECGI_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_ECGI_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* pLMN-Identity */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* eUTRANcellIdentifier */
+};
+asn_SEQUENCE_specifics_t asn_SPC_E2_ECGI_specs_1 = {
+	sizeof(struct E2_ECGI),
+	offsetof(struct E2_ECGI, _asn_ctx),
+	asn_MAP_E2_ECGI_tag2el_1,
+	2,	/* Count of tags in the map */
+	0, 0, 0,	/* Optional elements (not needed) */
+	2,	/* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_ECGI = {
+	"ECGI",
+	"ECGI",
+	&asn_OP_SEQUENCE,
+	asn_DEF_E2_ECGI_tags_1,
+	sizeof(asn_DEF_E2_ECGI_tags_1)
+		/sizeof(asn_DEF_E2_ECGI_tags_1[0]), /* 1 */
+	asn_DEF_E2_ECGI_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_ECGI_tags_1)
+		/sizeof(asn_DEF_E2_ECGI_tags_1[0]), /* 1 */
+	{ 0, 0, SEQUENCE_constraint },
+	asn_MBR_E2_ECGI_1,
+	2,	/* Elements count */
+	&asn_SPC_E2_ECGI_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_ECGI.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_ECGI.h
new file mode 100644
index 0000000..868ea7e
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_ECGI.h
@@ -0,0 +1,46 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_ECGI_H_
+#define	_E2_ECGI_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_PLMN-Identity.h"
+#include "E2_EUTRANCellIdentifier.h"
+#include "constr_SEQUENCE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_ECGI */
+typedef struct E2_ECGI {
+	E2_PLMN_Identity_t	 pLMN_Identity;
+	E2_EUTRANCellIdentifier_t	 eUTRANcellIdentifier;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_ECGI_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_ECGI;
+extern asn_SEQUENCE_specifics_t asn_SPC_E2_ECGI_specs_1;
+extern asn_TYPE_member_t asn_MBR_E2_ECGI_1[2];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_ECGI_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_EUTRANCellIdentifier.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_EUTRANCellIdentifier.c
new file mode 100644
index 0000000..b31711d
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_EUTRANCellIdentifier.c
@@ -0,0 +1,67 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_EUTRANCellIdentifier.h"
+
+int
+E2_EUTRANCellIdentifier_constraint(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	const BIT_STRING_t *st = (const BIT_STRING_t *)sptr;
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	if(st->size > 0) {
+		/* Size in bits */
+		size = 8 * st->size - (st->bits_unused & 0x07);
+	} else {
+		size = 0;
+	}
+	
+	if((size == 28)) {
+		/* Constraint check succeeded */
+		return 0;
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+/*
+ * This type is implemented using BIT_STRING,
+ * so here we adjust the DEF accordingly.
+ */
+asn_per_constraints_t asn_PER_type_E2_EUTRANCellIdentifier_constr_1 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 0,  0,  28,  28 }	/* (SIZE(28..28)) */,
+	0, 0	/* No PER value map */
+};
+static const ber_tlv_tag_t asn_DEF_E2_EUTRANCellIdentifier_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (3 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_E2_EUTRANCellIdentifier = {
+	"EUTRANCellIdentifier",
+	"EUTRANCellIdentifier",
+	&asn_OP_BIT_STRING,
+	asn_DEF_E2_EUTRANCellIdentifier_tags_1,
+	sizeof(asn_DEF_E2_EUTRANCellIdentifier_tags_1)
+		/sizeof(asn_DEF_E2_EUTRANCellIdentifier_tags_1[0]), /* 1 */
+	asn_DEF_E2_EUTRANCellIdentifier_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_EUTRANCellIdentifier_tags_1)
+		/sizeof(asn_DEF_E2_EUTRANCellIdentifier_tags_1[0]), /* 1 */
+	{ 0, &asn_PER_type_E2_EUTRANCellIdentifier_constr_1, E2_EUTRANCellIdentifier_constraint },
+	0, 0,	/* No members */
+	&asn_SPC_BIT_STRING_specs	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_EUTRANCellIdentifier.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_EUTRANCellIdentifier.h
new file mode 100644
index 0000000..98a29d3
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_EUTRANCellIdentifier.h
@@ -0,0 +1,44 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_EUTRANCellIdentifier_H_
+#define	_E2_EUTRANCellIdentifier_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "BIT_STRING.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_EUTRANCellIdentifier */
+typedef BIT_STRING_t	 E2_EUTRANCellIdentifier_t;
+
+/* Implementation */
+extern asn_per_constraints_t asn_PER_type_E2_EUTRANCellIdentifier_constr_1;
+extern asn_TYPE_descriptor_t asn_DEF_E2_EUTRANCellIdentifier;
+asn_struct_free_f E2_EUTRANCellIdentifier_free;
+asn_struct_print_f E2_EUTRANCellIdentifier_print;
+asn_constr_check_f E2_EUTRANCellIdentifier_constraint;
+ber_type_decoder_f E2_EUTRANCellIdentifier_decode_ber;
+der_type_encoder_f E2_EUTRANCellIdentifier_encode_der;
+xer_type_decoder_f E2_EUTRANCellIdentifier_decode_xer;
+xer_type_encoder_f E2_EUTRANCellIdentifier_encode_xer;
+per_type_decoder_f E2_EUTRANCellIdentifier_decode_uper;
+per_type_encoder_f E2_EUTRANCellIdentifier_encode_uper;
+per_type_decoder_f E2_EUTRANCellIdentifier_decode_aper;
+per_type_encoder_f E2_EUTRANCellIdentifier_encode_aper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_EUTRANCellIdentifier_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRCGI.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRCGI.c
new file mode 100644
index 0000000..531b52d
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRCGI.c
@@ -0,0 +1,60 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_NRCGI.h"
+
+asn_TYPE_member_t asn_MBR_E2_NRCGI_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_NRCGI, pLMN_Identity),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_PLMN_Identity,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"pLMN-Identity"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_NRCGI, nRcellIdentifier),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_NRCellIdentifier,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"nRcellIdentifier"
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_NRCGI_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_NRCGI_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* pLMN-Identity */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* nRcellIdentifier */
+};
+asn_SEQUENCE_specifics_t asn_SPC_E2_NRCGI_specs_1 = {
+	sizeof(struct E2_NRCGI),
+	offsetof(struct E2_NRCGI, _asn_ctx),
+	asn_MAP_E2_NRCGI_tag2el_1,
+	2,	/* Count of tags in the map */
+	0, 0, 0,	/* Optional elements (not needed) */
+	2,	/* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_NRCGI = {
+	"NRCGI",
+	"NRCGI",
+	&asn_OP_SEQUENCE,
+	asn_DEF_E2_NRCGI_tags_1,
+	sizeof(asn_DEF_E2_NRCGI_tags_1)
+		/sizeof(asn_DEF_E2_NRCGI_tags_1[0]), /* 1 */
+	asn_DEF_E2_NRCGI_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_NRCGI_tags_1)
+		/sizeof(asn_DEF_E2_NRCGI_tags_1[0]), /* 1 */
+	{ 0, 0, SEQUENCE_constraint },
+	asn_MBR_E2_NRCGI_1,
+	2,	/* Elements count */
+	&asn_SPC_E2_NRCGI_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRCGI.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRCGI.h
new file mode 100644
index 0000000..72a1108
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRCGI.h
@@ -0,0 +1,46 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_NRCGI_H_
+#define	_E2_NRCGI_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_PLMN-Identity.h"
+#include "E2_NRCellIdentifier.h"
+#include "constr_SEQUENCE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_NRCGI */
+typedef struct E2_NRCGI {
+	E2_PLMN_Identity_t	 pLMN_Identity;
+	E2_NRCellIdentifier_t	 nRcellIdentifier;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_NRCGI_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_NRCGI;
+extern asn_SEQUENCE_specifics_t asn_SPC_E2_NRCGI_specs_1;
+extern asn_TYPE_member_t asn_MBR_E2_NRCGI_1[2];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_NRCGI_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRCellIdentifier.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRCellIdentifier.c
new file mode 100644
index 0000000..b8177b7
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRCellIdentifier.c
@@ -0,0 +1,67 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_NRCellIdentifier.h"
+
+int
+E2_NRCellIdentifier_constraint(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	const BIT_STRING_t *st = (const BIT_STRING_t *)sptr;
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	if(st->size > 0) {
+		/* Size in bits */
+		size = 8 * st->size - (st->bits_unused & 0x07);
+	} else {
+		size = 0;
+	}
+	
+	if((size == 36)) {
+		/* Constraint check succeeded */
+		return 0;
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+/*
+ * This type is implemented using BIT_STRING,
+ * so here we adjust the DEF accordingly.
+ */
+asn_per_constraints_t asn_PER_type_E2_NRCellIdentifier_constr_1 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 0,  0,  36,  36 }	/* (SIZE(36..36)) */,
+	0, 0	/* No PER value map */
+};
+static const ber_tlv_tag_t asn_DEF_E2_NRCellIdentifier_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (3 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_E2_NRCellIdentifier = {
+	"NRCellIdentifier",
+	"NRCellIdentifier",
+	&asn_OP_BIT_STRING,
+	asn_DEF_E2_NRCellIdentifier_tags_1,
+	sizeof(asn_DEF_E2_NRCellIdentifier_tags_1)
+		/sizeof(asn_DEF_E2_NRCellIdentifier_tags_1[0]), /* 1 */
+	asn_DEF_E2_NRCellIdentifier_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_NRCellIdentifier_tags_1)
+		/sizeof(asn_DEF_E2_NRCellIdentifier_tags_1[0]), /* 1 */
+	{ 0, &asn_PER_type_E2_NRCellIdentifier_constr_1, E2_NRCellIdentifier_constraint },
+	0, 0,	/* No members */
+	&asn_SPC_BIT_STRING_specs	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRCellIdentifier.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRCellIdentifier.h
new file mode 100644
index 0000000..af39f4b
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRCellIdentifier.h
@@ -0,0 +1,44 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_NRCellIdentifier_H_
+#define	_E2_NRCellIdentifier_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "BIT_STRING.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_NRCellIdentifier */
+typedef BIT_STRING_t	 E2_NRCellIdentifier_t;
+
+/* Implementation */
+extern asn_per_constraints_t asn_PER_type_E2_NRCellIdentifier_constr_1;
+extern asn_TYPE_descriptor_t asn_DEF_E2_NRCellIdentifier;
+asn_struct_free_f E2_NRCellIdentifier_free;
+asn_struct_print_f E2_NRCellIdentifier_print;
+asn_constr_check_f E2_NRCellIdentifier_constraint;
+ber_type_decoder_f E2_NRCellIdentifier_decode_ber;
+der_type_encoder_f E2_NRCellIdentifier_encode_der;
+xer_type_decoder_f E2_NRCellIdentifier_decode_xer;
+xer_type_encoder_f E2_NRCellIdentifier_encode_xer;
+per_type_decoder_f E2_NRCellIdentifier_decode_uper;
+per_type_encoder_f E2_NRCellIdentifier_encode_uper;
+per_type_decoder_f E2_NRCellIdentifier_decode_aper;
+per_type_encoder_f E2_NRCellIdentifier_encode_aper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_NRCellIdentifier_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-Cell-ID.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-Cell-ID.c
new file mode 100644
index 0000000..7deeacf
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-Cell-ID.c
@@ -0,0 +1,62 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_NRT-Cell-ID.h"
+
+asn_per_constraints_t asn_PER_type_E2_NRT_Cell_ID_constr_1 CC_NOTUSED = {
+	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0,  1 }	/* (0..1,...) */,
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	0, 0	/* No PER value map */
+};
+asn_TYPE_member_t asn_MBR_E2_NRT_Cell_ID_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_NRT_Cell_ID, choice.ecgi),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_ECGI,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ecgi"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_NRT_Cell_ID, choice.nrcgi),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_NRCGI,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"nrcgi"
+		},
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_NRT_Cell_ID_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* ecgi */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* nrcgi */
+};
+asn_CHOICE_specifics_t asn_SPC_E2_NRT_Cell_ID_specs_1 = {
+	sizeof(struct E2_NRT_Cell_ID),
+	offsetof(struct E2_NRT_Cell_ID, _asn_ctx),
+	offsetof(struct E2_NRT_Cell_ID, present),
+	sizeof(((struct E2_NRT_Cell_ID *)0)->present),
+	asn_MAP_E2_NRT_Cell_ID_tag2el_1,
+	2,	/* Count of tags in the map */
+	0, 0,
+	2	/* Extensions start */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_NRT_Cell_ID = {
+	"NRT-Cell-ID",
+	"NRT-Cell-ID",
+	&asn_OP_CHOICE,
+	0,	/* No effective tags (pointer) */
+	0,	/* No effective tags (count) */
+	0,	/* No tags (pointer) */
+	0,	/* No tags (count) */
+	{ 0, &asn_PER_type_E2_NRT_Cell_ID_constr_1, CHOICE_constraint },
+	asn_MBR_E2_NRT_Cell_ID_1,
+	2,	/* Elements count */
+	&asn_SPC_E2_NRT_Cell_ID_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-Cell-ID.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-Cell-ID.h
new file mode 100644
index 0000000..1d98d9e
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-Cell-ID.h
@@ -0,0 +1,59 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_NRT_Cell_ID_H_
+#define	_E2_NRT_Cell_ID_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_ECGI.h"
+#include "E2_NRCGI.h"
+#include "constr_CHOICE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dependencies */
+typedef enum E2_NRT_Cell_ID_PR {
+	E2_NRT_Cell_ID_PR_NOTHING,	/* No components present */
+	E2_NRT_Cell_ID_PR_ecgi,
+	E2_NRT_Cell_ID_PR_nrcgi
+	/* Extensions may appear below */
+	
+} E2_NRT_Cell_ID_PR;
+
+/* E2_NRT-Cell-ID */
+typedef struct E2_NRT_Cell_ID {
+	E2_NRT_Cell_ID_PR present;
+	union E2_NRT_Cell_ID_u {
+		E2_ECGI_t	 ecgi;
+		E2_NRCGI_t	 nrcgi;
+		/*
+		 * This type is extensible,
+		 * possible extensions are below.
+		 */
+	} choice;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_NRT_Cell_ID_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_NRT_Cell_ID;
+extern asn_CHOICE_specifics_t asn_SPC_E2_NRT_Cell_ID_specs_1;
+extern asn_TYPE_member_t asn_MBR_E2_NRT_Cell_ID_1[2];
+extern asn_per_constraints_t asn_PER_type_E2_NRT_Cell_ID_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_NRT_Cell_ID_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-ControlCommand.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-ControlCommand.c
new file mode 100644
index 0000000..5c6c87b
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-ControlCommand.c
@@ -0,0 +1,55 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_NRT-ControlCommand.h"
+
+/*
+ * This type is implemented using NativeEnumerated,
+ * so here we adjust the DEF accordingly.
+ */
+asn_per_constraints_t asn_PER_type_E2_NRT_ControlCommand_constr_1 CC_NOTUSED = {
+	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0,  1 }	/* (0..1,...) */,
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	0, 0	/* No PER value map */
+};
+static const asn_INTEGER_enum_map_t asn_MAP_E2_NRT_ControlCommand_value2enum_1[] = {
+	{ 0,	8,	"addition" },
+	{ 1,	8,	"deletion" }
+	/* This list is extensible */
+};
+static const unsigned int asn_MAP_E2_NRT_ControlCommand_enum2value_1[] = {
+	0,	/* addition(0) */
+	1	/* deletion(1) */
+	/* This list is extensible */
+};
+const asn_INTEGER_specifics_t asn_SPC_E2_NRT_ControlCommand_specs_1 = {
+	asn_MAP_E2_NRT_ControlCommand_value2enum_1,	/* "tag" => N; sorted by tag */
+	asn_MAP_E2_NRT_ControlCommand_enum2value_1,	/* N => "tag"; sorted by N */
+	2,	/* Number of elements in the maps */
+	3,	/* Extensions before this member */
+	1,	/* Strict enumeration */
+	0,	/* Native long size */
+	0
+};
+static const ber_tlv_tag_t asn_DEF_E2_NRT_ControlCommand_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (10 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_E2_NRT_ControlCommand = {
+	"NRT-ControlCommand",
+	"NRT-ControlCommand",
+	&asn_OP_NativeEnumerated,
+	asn_DEF_E2_NRT_ControlCommand_tags_1,
+	sizeof(asn_DEF_E2_NRT_ControlCommand_tags_1)
+		/sizeof(asn_DEF_E2_NRT_ControlCommand_tags_1[0]), /* 1 */
+	asn_DEF_E2_NRT_ControlCommand_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_NRT_ControlCommand_tags_1)
+		/sizeof(asn_DEF_E2_NRT_ControlCommand_tags_1[0]), /* 1 */
+	{ 0, &asn_PER_type_E2_NRT_ControlCommand_constr_1, NativeEnumerated_constraint },
+	0, 0,	/* Defined elsewhere */
+	&asn_SPC_E2_NRT_ControlCommand_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-ControlCommand.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-ControlCommand.h
new file mode 100644
index 0000000..e9319ed
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-ControlCommand.h
@@ -0,0 +1,54 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_NRT_ControlCommand_H_
+#define	_E2_NRT_ControlCommand_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "NativeEnumerated.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dependencies */
+typedef enum E2_NRT_ControlCommand {
+	E2_NRT_ControlCommand_addition	= 0,
+	E2_NRT_ControlCommand_deletion	= 1
+	/*
+	 * Enumeration is extensible
+	 */
+} e_E2_NRT_ControlCommand;
+
+/* E2_NRT-ControlCommand */
+typedef long	 E2_NRT_ControlCommand_t;
+
+/* Implementation */
+extern asn_per_constraints_t asn_PER_type_E2_NRT_ControlCommand_constr_1;
+extern asn_TYPE_descriptor_t asn_DEF_E2_NRT_ControlCommand;
+extern const asn_INTEGER_specifics_t asn_SPC_NRT_ControlCommand_specs_1;
+asn_struct_free_f NRT_ControlCommand_free;
+asn_struct_print_f NRT_ControlCommand_print;
+asn_constr_check_f NRT_ControlCommand_constraint;
+ber_type_decoder_f NRT_ControlCommand_decode_ber;
+der_type_encoder_f NRT_ControlCommand_encode_der;
+xer_type_decoder_f NRT_ControlCommand_decode_xer;
+xer_type_encoder_f NRT_ControlCommand_encode_xer;
+per_type_decoder_f NRT_ControlCommand_decode_uper;
+per_type_encoder_f NRT_ControlCommand_encode_uper;
+per_type_decoder_f NRT_ControlCommand_decode_aper;
+per_type_encoder_f NRT_ControlCommand_encode_aper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_NRT_ControlCommand_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-Record-List-item.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-Record-List-item.c
new file mode 100644
index 0000000..bd0d5bb
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-Record-List-item.c
@@ -0,0 +1,134 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_NRT-Record-List-item.h"
+
+#include "E2_NRT-Record-row-item.h"
+static int
+memb_E2_nrt_Record_row_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	/* Determine the number of elements */
+	size = _A_CSEQUENCE_FROM_VOID(sptr)->count;
+	
+	if((size >= 1 && size <= 1024)) {
+		/* Perform validation of the inner elements */
+		return td->encoding_constraints.general_constraints(td, sptr, ctfailcb, app_key);
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static asn_per_constraints_t asn_PER_type_E2_nrt_Record_row_constr_3 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 10,  10,  1,  1024 }	/* (SIZE(1..1024)) */,
+	0, 0	/* No PER value map */
+};
+static asn_per_constraints_t asn_PER_memb_E2_nrt_Record_row_constr_3 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 10,  10,  1,  1024 }	/* (SIZE(1..1024)) */,
+	0, 0	/* No PER value map */
+};
+static asn_TYPE_member_t asn_MBR_E2_nrt_Record_row_3[] = {
+	{ ATF_POINTER, 0, 0,
+		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		0,
+		&asn_DEF_E2_NRT_Record_row_item,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		""
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_nrt_Record_row_tags_3[] = {
+	(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static asn_SET_OF_specifics_t asn_SPC_E2_nrt_Record_row_specs_3 = {
+	sizeof(struct E2_NRT_Record_List_item__nrt_Record_row),
+	offsetof(struct E2_NRT_Record_List_item__nrt_Record_row, _asn_ctx),
+	0,	/* XER encoding is XMLDelimitedItemList */
+};
+static /* Use -fall-defs-global to expose */
+asn_TYPE_descriptor_t asn_DEF_E2_nrt_Record_row_3 = {
+	"nrt-Record-row",
+	"nrt-Record-row",
+	&asn_OP_SEQUENCE_OF,
+	asn_DEF_E2_nrt_Record_row_tags_3,
+	sizeof(asn_DEF_E2_nrt_Record_row_tags_3)
+		/sizeof(asn_DEF_E2_nrt_Record_row_tags_3[0]) - 1, /* 1 */
+	asn_DEF_E2_nrt_Record_row_tags_3,	/* Same as above */
+	sizeof(asn_DEF_E2_nrt_Record_row_tags_3)
+		/sizeof(asn_DEF_E2_nrt_Record_row_tags_3[0]), /* 2 */
+	{ 0, &asn_PER_type_E2_nrt_Record_row_constr_3, SEQUENCE_OF_constraint },
+	asn_MBR_E2_nrt_Record_row_3,
+	1,	/* Single element */
+	&asn_SPC_E2_nrt_Record_row_specs_3	/* Additional specs */
+};
+
+asn_TYPE_member_t asn_MBR_E2_NRT_Record_List_item_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_NRT_Record_List_item, servedCellID),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		+1,	/* EXPLICIT tag at current level */
+		&asn_DEF_E2_NRT_Cell_ID,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"servedCellID"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_NRT_Record_List_item, nrt_Record_row),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		0,
+		&asn_DEF_E2_nrt_Record_row_3,
+		0,
+		{ 0, &asn_PER_memb_E2_nrt_Record_row_constr_3,  memb_E2_nrt_Record_row_constraint_1 },
+		0, 0, /* No default value */
+		"nrt-Record-row"
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_NRT_Record_List_item_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_NRT_Record_List_item_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* servedCellID */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* nrt-Record-row */
+};
+asn_SEQUENCE_specifics_t asn_SPC_E2_NRT_Record_List_item_specs_1 = {
+	sizeof(struct E2_NRT_Record_List_item),
+	offsetof(struct E2_NRT_Record_List_item, _asn_ctx),
+	asn_MAP_E2_NRT_Record_List_item_tag2el_1,
+	2,	/* Count of tags in the map */
+	0, 0, 0,	/* Optional elements (not needed) */
+	-1,	/* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_NRT_Record_List_item = {
+	"NRT-Record-List-item",
+	"NRT-Record-List-item",
+	&asn_OP_SEQUENCE,
+	asn_DEF_E2_NRT_Record_List_item_tags_1,
+	sizeof(asn_DEF_E2_NRT_Record_List_item_tags_1)
+		/sizeof(asn_DEF_E2_NRT_Record_List_item_tags_1[0]), /* 1 */
+	asn_DEF_E2_NRT_Record_List_item_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_NRT_Record_List_item_tags_1)
+		/sizeof(asn_DEF_E2_NRT_Record_List_item_tags_1[0]), /* 1 */
+	{ 0, 0, SEQUENCE_constraint },
+	asn_MBR_E2_NRT_Record_List_item_1,
+	2,	/* Elements count */
+	&asn_SPC_E2_NRT_Record_List_item_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-Record-List-item.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-Record-List-item.h
new file mode 100644
index 0000000..091ef70
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-Record-List-item.h
@@ -0,0 +1,51 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_NRT_Record_List_item_H_
+#define	_E2_NRT_Record_List_item_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_NRT-Cell-ID.h"
+#include "asn_SEQUENCE_OF.h"
+#include "constr_SEQUENCE_OF.h"
+#include "constr_SEQUENCE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct E2_NRT_Record_row_item;
+
+/* E2_NRT-Record-List-item */
+typedef struct E2_NRT_Record_List_item {
+	E2_NRT_Cell_ID_t	 servedCellID;
+	struct E2_NRT_Record_List_item__nrt_Record_row {
+		A_SEQUENCE_OF(struct E2_NRT_Record_row_item) list;
+		
+		/* Context for parsing across buffer boundaries */
+		asn_struct_ctx_t _asn_ctx;
+	} nrt_Record_row;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_NRT_Record_List_item_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_NRT_Record_List_item;
+extern asn_SEQUENCE_specifics_t asn_SPC_E2_NRT_Record_List_item_specs_1;
+extern asn_TYPE_member_t asn_MBR_E2_NRT_Record_List_item_1[2];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_NRT_Record_List_item_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-Record-row-item.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-Record-row-item.c
new file mode 100644
index 0000000..7fcfe67
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-Record-row-item.c
@@ -0,0 +1,60 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_NRT-Record-row-item.h"
+
+asn_TYPE_member_t asn_MBR_E2_NRT_Record_row_item_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_NRT_Record_row_item, neighbourCellID),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		+1,	/* EXPLICIT tag at current level */
+		&asn_DEF_E2_NRT_Cell_ID,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"neighbourCellID"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_NRT_Record_row_item, nrt_Record),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_NRT_TableRecord,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"nrt-Record"
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_NRT_Record_row_item_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_NRT_Record_row_item_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* neighbourCellID */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* nrt-Record */
+};
+asn_SEQUENCE_specifics_t asn_SPC_E2_NRT_Record_row_item_specs_1 = {
+	sizeof(struct E2_NRT_Record_row_item),
+	offsetof(struct E2_NRT_Record_row_item, _asn_ctx),
+	asn_MAP_E2_NRT_Record_row_item_tag2el_1,
+	2,	/* Count of tags in the map */
+	0, 0, 0,	/* Optional elements (not needed) */
+	-1,	/* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_NRT_Record_row_item = {
+	"NRT-Record-row-item",
+	"NRT-Record-row-item",
+	&asn_OP_SEQUENCE,
+	asn_DEF_E2_NRT_Record_row_item_tags_1,
+	sizeof(asn_DEF_E2_NRT_Record_row_item_tags_1)
+		/sizeof(asn_DEF_E2_NRT_Record_row_item_tags_1[0]), /* 1 */
+	asn_DEF_E2_NRT_Record_row_item_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_NRT_Record_row_item_tags_1)
+		/sizeof(asn_DEF_E2_NRT_Record_row_item_tags_1[0]), /* 1 */
+	{ 0, 0, SEQUENCE_constraint },
+	asn_MBR_E2_NRT_Record_row_item_1,
+	2,	/* Elements count */
+	&asn_SPC_E2_NRT_Record_row_item_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-Record-row-item.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-Record-row-item.h
new file mode 100644
index 0000000..3032ede
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-Record-row-item.h
@@ -0,0 +1,42 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_NRT_Record_row_item_H_
+#define	_E2_NRT_Record_row_item_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_NRT-Cell-ID.h"
+#include "E2_NRT-TableRecord.h"
+#include "constr_SEQUENCE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_NRT-Record-row-item */
+typedef struct E2_NRT_Record_row_item {
+	E2_NRT_Cell_ID_t	 neighbourCellID;
+	E2_NRT_TableRecord_t	 nrt_Record;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_NRT_Record_row_item_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_NRT_Record_row_item;
+extern asn_SEQUENCE_specifics_t asn_SPC_E2_NRT_Record_row_item_specs_1;
+extern asn_TYPE_member_t asn_MBR_E2_NRT_Record_row_item_1[2];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_NRT_Record_row_item_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-TableRecord.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-TableRecord.c
new file mode 100644
index 0000000..4478172
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-TableRecord.c
@@ -0,0 +1,31 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_NRT-TableRecord.h"
+
+/*
+ * This type is implemented using OCTET_STRING,
+ * so here we adjust the DEF accordingly.
+ */
+static const ber_tlv_tag_t asn_DEF_E2_NRT_TableRecord_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (4 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_E2_NRT_TableRecord = {
+	"NRT-TableRecord",
+	"NRT-TableRecord",
+	&asn_OP_OCTET_STRING,
+	asn_DEF_E2_NRT_TableRecord_tags_1,
+	sizeof(asn_DEF_E2_NRT_TableRecord_tags_1)
+		/sizeof(asn_DEF_E2_NRT_TableRecord_tags_1[0]), /* 1 */
+	asn_DEF_E2_NRT_TableRecord_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_NRT_TableRecord_tags_1)
+		/sizeof(asn_DEF_E2_NRT_TableRecord_tags_1[0]), /* 1 */
+	{ 0, 0, OCTET_STRING_constraint },
+	0, 0,	/* No members */
+	&asn_SPC_OCTET_STRING_specs	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-TableRecord.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-TableRecord.h
new file mode 100644
index 0000000..bf8ff93
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-TableRecord.h
@@ -0,0 +1,43 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_NRT_TableRecord_H_
+#define	_E2_NRT_TableRecord_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "OCTET_STRING.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_NRT-TableRecord */
+typedef OCTET_STRING_t	 E2_NRT_TableRecord_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_NRT_TableRecord;
+asn_struct_free_f E2_NRT_TableRecord_free;
+asn_struct_print_f E2_NRT_TableRecord_print;
+asn_constr_check_f E2_NRT_TableRecord_constraint;
+ber_type_decoder_f E2_NRT_TableRecord_decode_ber;
+der_type_encoder_f E2_NRT_TableRecord_encode_der;
+xer_type_decoder_f E2_NRT_TableRecord_decode_xer;
+xer_type_encoder_f E2_NRT_TableRecord_encode_xer;
+per_type_decoder_f E2_NRT_TableRecord_decode_uper;
+per_type_encoder_f E2_NRT_TableRecord_encode_uper;
+per_type_decoder_f E2_NRT_TableRecord_decode_aper;
+per_type_encoder_f E2_NRT_TableRecord_encode_aper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_NRT_TableRecord_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-TimeStamp.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-TimeStamp.c
new file mode 100644
index 0000000..9a7551a
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-TimeStamp.c
@@ -0,0 +1,62 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_NRT-TimeStamp.h"
+
+int
+E2_NRT_TimeStamp_constraint(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	const OCTET_STRING_t *st = (const OCTET_STRING_t *)sptr;
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	size = st->size;
+	
+	if((size == 8)) {
+		/* Constraint check succeeded */
+		return 0;
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+/*
+ * This type is implemented using OCTET_STRING,
+ * so here we adjust the DEF accordingly.
+ */
+asn_per_constraints_t asn_PER_type_E2_NRT_TimeStamp_constr_1 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 0,  0,  8,  8 }	/* (SIZE(8..8)) */,
+	0, 0	/* No PER value map */
+};
+static const ber_tlv_tag_t asn_DEF_E2_NRT_TimeStamp_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (4 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_E2_NRT_TimeStamp = {
+	"NRT-TimeStamp",
+	"NRT-TimeStamp",
+	&asn_OP_OCTET_STRING,
+	asn_DEF_E2_NRT_TimeStamp_tags_1,
+	sizeof(asn_DEF_E2_NRT_TimeStamp_tags_1)
+		/sizeof(asn_DEF_E2_NRT_TimeStamp_tags_1[0]), /* 1 */
+	asn_DEF_E2_NRT_TimeStamp_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_NRT_TimeStamp_tags_1)
+		/sizeof(asn_DEF_E2_NRT_TimeStamp_tags_1[0]), /* 1 */
+	{ 0, &asn_PER_type_E2_NRT_TimeStamp_constr_1, E2_NRT_TimeStamp_constraint },
+	0, 0,	/* No members */
+	&asn_SPC_OCTET_STRING_specs	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-TimeStamp.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-TimeStamp.h
new file mode 100644
index 0000000..5bf14d9
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-TimeStamp.h
@@ -0,0 +1,44 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_NRT_TimeStamp_H_
+#define	_E2_NRT_TimeStamp_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "OCTET_STRING.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_NRT-TimeStamp */
+typedef OCTET_STRING_t	 E2_NRT_TimeStamp_t;
+
+/* Implementation */
+extern asn_per_constraints_t asn_PER_type_E2_NRT_TimeStamp_constr_1;
+extern asn_TYPE_descriptor_t asn_DEF_E2_NRT_TimeStamp;
+asn_struct_free_f E2_NRT_TimeStamp_free;
+asn_struct_print_f E2_NRT_TimeStamp_print;
+asn_constr_check_f E2_NRT_TimeStamp_constraint;
+ber_type_decoder_f E2_NRT_TimeStamp_decode_ber;
+der_type_encoder_f E2_NRT_TimeStamp_encode_der;
+xer_type_decoder_f E2_NRT_TimeStamp_decode_xer;
+xer_type_encoder_f E2_NRT_TimeStamp_encode_xer;
+per_type_decoder_f E2_NRT_TimeStamp_decode_uper;
+per_type_encoder_f E2_NRT_TimeStamp_encode_uper;
+per_type_decoder_f E2_NRT_TimeStamp_decode_aper;
+per_type_encoder_f E2_NRT_TimeStamp_encode_aper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_NRT_TimeStamp_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-TriggerNature.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-TriggerNature.c
new file mode 100644
index 0000000..14cb4e3
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-TriggerNature.c
@@ -0,0 +1,55 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_NRT-TriggerNature.h"
+
+/*
+ * This type is implemented using NativeEnumerated,
+ * so here we adjust the DEF accordingly.
+ */
+asn_per_constraints_t asn_PER_type_E2_NRT_TriggerNature_constr_1 CC_NOTUSED = {
+	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0,  1 }	/* (0..1,...) */,
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	0, 0	/* No PER value map */
+};
+static const asn_INTEGER_enum_map_t asn_MAP_E2_NRT_TriggerNature_value2enum_1[] = {
+	{ 0,	3,	"now" },
+	{ 1,	8,	"onchange" }
+	/* This list is extensible */
+};
+static const unsigned int asn_MAP_E2_NRT_TriggerNature_enum2value_1[] = {
+	0,	/* now(0) */
+	1	/* onchange(1) */
+	/* This list is extensible */
+};
+const asn_INTEGER_specifics_t asn_SPC_E2_NRT_TriggerNature_specs_1 = {
+	asn_MAP_E2_NRT_TriggerNature_value2enum_1,	/* "tag" => N; sorted by tag */
+	asn_MAP_E2_NRT_TriggerNature_enum2value_1,	/* N => "tag"; sorted by N */
+	2,	/* Number of elements in the maps */
+	3,	/* Extensions before this member */
+	1,	/* Strict enumeration */
+	0,	/* Native long size */
+	0
+};
+static const ber_tlv_tag_t asn_DEF_E2_NRT_TriggerNature_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (10 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_E2_NRT_TriggerNature = {
+	"NRT-TriggerNature",
+	"NRT-TriggerNature",
+	&asn_OP_NativeEnumerated,
+	asn_DEF_E2_NRT_TriggerNature_tags_1,
+	sizeof(asn_DEF_E2_NRT_TriggerNature_tags_1)
+		/sizeof(asn_DEF_E2_NRT_TriggerNature_tags_1[0]), /* 1 */
+	asn_DEF_E2_NRT_TriggerNature_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_NRT_TriggerNature_tags_1)
+		/sizeof(asn_DEF_E2_NRT_TriggerNature_tags_1[0]), /* 1 */
+	{ 0, &asn_PER_type_E2_NRT_TriggerNature_constr_1, NativeEnumerated_constraint },
+	0, 0,	/* Defined elsewhere */
+	&asn_SPC_E2_NRT_TriggerNature_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-TriggerNature.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-TriggerNature.h
new file mode 100644
index 0000000..d895902
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_NRT-TriggerNature.h
@@ -0,0 +1,54 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_NRT_TriggerNature_H_
+#define	_E2_NRT_TriggerNature_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "NativeEnumerated.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dependencies */
+typedef enum E2_NRT_TriggerNature {
+	E2_NRT_TriggerNature_now	= 0,
+	E2_NRT_TriggerNature_onchange	= 1
+	/*
+	 * Enumeration is extensible
+	 */
+} e_E2_NRT_TriggerNature;
+
+/* E2_NRT-TriggerNature */
+typedef long	 E2_NRT_TriggerNature_t;
+
+/* Implementation */
+extern asn_per_constraints_t asn_PER_type_E2_NRT_TriggerNature_constr_1;
+extern asn_TYPE_descriptor_t asn_DEF_E2_NRT_TriggerNature;
+extern const asn_INTEGER_specifics_t asn_SPC_NRT_TriggerNature_specs_1;
+asn_struct_free_f NRT_TriggerNature_free;
+asn_struct_print_f NRT_TriggerNature_print;
+asn_constr_check_f NRT_TriggerNature_constraint;
+ber_type_decoder_f NRT_TriggerNature_decode_ber;
+der_type_encoder_f NRT_TriggerNature_encode_der;
+xer_type_decoder_f NRT_TriggerNature_decode_xer;
+xer_type_encoder_f NRT_TriggerNature_encode_xer;
+per_type_decoder_f NRT_TriggerNature_decode_uper;
+per_type_encoder_f NRT_TriggerNature_encode_uper;
+per_type_decoder_f NRT_TriggerNature_decode_aper;
+per_type_encoder_f NRT_TriggerNature_encode_aper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_NRT_TriggerNature_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_PLMN-Identity.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_PLMN-Identity.c
similarity index 95%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_PLMN-Identity.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/E2_PLMN-Identity.c
index 815aca8..51d8ffd 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_PLMN-Identity.c
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_PLMN-Identity.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
- * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_PLMN-Identity.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_PLMN-Identity.h
similarity index 93%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_PLMN-Identity.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/E2_PLMN-Identity.h
index 58be608..3a18286 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_PLMN-Identity.h
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_PLMN-Identity.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
- * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANfunction-Name.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANfunction-Name.c
new file mode 100644
index 0000000..ddf083c
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANfunction-Name.c
@@ -0,0 +1,307 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_RANfunction-Name.h"
+
+static const int permitted_alphabet_table_2[256] = {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/*                  */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/*                  */
+ 1, 0, 0, 0, 0, 0, 0, 2, 3, 4, 0, 5, 6, 7, 8, 9,	/* .      '() +,-./ */
+10,11,12,13,14,15,16,17,18,19,20, 0, 0,21, 0,22,	/* 0123456789:  = ? */
+ 0,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,	/*  ABCDEFGHIJKLMNO */
+38,39,40,41,42,43,44,45,46,47,48, 0, 0, 0, 0, 0,	/* PQRSTUVWXYZ      */
+ 0,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,	/*  abcdefghijklmno */
+64,65,66,67,68,69,70,71,72,73,74, 0, 0, 0, 0, 0,	/* pqrstuvwxyz      */
+};
+static const int permitted_alphabet_code2value_2[74] = {
+32,39,40,41,43,44,45,46,47,48,49,50,51,52,53,54,
+55,56,57,58,61,63,65,66,67,68,69,70,71,72,73,74,
+75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,
+97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,
+113,114,115,116,117,118,119,120,121,122,};
+
+
+static int check_permitted_alphabet_2(const void *sptr) {
+	const int *table = permitted_alphabet_table_2;
+	/* The underlying type is PrintableString */
+	const PrintableString_t *st = (const PrintableString_t *)sptr;
+	const uint8_t *ch = st->buf;
+	const uint8_t *end = ch + st->size;
+	
+	for(; ch < end; ch++) {
+		uint8_t cv = *ch;
+		if(!table[cv]) return -1;
+	}
+	return 0;
+}
+
+static const int permitted_alphabet_table_3[256] = {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/*                  */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/*                  */
+ 1, 0, 0, 0, 0, 0, 0, 2, 3, 4, 0, 5, 6, 7, 8, 9,	/* .      '() +,-./ */
+10,11,12,13,14,15,16,17,18,19,20, 0, 0,21, 0,22,	/* 0123456789:  = ? */
+ 0,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,	/*  ABCDEFGHIJKLMNO */
+38,39,40,41,42,43,44,45,46,47,48, 0, 0, 0, 0, 0,	/* PQRSTUVWXYZ      */
+ 0,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,	/*  abcdefghijklmno */
+64,65,66,67,68,69,70,71,72,73,74, 0, 0, 0, 0, 0,	/* pqrstuvwxyz      */
+};
+static const int permitted_alphabet_code2value_3[74] = {
+32,39,40,41,43,44,45,46,47,48,49,50,51,52,53,54,
+55,56,57,58,61,63,65,66,67,68,69,70,71,72,73,74,
+75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,
+97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,
+113,114,115,116,117,118,119,120,121,122,};
+
+
+static int check_permitted_alphabet_3(const void *sptr) {
+	const int *table = permitted_alphabet_table_3;
+	/* The underlying type is PrintableString */
+	const PrintableString_t *st = (const PrintableString_t *)sptr;
+	const uint8_t *ch = st->buf;
+	const uint8_t *end = ch + st->size;
+	
+	for(; ch < end; ch++) {
+		uint8_t cv = *ch;
+		if(!table[cv]) return -1;
+	}
+	return 0;
+}
+
+static const int permitted_alphabet_table_4[256] = {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/*                  */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/*                  */
+ 1, 0, 0, 0, 0, 0, 0, 2, 3, 4, 0, 5, 6, 7, 8, 9,	/* .      '() +,-./ */
+10,11,12,13,14,15,16,17,18,19,20, 0, 0,21, 0,22,	/* 0123456789:  = ? */
+ 0,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,	/*  ABCDEFGHIJKLMNO */
+38,39,40,41,42,43,44,45,46,47,48, 0, 0, 0, 0, 0,	/* PQRSTUVWXYZ      */
+ 0,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,	/*  abcdefghijklmno */
+64,65,66,67,68,69,70,71,72,73,74, 0, 0, 0, 0, 0,	/* pqrstuvwxyz      */
+};
+static const int permitted_alphabet_code2value_4[74] = {
+32,39,40,41,43,44,45,46,47,48,49,50,51,52,53,54,
+55,56,57,58,61,63,65,66,67,68,69,70,71,72,73,74,
+75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,
+97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,
+113,114,115,116,117,118,119,120,121,122,};
+
+
+static int check_permitted_alphabet_4(const void *sptr) {
+	const int *table = permitted_alphabet_table_4;
+	/* The underlying type is PrintableString */
+	const PrintableString_t *st = (const PrintableString_t *)sptr;
+	const uint8_t *ch = st->buf;
+	const uint8_t *end = ch + st->size;
+	
+	for(; ch < end; ch++) {
+		uint8_t cv = *ch;
+		if(!table[cv]) return -1;
+	}
+	return 0;
+}
+
+static int
+memb_E2_ranFunction_ShortName_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	const PrintableString_t *st = (const PrintableString_t *)sptr;
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	size = st->size;
+	
+	if((size >= 1 && size <= 150)
+		 && !check_permitted_alphabet_2(st)) {
+		/* Constraint check succeeded */
+		return 0;
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static int asn_PER_MAP_E2_ranFunction_ShortName_2_v2c(unsigned int value) {
+	if(value >= sizeof(permitted_alphabet_table_2)/sizeof(permitted_alphabet_table_2[0]))
+		return -1;
+	return permitted_alphabet_table_2[value] - 1;
+}
+static int asn_PER_MAP_E2_ranFunction_ShortName_2_c2v(unsigned int code) {
+	if(code >= sizeof(permitted_alphabet_code2value_2)/sizeof(permitted_alphabet_code2value_2[0]))
+		return -1;
+	return permitted_alphabet_code2value_2[code];
+}
+static int
+memb_E2_ranFunction_E2SM_OID_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	const PrintableString_t *st = (const PrintableString_t *)sptr;
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	size = st->size;
+	
+	if((size >= 1 && size <= 1000)
+		 && !check_permitted_alphabet_3(st)) {
+		/* Constraint check succeeded */
+		return 0;
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static int asn_PER_MAP_E2_ranFunction_E2SM_OID_3_v2c(unsigned int value) {
+	if(value >= sizeof(permitted_alphabet_table_3)/sizeof(permitted_alphabet_table_3[0]))
+		return -1;
+	return permitted_alphabet_table_3[value] - 1;
+}
+static int asn_PER_MAP_E2_ranFunction_E2SM_OID_3_c2v(unsigned int code) {
+	if(code >= sizeof(permitted_alphabet_code2value_3)/sizeof(permitted_alphabet_code2value_3[0]))
+		return -1;
+	return permitted_alphabet_code2value_3[code];
+}
+static int
+memb_E2_ranFunction_Description_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	const PrintableString_t *st = (const PrintableString_t *)sptr;
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	size = st->size;
+	
+	if((size >= 1 && size <= 150)
+		 && !check_permitted_alphabet_4(st)) {
+		/* Constraint check succeeded */
+		return 0;
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static int asn_PER_MAP_E2_ranFunction_Description_4_v2c(unsigned int value) {
+	if(value >= sizeof(permitted_alphabet_table_4)/sizeof(permitted_alphabet_table_4[0]))
+		return -1;
+	return permitted_alphabet_table_4[value] - 1;
+}
+static int asn_PER_MAP_E2_ranFunction_Description_4_c2v(unsigned int code) {
+	if(code >= sizeof(permitted_alphabet_code2value_4)/sizeof(permitted_alphabet_code2value_4[0]))
+		return -1;
+	return permitted_alphabet_code2value_4[code];
+}
+static asn_per_constraints_t asn_PER_memb_E2_ranFunction_ShortName_constr_2 CC_NOTUSED = {
+	{ APC_CONSTRAINED,	 7,  7,  32,  122 }	/* (32..122) */,
+	{ APC_CONSTRAINED | APC_EXTENSIBLE,  8,  8,  1,  150 }	/* (SIZE(1..150,...)) */,
+	asn_PER_MAP_E2_ranFunction_ShortName_2_v2c,	/* Value to PER code map */
+	asn_PER_MAP_E2_ranFunction_ShortName_2_c2v	/* PER code to value map */
+};
+static asn_per_constraints_t asn_PER_memb_E2_ranFunction_E2SM_OID_constr_3 CC_NOTUSED = {
+	{ APC_CONSTRAINED,	 7,  7,  32,  122 }	/* (32..122) */,
+	{ APC_CONSTRAINED | APC_EXTENSIBLE,  10,  10,  1,  1000 }	/* (SIZE(1..1000,...)) */,
+	asn_PER_MAP_E2_ranFunction_E2SM_OID_3_v2c,	/* Value to PER code map */
+	asn_PER_MAP_E2_ranFunction_E2SM_OID_3_c2v	/* PER code to value map */
+};
+static asn_per_constraints_t asn_PER_memb_E2_ranFunction_Description_constr_4 CC_NOTUSED = {
+	{ APC_CONSTRAINED,	 7,  7,  32,  122 }	/* (32..122) */,
+	{ APC_CONSTRAINED | APC_EXTENSIBLE,  8,  8,  1,  150 }	/* (SIZE(1..150,...)) */,
+	asn_PER_MAP_E2_ranFunction_Description_4_v2c,	/* Value to PER code map */
+	asn_PER_MAP_E2_ranFunction_Description_4_c2v	/* PER code to value map */
+};
+asn_TYPE_member_t asn_MBR_E2_RANfunction_Name_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RANfunction_Name, ranFunction_ShortName),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_PrintableString,
+		0,
+		{ 0, &asn_PER_memb_E2_ranFunction_ShortName_constr_2,  memb_E2_ranFunction_ShortName_constraint_1 },
+		0, 0, /* No default value */
+		"ranFunction-ShortName"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RANfunction_Name, ranFunction_E2SM_OID),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_PrintableString,
+		0,
+		{ 0, &asn_PER_memb_E2_ranFunction_E2SM_OID_constr_3,  memb_E2_ranFunction_E2SM_OID_constraint_1 },
+		0, 0, /* No default value */
+		"ranFunction-E2SM-OID"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RANfunction_Name, ranFunction_Description),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_PrintableString,
+		0,
+		{ 0, &asn_PER_memb_E2_ranFunction_Description_constr_4,  memb_E2_ranFunction_Description_constraint_1 },
+		0, 0, /* No default value */
+		"ranFunction-Description"
+		},
+	{ ATF_POINTER, 1, offsetof(struct E2_RANfunction_Name, ranFunction_Instance),
+		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_NativeInteger,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ranFunction-Instance"
+		},
+};
+static const int asn_MAP_E2_RANfunction_Name_oms_1[] = { 3 };
+static const ber_tlv_tag_t asn_DEF_E2_RANfunction_Name_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_RANfunction_Name_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* ranFunction-ShortName */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* ranFunction-E2SM-OID */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* ranFunction-Description */
+    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* ranFunction-Instance */
+};
+asn_SEQUENCE_specifics_t asn_SPC_E2_RANfunction_Name_specs_1 = {
+	sizeof(struct E2_RANfunction_Name),
+	offsetof(struct E2_RANfunction_Name, _asn_ctx),
+	asn_MAP_E2_RANfunction_Name_tag2el_1,
+	4,	/* Count of tags in the map */
+	asn_MAP_E2_RANfunction_Name_oms_1,	/* Optional members */
+	1, 0,	/* Root/Additions */
+	4,	/* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_RANfunction_Name = {
+	"RANfunction-Name",
+	"RANfunction-Name",
+	&asn_OP_SEQUENCE,
+	asn_DEF_E2_RANfunction_Name_tags_1,
+	sizeof(asn_DEF_E2_RANfunction_Name_tags_1)
+		/sizeof(asn_DEF_E2_RANfunction_Name_tags_1[0]), /* 1 */
+	asn_DEF_E2_RANfunction_Name_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_RANfunction_Name_tags_1)
+		/sizeof(asn_DEF_E2_RANfunction_Name_tags_1[0]), /* 1 */
+	{ 0, 0, SEQUENCE_constraint },
+	asn_MBR_E2_RANfunction_Name_1,
+	4,	/* Elements count */
+	&asn_SPC_E2_RANfunction_Name_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANfunction-Name.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANfunction-Name.h
new file mode 100644
index 0000000..0c8f1e1
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANfunction-Name.h
@@ -0,0 +1,48 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_RANfunction_Name_H_
+#define	_E2_RANfunction_Name_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "PrintableString.h"
+#include "NativeInteger.h"
+#include "constr_SEQUENCE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_RANfunction-Name */
+typedef struct E2_RANfunction_Name {
+	PrintableString_t	 ranFunction_ShortName;
+	PrintableString_t	 ranFunction_E2SM_OID;
+	PrintableString_t	 ranFunction_Description;
+	long	*ranFunction_Instance;	/* OPTIONAL */
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_RANfunction_Name_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_RANfunction_Name;
+extern asn_SEQUENCE_specifics_t asn_SPC_E2_RANfunction_Name_specs_1;
+extern asn_TYPE_member_t asn_MBR_E2_RANfunction_Name_1[4];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_RANfunction_Name_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-ID.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-ID.c
new file mode 100644
index 0000000..d9ffaf3
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-ID.c
@@ -0,0 +1,61 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_RANparameter-ID.h"
+
+int
+E2_RANparameter_ID_constraint(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	long value;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	value = *(const long *)sptr;
+	
+	if((value >= 0 && value <= 255)) {
+		/* Constraint check succeeded */
+		return 0;
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+/*
+ * This type is implemented using NativeInteger,
+ * so here we adjust the DEF accordingly.
+ */
+asn_per_constraints_t asn_PER_type_E2_RANparameter_ID_constr_1 CC_NOTUSED = {
+	{ APC_CONSTRAINED,	 8,  8,  0,  255 }	/* (0..255) */,
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	0, 0	/* No PER value map */
+};
+static const ber_tlv_tag_t asn_DEF_E2_RANparameter_ID_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (2 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_E2_RANparameter_ID = {
+	"RANparameter-ID",
+	"RANparameter-ID",
+	&asn_OP_NativeInteger,
+	asn_DEF_E2_RANparameter_ID_tags_1,
+	sizeof(asn_DEF_E2_RANparameter_ID_tags_1)
+		/sizeof(asn_DEF_E2_RANparameter_ID_tags_1[0]), /* 1 */
+	asn_DEF_E2_RANparameter_ID_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_RANparameter_ID_tags_1)
+		/sizeof(asn_DEF_E2_RANparameter_ID_tags_1[0]), /* 1 */
+	{ 0, &asn_PER_type_E2_RANparameter_ID_constr_1, E2_RANparameter_ID_constraint },
+	0, 0,	/* No members */
+	0	/* No specifics */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-ID.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-ID.h
new file mode 100644
index 0000000..97e0b50
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-ID.h
@@ -0,0 +1,44 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_RANparameter_ID_H_
+#define	_E2_RANparameter_ID_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "NativeInteger.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_RANparameter-ID */
+typedef long	 E2_RANparameter_ID_t;
+
+/* Implementation */
+extern asn_per_constraints_t asn_PER_type_E2_RANparameter_ID_constr_1;
+extern asn_TYPE_descriptor_t asn_DEF_E2_RANparameter_ID;
+asn_struct_free_f E2_RANparameter_ID_free;
+asn_struct_print_f E2_RANparameter_ID_print;
+asn_constr_check_f E2_RANparameter_ID_constraint;
+ber_type_decoder_f E2_RANparameter_ID_decode_ber;
+der_type_encoder_f E2_RANparameter_ID_encode_der;
+xer_type_decoder_f E2_RANparameter_ID_decode_xer;
+xer_type_encoder_f E2_RANparameter_ID_encode_xer;
+per_type_decoder_f E2_RANparameter_ID_decode_uper;
+per_type_encoder_f E2_RANparameter_ID_encode_uper;
+per_type_decoder_f E2_RANparameter_ID_decode_aper;
+per_type_encoder_f E2_RANparameter_ID_encode_aper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_RANparameter_ID_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Item.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Item.c
new file mode 100644
index 0000000..b9390ff
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Item.c
@@ -0,0 +1,60 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_RANparameter-Item.h"
+
+asn_TYPE_member_t asn_MBR_E2_RANparameter_Item_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RANparameter_Item, ranParameter_ID),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RANparameter_ID,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ranParameter-ID"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RANparameter_Item, ranParameter_Value),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		+1,	/* EXPLICIT tag at current level */
+		&asn_DEF_E2_RANparameter_Value,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ranParameter-Value"
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_RANparameter_Item_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_RANparameter_Item_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* ranParameter-ID */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* ranParameter-Value */
+};
+asn_SEQUENCE_specifics_t asn_SPC_E2_RANparameter_Item_specs_1 = {
+	sizeof(struct E2_RANparameter_Item),
+	offsetof(struct E2_RANparameter_Item, _asn_ctx),
+	asn_MAP_E2_RANparameter_Item_tag2el_1,
+	2,	/* Count of tags in the map */
+	0, 0, 0,	/* Optional elements (not needed) */
+	2,	/* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_RANparameter_Item = {
+	"RANparameter-Item",
+	"RANparameter-Item",
+	&asn_OP_SEQUENCE,
+	asn_DEF_E2_RANparameter_Item_tags_1,
+	sizeof(asn_DEF_E2_RANparameter_Item_tags_1)
+		/sizeof(asn_DEF_E2_RANparameter_Item_tags_1[0]), /* 1 */
+	asn_DEF_E2_RANparameter_Item_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_RANparameter_Item_tags_1)
+		/sizeof(asn_DEF_E2_RANparameter_Item_tags_1[0]), /* 1 */
+	{ 0, 0, SEQUENCE_constraint },
+	asn_MBR_E2_RANparameter_Item_1,
+	2,	/* Elements count */
+	&asn_SPC_E2_RANparameter_Item_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Item.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Item.h
new file mode 100644
index 0000000..5fa9292
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Item.h
@@ -0,0 +1,46 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_RANparameter_Item_H_
+#define	_E2_RANparameter_Item_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_RANparameter-ID.h"
+#include "E2_RANparameter-Value.h"
+#include "constr_SEQUENCE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_RANparameter-Item */
+typedef struct E2_RANparameter_Item {
+	E2_RANparameter_ID_t	 ranParameter_ID;
+	E2_RANparameter_Value_t	 ranParameter_Value;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_RANparameter_Item_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_RANparameter_Item;
+extern asn_SEQUENCE_specifics_t asn_SPC_E2_RANparameter_Item_specs_1;
+extern asn_TYPE_member_t asn_MBR_E2_RANparameter_Item_1[2];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_RANparameter_Item_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Name.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Name.c
new file mode 100644
index 0000000..405b9da
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Name.c
@@ -0,0 +1,106 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_RANparameter-Name.h"
+
+static const int permitted_alphabet_table_1[256] = {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/*                  */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/*                  */
+ 1, 0, 0, 0, 0, 0, 0, 2, 3, 4, 0, 5, 6, 7, 8, 9,	/* .      '() +,-./ */
+10,11,12,13,14,15,16,17,18,19,20, 0, 0,21, 0,22,	/* 0123456789:  = ? */
+ 0,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,	/*  ABCDEFGHIJKLMNO */
+38,39,40,41,42,43,44,45,46,47,48, 0, 0, 0, 0, 0,	/* PQRSTUVWXYZ      */
+ 0,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,	/*  abcdefghijklmno */
+64,65,66,67,68,69,70,71,72,73,74, 0, 0, 0, 0, 0,	/* pqrstuvwxyz      */
+};
+static const int permitted_alphabet_code2value_1[74] = {
+32,39,40,41,43,44,45,46,47,48,49,50,51,52,53,54,
+55,56,57,58,61,63,65,66,67,68,69,70,71,72,73,74,
+75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,
+97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,
+113,114,115,116,117,118,119,120,121,122,};
+
+
+static int check_permitted_alphabet_1(const void *sptr) {
+	const int *table = permitted_alphabet_table_1;
+	/* The underlying type is PrintableString */
+	const PrintableString_t *st = (const PrintableString_t *)sptr;
+	const uint8_t *ch = st->buf;
+	const uint8_t *end = ch + st->size;
+	
+	for(; ch < end; ch++) {
+		uint8_t cv = *ch;
+		if(!table[cv]) return -1;
+	}
+	return 0;
+}
+
+int
+E2_RANparameter_Name_constraint(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	const PrintableString_t *st = (const PrintableString_t *)sptr;
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	size = st->size;
+	
+	if((size >= 1 && size <= 150)
+		 && !check_permitted_alphabet_1(st)) {
+		/* Constraint check succeeded */
+		return 0;
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static int asn_PER_MAP_E2_RANparameter_Name_1_v2c(unsigned int value) {
+	if(value >= sizeof(permitted_alphabet_table_1)/sizeof(permitted_alphabet_table_1[0]))
+		return -1;
+	return permitted_alphabet_table_1[value] - 1;
+}
+static int asn_PER_MAP_E2_RANparameter_Name_1_c2v(unsigned int code) {
+	if(code >= sizeof(permitted_alphabet_code2value_1)/sizeof(permitted_alphabet_code2value_1[0]))
+		return -1;
+	return permitted_alphabet_code2value_1[code];
+}
+/*
+ * This type is implemented using PrintableString,
+ * so here we adjust the DEF accordingly.
+ */
+asn_per_constraints_t asn_PER_type_E2_RANparameter_Name_constr_1 CC_NOTUSED = {
+	{ APC_CONSTRAINED,	 7,  7,  32,  122 }	/* (32..122) */,
+	{ APC_CONSTRAINED | APC_EXTENSIBLE,  8,  8,  1,  150 }	/* (SIZE(1..150,...)) */,
+	asn_PER_MAP_E2_RANparameter_Name_1_v2c,	/* Value to PER code map */
+	asn_PER_MAP_E2_RANparameter_Name_1_c2v	/* PER code to value map */
+};
+static const ber_tlv_tag_t asn_DEF_E2_RANparameter_Name_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (19 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_E2_RANparameter_Name = {
+	"RANparameter-Name",
+	"RANparameter-Name",
+	&asn_OP_PrintableString,
+	asn_DEF_E2_RANparameter_Name_tags_1,
+	sizeof(asn_DEF_E2_RANparameter_Name_tags_1)
+		/sizeof(asn_DEF_E2_RANparameter_Name_tags_1[0]), /* 1 */
+	asn_DEF_E2_RANparameter_Name_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_RANparameter_Name_tags_1)
+		/sizeof(asn_DEF_E2_RANparameter_Name_tags_1[0]), /* 1 */
+	{ 0, &asn_PER_type_E2_RANparameter_Name_constr_1, E2_RANparameter_Name_constraint },
+	0, 0,	/* No members */
+	0	/* No specifics */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Name.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Name.h
new file mode 100644
index 0000000..39d1752
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Name.h
@@ -0,0 +1,44 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_RANparameter_Name_H_
+#define	_E2_RANparameter_Name_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "PrintableString.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_RANparameter-Name */
+typedef PrintableString_t	 E2_RANparameter_Name_t;
+
+/* Implementation */
+extern asn_per_constraints_t asn_PER_type_E2_RANparameter_Name_constr_1;
+extern asn_TYPE_descriptor_t asn_DEF_E2_RANparameter_Name;
+asn_struct_free_f E2_RANparameter_Name_free;
+asn_struct_print_f E2_RANparameter_Name_print;
+asn_constr_check_f E2_RANparameter_Name_constraint;
+ber_type_decoder_f E2_RANparameter_Name_decode_ber;
+der_type_encoder_f E2_RANparameter_Name_encode_der;
+xer_type_decoder_f E2_RANparameter_Name_decode_xer;
+xer_type_encoder_f E2_RANparameter_Name_encode_xer;
+per_type_decoder_f E2_RANparameter_Name_decode_uper;
+per_type_encoder_f E2_RANparameter_Name_encode_uper;
+per_type_decoder_f E2_RANparameter_Name_decode_aper;
+per_type_encoder_f E2_RANparameter_Name_encode_aper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_RANparameter_Name_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Test.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Test.c
new file mode 100644
index 0000000..eb2b83f
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Test.c
@@ -0,0 +1,61 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_RANparameter-Test.h"
+
+/*
+ * This type is implemented using NativeEnumerated,
+ * so here we adjust the DEF accordingly.
+ */
+static asn_per_constraints_t asn_PER_type_E2_RANparameter_Test_constr_1 CC_NOTUSED = {
+	{ APC_CONSTRAINED | APC_EXTENSIBLE,  3,  3,  0,  4 }	/* (0..4,...) */,
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	0, 0	/* No PER value map */
+};
+static const asn_INTEGER_enum_map_t asn_MAP_E2_RANparameter_Test_value2enum_1[] = {
+	{ 0,	5,	"equal" },
+	{ 1,	11,	"greaterthan" },
+	{ 2,	8,	"lessthan" },
+	{ 3,	8,	"contains" },
+	{ 4,	7,	"present" }
+	/* This list is extensible */
+};
+static const unsigned int asn_MAP_E2_RANparameter_Test_enum2value_1[] = {
+	3,	/* contains(3) */
+	0,	/* equal(0) */
+	1,	/* greaterthan(1) */
+	2,	/* lessthan(2) */
+	4	/* present(4) */
+	/* This list is extensible */
+};
+static const asn_INTEGER_specifics_t asn_SPC_E2_RANparameter_Test_specs_1 = {
+	asn_MAP_E2_RANparameter_Test_value2enum_1,	/* "tag" => N; sorted by tag */
+	asn_MAP_E2_RANparameter_Test_enum2value_1,	/* N => "tag"; sorted by N */
+	5,	/* Number of elements in the maps */
+	6,	/* Extensions before this member */
+	1,	/* Strict enumeration */
+	0,	/* Native long size */
+	0
+};
+static const ber_tlv_tag_t asn_DEF_E2_RANparameter_Test_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (10 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_E2_RANparameter_Test = {
+	"RANparameter-Test",
+	"RANparameter-Test",
+	&asn_OP_NativeEnumerated,
+	asn_DEF_E2_RANparameter_Test_tags_1,
+	sizeof(asn_DEF_E2_RANparameter_Test_tags_1)
+		/sizeof(asn_DEF_E2_RANparameter_Test_tags_1[0]), /* 1 */
+	asn_DEF_E2_RANparameter_Test_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_RANparameter_Test_tags_1)
+		/sizeof(asn_DEF_E2_RANparameter_Test_tags_1[0]), /* 1 */
+	{ 0, &asn_PER_type_E2_RANparameter_Test_constr_1, NativeEnumerated_constraint },
+	0, 0,	/* Defined elsewhere */
+	&asn_SPC_E2_RANparameter_Test_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Test.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Test.h
new file mode 100644
index 0000000..6161987
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Test.h
@@ -0,0 +1,55 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_RANparameter_Test_H_
+#define	_E2_RANparameter_Test_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "NativeEnumerated.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dependencies */
+typedef enum E2_RANparameter_Test {
+	E2_RANparameter_Test_equal	= 0,
+	E2_RANparameter_Test_greaterthan	= 1,
+	E2_RANparameter_Test_lessthan	= 2,
+	E2_RANparameter_Test_contains	= 3,
+	E2_RANparameter_Test_present	= 4
+	/*
+	 * Enumeration is extensible
+	 */
+} e_E2_RANparameter_Test;
+
+/* E2_RANparameter-Test */
+typedef long	 E2_RANparameter_Test_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_RANparameter_Test;
+asn_struct_free_f E2_RANparameter_Test_free;
+asn_struct_print_f E2_RANparameter_Test_print;
+asn_constr_check_f E2_RANparameter_Test_constraint;
+ber_type_decoder_f E2_RANparameter_Test_decode_ber;
+der_type_encoder_f E2_RANparameter_Test_encode_der;
+xer_type_decoder_f E2_RANparameter_Test_decode_xer;
+xer_type_encoder_f E2_RANparameter_Test_encode_xer;
+per_type_decoder_f E2_RANparameter_Test_decode_uper;
+per_type_encoder_f E2_RANparameter_Test_encode_uper;
+per_type_decoder_f E2_RANparameter_Test_decode_aper;
+per_type_encoder_f E2_RANparameter_Test_encode_aper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_RANparameter_Test_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Type.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Type.c
new file mode 100644
index 0000000..4a130fb
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Type.c
@@ -0,0 +1,63 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_RANparameter-Type.h"
+
+/*
+ * This type is implemented using NativeEnumerated,
+ * so here we adjust the DEF accordingly.
+ */
+asn_per_constraints_t asn_PER_type_E2_RANparameter_Type_constr_1 CC_NOTUSED = {
+	{ APC_CONSTRAINED | APC_EXTENSIBLE,  3,  3,  0,  5 }	/* (0..5,...) */,
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	0, 0	/* No PER value map */
+};
+static const asn_INTEGER_enum_map_t asn_MAP_E2_RANparameter_Type_value2enum_1[] = {
+	{ 0,	7,	"integer" },
+	{ 1,	10,	"enumerated" },
+	{ 2,	7,	"boolean" },
+	{ 3,	10,	"bit-string" },
+	{ 4,	12,	"octet-string" },
+	{ 5,	16,	"printable-string" }
+	/* This list is extensible */
+};
+static const unsigned int asn_MAP_E2_RANparameter_Type_enum2value_1[] = {
+	3,	/* bit-string(3) */
+	2,	/* boolean(2) */
+	1,	/* enumerated(1) */
+	0,	/* integer(0) */
+	4,	/* octet-string(4) */
+	5	/* printable-string(5) */
+	/* This list is extensible */
+};
+const asn_INTEGER_specifics_t asn_SPC_E2_RANparameter_Type_specs_1 = {
+	asn_MAP_E2_RANparameter_Type_value2enum_1,	/* "tag" => N; sorted by tag */
+	asn_MAP_E2_RANparameter_Type_enum2value_1,	/* N => "tag"; sorted by N */
+	6,	/* Number of elements in the maps */
+	7,	/* Extensions before this member */
+	1,	/* Strict enumeration */
+	0,	/* Native long size */
+	0
+};
+static const ber_tlv_tag_t asn_DEF_E2_RANparameter_Type_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (10 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_E2_RANparameter_Type = {
+	"RANparameter-Type",
+	"RANparameter-Type",
+	&asn_OP_NativeEnumerated,
+	asn_DEF_E2_RANparameter_Type_tags_1,
+	sizeof(asn_DEF_E2_RANparameter_Type_tags_1)
+		/sizeof(asn_DEF_E2_RANparameter_Type_tags_1[0]), /* 1 */
+	asn_DEF_E2_RANparameter_Type_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_RANparameter_Type_tags_1)
+		/sizeof(asn_DEF_E2_RANparameter_Type_tags_1[0]), /* 1 */
+	{ 0, &asn_PER_type_E2_RANparameter_Type_constr_1, NativeEnumerated_constraint },
+	0, 0,	/* Defined elsewhere */
+	&asn_SPC_E2_RANparameter_Type_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Type.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Type.h
new file mode 100644
index 0000000..bb2ed80
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Type.h
@@ -0,0 +1,58 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_RANparameter_Type_H_
+#define	_E2_RANparameter_Type_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "NativeEnumerated.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dependencies */
+typedef enum E2_RANparameter_Type {
+	E2_RANparameter_Type_integer	= 0,
+	E2_RANparameter_Type_enumerated	= 1,
+	E2_RANparameter_Type_boolean	= 2,
+	E2_RANparameter_Type_bit_string	= 3,
+	E2_RANparameter_Type_octet_string	= 4,
+	E2_RANparameter_Type_printable_string	= 5
+	/*
+	 * Enumeration is extensible
+	 */
+} e_E2_RANparameter_Type;
+
+/* E2_RANparameter-Type */
+typedef long	 E2_RANparameter_Type_t;
+
+/* Implementation */
+extern asn_per_constraints_t asn_PER_type_E2_RANparameter_Type_constr_1;
+extern asn_TYPE_descriptor_t asn_DEF_E2_RANparameter_Type;
+extern const asn_INTEGER_specifics_t asn_SPC_RANparameter_Type_specs_1;
+asn_struct_free_f RANparameter_Type_free;
+asn_struct_print_f RANparameter_Type_print;
+asn_constr_check_f RANparameter_Type_constraint;
+ber_type_decoder_f RANparameter_Type_decode_ber;
+der_type_encoder_f RANparameter_Type_encode_der;
+xer_type_decoder_f RANparameter_Type_decode_xer;
+xer_type_encoder_f RANparameter_Type_encode_xer;
+per_type_decoder_f RANparameter_Type_decode_uper;
+per_type_encoder_f RANparameter_Type_encode_uper;
+per_type_decoder_f RANparameter_Type_decode_aper;
+per_type_encoder_f RANparameter_Type_encode_aper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_RANparameter_Type_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANParameter-Value.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Value.c
similarity index 63%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANParameter-Value.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Value.c
index bb7d320..3e7abbf 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANParameter-Value.c
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Value.c
@@ -1,19 +1,19 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
- * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
-#include "E2_RANParameter-Value.h"
+#include "E2_RANparameter-Value.h"
 
-asn_per_constraints_t asn_PER_type_E2_RANParameter_Value_constr_1 CC_NOTUSED = {
+asn_per_constraints_t asn_PER_type_E2_RANparameter_Value_constr_1 CC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  3,  3,  0,  5 }	/* (0..5,...) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-asn_TYPE_member_t asn_MBR_E2_RANParameter_Value_1[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct E2_RANParameter_Value, choice.valueInt),
+asn_TYPE_member_t asn_MBR_E2_RANparameter_Value_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RANparameter_Value, choice.valueInt),
 		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
@@ -22,7 +22,7 @@
 		0, 0, /* No default value */
 		"valueInt"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct E2_RANParameter_Value, choice.valueEnum),
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RANparameter_Value, choice.valueEnum),
 		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
@@ -31,7 +31,7 @@
 		0, 0, /* No default value */
 		"valueEnum"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct E2_RANParameter_Value, choice.valueBool),
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RANparameter_Value, choice.valueBool),
 		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_BOOLEAN,
@@ -40,7 +40,7 @@
 		0, 0, /* No default value */
 		"valueBool"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct E2_RANParameter_Value, choice.valueBitS),
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RANparameter_Value, choice.valueBitS),
 		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_BIT_STRING,
@@ -49,7 +49,7 @@
 		0, 0, /* No default value */
 		"valueBitS"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct E2_RANParameter_Value, choice.valueOctS),
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RANparameter_Value, choice.valueOctS),
 		(ASN_TAG_CLASS_CONTEXT | (4 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_OCTET_STRING,
@@ -58,7 +58,7 @@
 		0, 0, /* No default value */
 		"valueOctS"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct E2_RANParameter_Value, choice.valuePrtS),
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RANparameter_Value, choice.valuePrtS),
 		(ASN_TAG_CLASS_CONTEXT | (5 << 2)),
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_PrintableString,
@@ -68,7 +68,7 @@
 		"valuePrtS"
 		},
 };
-static const asn_TYPE_tag2member_t asn_MAP_E2_RANParameter_Value_tag2el_1[] = {
+static const asn_TYPE_tag2member_t asn_MAP_E2_RANparameter_Value_tag2el_1[] = {
     { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* valueInt */
     { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* valueEnum */
     { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* valueBool */
@@ -76,27 +76,27 @@
     { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 4, 0, 0 }, /* valueOctS */
     { (ASN_TAG_CLASS_CONTEXT | (5 << 2)), 5, 0, 0 } /* valuePrtS */
 };
-asn_CHOICE_specifics_t asn_SPC_E2_RANParameter_Value_specs_1 = {
-	sizeof(struct E2_RANParameter_Value),
-	offsetof(struct E2_RANParameter_Value, _asn_ctx),
-	offsetof(struct E2_RANParameter_Value, present),
-	sizeof(((struct E2_RANParameter_Value *)0)->present),
-	asn_MAP_E2_RANParameter_Value_tag2el_1,
+asn_CHOICE_specifics_t asn_SPC_E2_RANparameter_Value_specs_1 = {
+	sizeof(struct E2_RANparameter_Value),
+	offsetof(struct E2_RANparameter_Value, _asn_ctx),
+	offsetof(struct E2_RANparameter_Value, present),
+	sizeof(((struct E2_RANparameter_Value *)0)->present),
+	asn_MAP_E2_RANparameter_Value_tag2el_1,
 	6,	/* Count of tags in the map */
 	0, 0,
 	6	/* Extensions start */
 };
-asn_TYPE_descriptor_t asn_DEF_E2_RANParameter_Value = {
-	"RANParameter-Value",
-	"RANParameter-Value",
+asn_TYPE_descriptor_t asn_DEF_E2_RANparameter_Value = {
+	"RANparameter-Value",
+	"RANparameter-Value",
 	&asn_OP_CHOICE,
 	0,	/* No effective tags (pointer) */
 	0,	/* No effective tags (count) */
 	0,	/* No tags (pointer) */
 	0,	/* No tags (count) */
-	{ 0, &asn_PER_type_E2_RANParameter_Value_constr_1, CHOICE_constraint },
-	asn_MBR_E2_RANParameter_Value_1,
+	{ 0, &asn_PER_type_E2_RANparameter_Value_constr_1, CHOICE_constraint },
+	asn_MBR_E2_RANparameter_Value_1,
 	6,	/* Elements count */
-	&asn_SPC_E2_RANParameter_Value_specs_1	/* Additional specs */
+	&asn_SPC_E2_RANparameter_Value_specs_1	/* Additional specs */
 };
 
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Value.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Value.h
new file mode 100644
index 0000000..19e7025
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameter-Value.h
@@ -0,0 +1,70 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_RANparameter_Value_H_
+#define	_E2_RANparameter_Value_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "NativeInteger.h"
+#include "BOOLEAN.h"
+#include "BIT_STRING.h"
+#include "OCTET_STRING.h"
+#include "PrintableString.h"
+#include "constr_CHOICE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dependencies */
+typedef enum E2_RANparameter_Value_PR {
+	E2_RANparameter_Value_PR_NOTHING,	/* No components present */
+	E2_RANparameter_Value_PR_valueInt,
+	E2_RANparameter_Value_PR_valueEnum,
+	E2_RANparameter_Value_PR_valueBool,
+	E2_RANparameter_Value_PR_valueBitS,
+	E2_RANparameter_Value_PR_valueOctS,
+	E2_RANparameter_Value_PR_valuePrtS
+	/* Extensions may appear below */
+	
+} E2_RANparameter_Value_PR;
+
+/* E2_RANparameter-Value */
+typedef struct E2_RANparameter_Value {
+	E2_RANparameter_Value_PR present;
+	union E2_RANparameter_Value_u {
+		long	 valueInt;
+		long	 valueEnum;
+		BOOLEAN_t	 valueBool;
+		BIT_STRING_t	 valueBitS;
+		OCTET_STRING_t	 valueOctS;
+		PrintableString_t	 valuePrtS;
+		/*
+		 * This type is extensible,
+		 * possible extensions are below.
+		 */
+	} choice;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_RANparameter_Value_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_RANparameter_Value;
+extern asn_CHOICE_specifics_t asn_SPC_E2_RANparameter_Value_specs_1;
+extern asn_TYPE_member_t asn_MBR_E2_RANparameter_Value_1[6];
+extern asn_per_constraints_t asn_PER_type_E2_RANparameter_Value_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_RANparameter_Value_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameterDef-Item.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameterDef-Item.c
new file mode 100644
index 0000000..b4ac9a1
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameterDef-Item.c
@@ -0,0 +1,70 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_RANparameterDef-Item.h"
+
+asn_TYPE_member_t asn_MBR_E2_RANparameterDef_Item_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RANparameterDef_Item, ranParameter_ID),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RANparameter_ID,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ranParameter-ID"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RANparameterDef_Item, ranParameter_Name),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RANparameter_Name,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ranParameter-Name"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RANparameterDef_Item, ranParameter_Type),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RANparameter_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ranParameter-Type"
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_RANparameterDef_Item_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_RANparameterDef_Item_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* ranParameter-ID */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* ranParameter-Name */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* ranParameter-Type */
+};
+asn_SEQUENCE_specifics_t asn_SPC_E2_RANparameterDef_Item_specs_1 = {
+	sizeof(struct E2_RANparameterDef_Item),
+	offsetof(struct E2_RANparameterDef_Item, _asn_ctx),
+	asn_MAP_E2_RANparameterDef_Item_tag2el_1,
+	3,	/* Count of tags in the map */
+	0, 0, 0,	/* Optional elements (not needed) */
+	3,	/* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_RANparameterDef_Item = {
+	"RANparameterDef-Item",
+	"RANparameterDef-Item",
+	&asn_OP_SEQUENCE,
+	asn_DEF_E2_RANparameterDef_Item_tags_1,
+	sizeof(asn_DEF_E2_RANparameterDef_Item_tags_1)
+		/sizeof(asn_DEF_E2_RANparameterDef_Item_tags_1[0]), /* 1 */
+	asn_DEF_E2_RANparameterDef_Item_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_RANparameterDef_Item_tags_1)
+		/sizeof(asn_DEF_E2_RANparameterDef_Item_tags_1[0]), /* 1 */
+	{ 0, 0, SEQUENCE_constraint },
+	asn_MBR_E2_RANparameterDef_Item_1,
+	3,	/* Elements count */
+	&asn_SPC_E2_RANparameterDef_Item_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameterDef-Item.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameterDef-Item.h
new file mode 100644
index 0000000..32ad3a5
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RANparameterDef-Item.h
@@ -0,0 +1,48 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_RANparameterDef_Item_H_
+#define	_E2_RANparameterDef_Item_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_RANparameter-ID.h"
+#include "E2_RANparameter-Name.h"
+#include "E2_RANparameter-Type.h"
+#include "constr_SEQUENCE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_RANparameterDef-Item */
+typedef struct E2_RANparameterDef_Item {
+	E2_RANparameter_ID_t	 ranParameter_ID;
+	E2_RANparameter_Name_t	 ranParameter_Name;
+	E2_RANparameter_Type_t	 ranParameter_Type;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_RANparameterDef_Item_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_RANparameterDef_Item;
+extern asn_SEQUENCE_specifics_t asn_SPC_E2_RANparameterDef_Item_specs_1;
+extern asn_TYPE_member_t asn_MBR_E2_RANparameterDef_Item_1[3];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_RANparameterDef_Item_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-ControlStyle-List.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-ControlStyle-List.c
new file mode 100644
index 0000000..c3c8883
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-ControlStyle-List.c
@@ -0,0 +1,90 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_RIC-ControlStyle-List.h"
+
+asn_TYPE_member_t asn_MBR_E2_RIC_ControlStyle_List_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_ControlStyle_List, ric_ControlStyle_Type),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Style_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-ControlStyle-Type"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_ControlStyle_List, ric_ControlStyle_Name),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Style_Name,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-ControlStyle-Name"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_ControlStyle_List, ric_ControlHeaderFormat_Type),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Format_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-ControlHeaderFormat-Type"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_ControlStyle_List, ric_ControlMessageFormat_Type),
+		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Format_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-ControlMessageFormat-Type"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_ControlStyle_List, ric_CallProcessIDFormat_Type),
+		(ASN_TAG_CLASS_CONTEXT | (4 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Format_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-CallProcessIDFormat-Type"
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_RIC_ControlStyle_List_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_RIC_ControlStyle_List_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* ric-ControlStyle-Type */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* ric-ControlStyle-Name */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* ric-ControlHeaderFormat-Type */
+    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 }, /* ric-ControlMessageFormat-Type */
+    { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 4, 0, 0 } /* ric-CallProcessIDFormat-Type */
+};
+asn_SEQUENCE_specifics_t asn_SPC_E2_RIC_ControlStyle_List_specs_1 = {
+	sizeof(struct E2_RIC_ControlStyle_List),
+	offsetof(struct E2_RIC_ControlStyle_List, _asn_ctx),
+	asn_MAP_E2_RIC_ControlStyle_List_tag2el_1,
+	5,	/* Count of tags in the map */
+	0, 0, 0,	/* Optional elements (not needed) */
+	5,	/* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_RIC_ControlStyle_List = {
+	"RIC-ControlStyle-List",
+	"RIC-ControlStyle-List",
+	&asn_OP_SEQUENCE,
+	asn_DEF_E2_RIC_ControlStyle_List_tags_1,
+	sizeof(asn_DEF_E2_RIC_ControlStyle_List_tags_1)
+		/sizeof(asn_DEF_E2_RIC_ControlStyle_List_tags_1[0]), /* 1 */
+	asn_DEF_E2_RIC_ControlStyle_List_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_RIC_ControlStyle_List_tags_1)
+		/sizeof(asn_DEF_E2_RIC_ControlStyle_List_tags_1[0]), /* 1 */
+	{ 0, 0, SEQUENCE_constraint },
+	asn_MBR_E2_RIC_ControlStyle_List_1,
+	5,	/* Elements count */
+	&asn_SPC_E2_RIC_ControlStyle_List_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-ControlStyle-List.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-ControlStyle-List.h
new file mode 100644
index 0000000..a3d0fd4
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-ControlStyle-List.h
@@ -0,0 +1,50 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_RIC_ControlStyle_List_H_
+#define	_E2_RIC_ControlStyle_List_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_RIC-Style-Type.h"
+#include "E2_RIC-Style-Name.h"
+#include "E2_RIC-Format-Type.h"
+#include "constr_SEQUENCE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_RIC-ControlStyle-List */
+typedef struct E2_RIC_ControlStyle_List {
+	E2_RIC_Style_Type_t	 ric_ControlStyle_Type;
+	E2_RIC_Style_Name_t	 ric_ControlStyle_Name;
+	E2_RIC_Format_Type_t	 ric_ControlHeaderFormat_Type;
+	E2_RIC_Format_Type_t	 ric_ControlMessageFormat_Type;
+	E2_RIC_Format_Type_t	 ric_CallProcessIDFormat_Type;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_RIC_ControlStyle_List_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_RIC_ControlStyle_List;
+extern asn_SEQUENCE_specifics_t asn_SPC_E2_RIC_ControlStyle_List_specs_1;
+extern asn_TYPE_member_t asn_MBR_E2_RIC_ControlStyle_List_1[5];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_RIC_ControlStyle_List_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-EventTriggerStyle-List.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-EventTriggerStyle-List.c
new file mode 100644
index 0000000..560b39d
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-EventTriggerStyle-List.c
@@ -0,0 +1,70 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_RIC-EventTriggerStyle-List.h"
+
+asn_TYPE_member_t asn_MBR_E2_RIC_EventTriggerStyle_List_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_EventTriggerStyle_List, ric_EventTriggerStyle_Type),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Style_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-EventTriggerStyle-Type"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_EventTriggerStyle_List, ric_EventTriggerStyle_Name),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Style_Name,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-EventTriggerStyle-Name"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_EventTriggerStyle_List, ric_EventTriggerFormat_Type),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Format_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-EventTriggerFormat-Type"
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_RIC_EventTriggerStyle_List_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_RIC_EventTriggerStyle_List_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* ric-EventTriggerStyle-Type */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* ric-EventTriggerStyle-Name */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* ric-EventTriggerFormat-Type */
+};
+asn_SEQUENCE_specifics_t asn_SPC_E2_RIC_EventTriggerStyle_List_specs_1 = {
+	sizeof(struct E2_RIC_EventTriggerStyle_List),
+	offsetof(struct E2_RIC_EventTriggerStyle_List, _asn_ctx),
+	asn_MAP_E2_RIC_EventTriggerStyle_List_tag2el_1,
+	3,	/* Count of tags in the map */
+	0, 0, 0,	/* Optional elements (not needed) */
+	3,	/* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_RIC_EventTriggerStyle_List = {
+	"RIC-EventTriggerStyle-List",
+	"RIC-EventTriggerStyle-List",
+	&asn_OP_SEQUENCE,
+	asn_DEF_E2_RIC_EventTriggerStyle_List_tags_1,
+	sizeof(asn_DEF_E2_RIC_EventTriggerStyle_List_tags_1)
+		/sizeof(asn_DEF_E2_RIC_EventTriggerStyle_List_tags_1[0]), /* 1 */
+	asn_DEF_E2_RIC_EventTriggerStyle_List_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_RIC_EventTriggerStyle_List_tags_1)
+		/sizeof(asn_DEF_E2_RIC_EventTriggerStyle_List_tags_1[0]), /* 1 */
+	{ 0, 0, SEQUENCE_constraint },
+	asn_MBR_E2_RIC_EventTriggerStyle_List_1,
+	3,	/* Elements count */
+	&asn_SPC_E2_RIC_EventTriggerStyle_List_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-EventTriggerStyle-List.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-EventTriggerStyle-List.h
new file mode 100644
index 0000000..0244732
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-EventTriggerStyle-List.h
@@ -0,0 +1,48 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_RIC_EventTriggerStyle_List_H_
+#define	_E2_RIC_EventTriggerStyle_List_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_RIC-Style-Type.h"
+#include "E2_RIC-Style-Name.h"
+#include "E2_RIC-Format-Type.h"
+#include "constr_SEQUENCE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_RIC-EventTriggerStyle-List */
+typedef struct E2_RIC_EventTriggerStyle_List {
+	E2_RIC_Style_Type_t	 ric_EventTriggerStyle_Type;
+	E2_RIC_Style_Name_t	 ric_EventTriggerStyle_Name;
+	E2_RIC_Format_Type_t	 ric_EventTriggerFormat_Type;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_RIC_EventTriggerStyle_List_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_RIC_EventTriggerStyle_List;
+extern asn_SEQUENCE_specifics_t asn_SPC_E2_RIC_EventTriggerStyle_List_specs_1;
+extern asn_TYPE_member_t asn_MBR_E2_RIC_EventTriggerStyle_List_1[3];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_RIC_EventTriggerStyle_List_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-Format-Type.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-Format-Type.c
new file mode 100644
index 0000000..5ca70e8
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-Format-Type.c
@@ -0,0 +1,31 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_RIC-Format-Type.h"
+
+/*
+ * This type is implemented using NativeInteger,
+ * so here we adjust the DEF accordingly.
+ */
+static const ber_tlv_tag_t asn_DEF_E2_RIC_Format_Type_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (2 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_E2_RIC_Format_Type = {
+	"RIC-Format-Type",
+	"RIC-Format-Type",
+	&asn_OP_NativeInteger,
+	asn_DEF_E2_RIC_Format_Type_tags_1,
+	sizeof(asn_DEF_E2_RIC_Format_Type_tags_1)
+		/sizeof(asn_DEF_E2_RIC_Format_Type_tags_1[0]), /* 1 */
+	asn_DEF_E2_RIC_Format_Type_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_RIC_Format_Type_tags_1)
+		/sizeof(asn_DEF_E2_RIC_Format_Type_tags_1[0]), /* 1 */
+	{ 0, 0, NativeInteger_constraint },
+	0, 0,	/* No members */
+	0	/* No specifics */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-Format-Type.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-Format-Type.h
new file mode 100644
index 0000000..054ee7c
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-Format-Type.h
@@ -0,0 +1,43 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_RIC_Format_Type_H_
+#define	_E2_RIC_Format_Type_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "NativeInteger.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_RIC-Format-Type */
+typedef long	 E2_RIC_Format_Type_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_RIC_Format_Type;
+asn_struct_free_f E2_RIC_Format_Type_free;
+asn_struct_print_f E2_RIC_Format_Type_print;
+asn_constr_check_f E2_RIC_Format_Type_constraint;
+ber_type_decoder_f E2_RIC_Format_Type_decode_ber;
+der_type_encoder_f E2_RIC_Format_Type_encode_der;
+xer_type_decoder_f E2_RIC_Format_Type_decode_xer;
+xer_type_encoder_f E2_RIC_Format_Type_encode_xer;
+per_type_decoder_f E2_RIC_Format_Type_decode_uper;
+per_type_encoder_f E2_RIC_Format_Type_encode_uper;
+per_type_decoder_f E2_RIC_Format_Type_decode_aper;
+per_type_encoder_f E2_RIC_Format_Type_encode_aper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_RIC_Format_Type_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-InsertStyle-List.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-InsertStyle-List.c
new file mode 100644
index 0000000..f448959
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-InsertStyle-List.c
@@ -0,0 +1,184 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_RIC-InsertStyle-List.h"
+
+#include "E2_RANparameterDef-Item.h"
+static int
+memb_E2_ric_InsertRanParameterDef_List_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	/* Determine the number of elements */
+	size = _A_CSEQUENCE_FROM_VOID(sptr)->count;
+	
+	if((size >= 1 && size <= 255)) {
+		/* Perform validation of the inner elements */
+		return td->encoding_constraints.general_constraints(td, sptr, ctfailcb, app_key);
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static asn_per_constraints_t asn_PER_type_E2_ric_InsertRanParameterDef_List_constr_5 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 8,  8,  1,  255 }	/* (SIZE(1..255)) */,
+	0, 0	/* No PER value map */
+};
+static asn_per_constraints_t asn_PER_memb_E2_ric_InsertRanParameterDef_List_constr_5 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 8,  8,  1,  255 }	/* (SIZE(1..255)) */,
+	0, 0	/* No PER value map */
+};
+static asn_TYPE_member_t asn_MBR_E2_ric_InsertRanParameterDef_List_5[] = {
+	{ ATF_POINTER, 0, 0,
+		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		0,
+		&asn_DEF_E2_RANparameterDef_Item,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		""
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_ric_InsertRanParameterDef_List_tags_5[] = {
+	(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static asn_SET_OF_specifics_t asn_SPC_E2_ric_InsertRanParameterDef_List_specs_5 = {
+	sizeof(struct E2_RIC_InsertStyle_List__ric_InsertRanParameterDef_List),
+	offsetof(struct E2_RIC_InsertStyle_List__ric_InsertRanParameterDef_List, _asn_ctx),
+	0,	/* XER encoding is XMLDelimitedItemList */
+};
+static /* Use -fall-defs-global to expose */
+asn_TYPE_descriptor_t asn_DEF_E2_ric_InsertRanParameterDef_List_5 = {
+	"ric-InsertRanParameterDef-List",
+	"ric-InsertRanParameterDef-List",
+	&asn_OP_SEQUENCE_OF,
+	asn_DEF_E2_ric_InsertRanParameterDef_List_tags_5,
+	sizeof(asn_DEF_E2_ric_InsertRanParameterDef_List_tags_5)
+		/sizeof(asn_DEF_E2_ric_InsertRanParameterDef_List_tags_5[0]) - 1, /* 1 */
+	asn_DEF_E2_ric_InsertRanParameterDef_List_tags_5,	/* Same as above */
+	sizeof(asn_DEF_E2_ric_InsertRanParameterDef_List_tags_5)
+		/sizeof(asn_DEF_E2_ric_InsertRanParameterDef_List_tags_5[0]), /* 2 */
+	{ 0, &asn_PER_type_E2_ric_InsertRanParameterDef_List_constr_5, SEQUENCE_OF_constraint },
+	asn_MBR_E2_ric_InsertRanParameterDef_List_5,
+	1,	/* Single element */
+	&asn_SPC_E2_ric_InsertRanParameterDef_List_specs_5	/* Additional specs */
+};
+
+asn_TYPE_member_t asn_MBR_E2_RIC_InsertStyle_List_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_InsertStyle_List, ric_InsertStyle_Type),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Style_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-InsertStyle-Type"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_InsertStyle_List, ric_InsertStyle_Name),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Style_Name,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-InsertStyle-Name"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_InsertStyle_List, ric_InsertActionFormat_Type),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Format_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-InsertActionFormat-Type"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_InsertStyle_List, ric_InsertRanParameterDef_List),
+		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
+		0,
+		&asn_DEF_E2_ric_InsertRanParameterDef_List_5,
+		0,
+		{ 0, &asn_PER_memb_E2_ric_InsertRanParameterDef_List_constr_5,  memb_E2_ric_InsertRanParameterDef_List_constraint_1 },
+		0, 0, /* No default value */
+		"ric-InsertRanParameterDef-List"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_InsertStyle_List, ric_IndicationHeaderFormat_Type),
+		(ASN_TAG_CLASS_CONTEXT | (4 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Format_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-IndicationHeaderFormat-Type"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_InsertStyle_List, ric_IndicationMessageFormat_Type),
+		(ASN_TAG_CLASS_CONTEXT | (5 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Format_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-IndicationMessageFormat-Type"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_InsertStyle_List, ric_CallProcessIDFormat_Type),
+		(ASN_TAG_CLASS_CONTEXT | (6 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Format_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-CallProcessIDFormat-Type"
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_RIC_InsertStyle_List_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_RIC_InsertStyle_List_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* ric-InsertStyle-Type */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* ric-InsertStyle-Name */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* ric-InsertActionFormat-Type */
+    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 }, /* ric-InsertRanParameterDef-List */
+    { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 4, 0, 0 }, /* ric-IndicationHeaderFormat-Type */
+    { (ASN_TAG_CLASS_CONTEXT | (5 << 2)), 5, 0, 0 }, /* ric-IndicationMessageFormat-Type */
+    { (ASN_TAG_CLASS_CONTEXT | (6 << 2)), 6, 0, 0 } /* ric-CallProcessIDFormat-Type */
+};
+asn_SEQUENCE_specifics_t asn_SPC_E2_RIC_InsertStyle_List_specs_1 = {
+	sizeof(struct E2_RIC_InsertStyle_List),
+	offsetof(struct E2_RIC_InsertStyle_List, _asn_ctx),
+	asn_MAP_E2_RIC_InsertStyle_List_tag2el_1,
+	7,	/* Count of tags in the map */
+	0, 0, 0,	/* Optional elements (not needed) */
+	7,	/* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_RIC_InsertStyle_List = {
+	"RIC-InsertStyle-List",
+	"RIC-InsertStyle-List",
+	&asn_OP_SEQUENCE,
+	asn_DEF_E2_RIC_InsertStyle_List_tags_1,
+	sizeof(asn_DEF_E2_RIC_InsertStyle_List_tags_1)
+		/sizeof(asn_DEF_E2_RIC_InsertStyle_List_tags_1[0]), /* 1 */
+	asn_DEF_E2_RIC_InsertStyle_List_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_RIC_InsertStyle_List_tags_1)
+		/sizeof(asn_DEF_E2_RIC_InsertStyle_List_tags_1[0]), /* 1 */
+	{ 0, 0, SEQUENCE_constraint },
+	asn_MBR_E2_RIC_InsertStyle_List_1,
+	7,	/* Elements count */
+	&asn_SPC_E2_RIC_InsertStyle_List_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-InsertStyle-List.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-InsertStyle-List.h
new file mode 100644
index 0000000..7e92ca1
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-InsertStyle-List.h
@@ -0,0 +1,62 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_RIC_InsertStyle_List_H_
+#define	_E2_RIC_InsertStyle_List_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_RIC-Style-Type.h"
+#include "E2_RIC-Style-Name.h"
+#include "E2_RIC-Format-Type.h"
+#include "asn_SEQUENCE_OF.h"
+#include "constr_SEQUENCE_OF.h"
+#include "constr_SEQUENCE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct E2_RANparameterDef_Item;
+
+/* E2_RIC-InsertStyle-List */
+typedef struct E2_RIC_InsertStyle_List {
+	E2_RIC_Style_Type_t	 ric_InsertStyle_Type;
+	E2_RIC_Style_Name_t	 ric_InsertStyle_Name;
+	E2_RIC_Format_Type_t	 ric_InsertActionFormat_Type;
+	struct E2_RIC_InsertStyle_List__ric_InsertRanParameterDef_List {
+		A_SEQUENCE_OF(struct E2_RANparameterDef_Item) list;
+		
+		/* Context for parsing across buffer boundaries */
+		asn_struct_ctx_t _asn_ctx;
+	} ric_InsertRanParameterDef_List;
+	E2_RIC_Format_Type_t	 ric_IndicationHeaderFormat_Type;
+	E2_RIC_Format_Type_t	 ric_IndicationMessageFormat_Type;
+	E2_RIC_Format_Type_t	 ric_CallProcessIDFormat_Type;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_RIC_InsertStyle_List_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_RIC_InsertStyle_List;
+extern asn_SEQUENCE_specifics_t asn_SPC_E2_RIC_InsertStyle_List_specs_1;
+extern asn_TYPE_member_t asn_MBR_E2_RIC_InsertStyle_List_1[7];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_RIC_InsertStyle_List_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-PolicyStyle-List.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-PolicyStyle-List.c
new file mode 100644
index 0000000..0c123d9
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-PolicyStyle-List.c
@@ -0,0 +1,154 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_RIC-PolicyStyle-List.h"
+
+#include "E2_RANparameterDef-Item.h"
+static int
+memb_E2_ric_PolicyRanParameterDef_List_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	/* Determine the number of elements */
+	size = _A_CSEQUENCE_FROM_VOID(sptr)->count;
+	
+	if((size >= 1 && size <= 255)) {
+		/* Perform validation of the inner elements */
+		return td->encoding_constraints.general_constraints(td, sptr, ctfailcb, app_key);
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static asn_per_constraints_t asn_PER_type_E2_ric_PolicyRanParameterDef_List_constr_5 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 8,  8,  1,  255 }	/* (SIZE(1..255)) */,
+	0, 0	/* No PER value map */
+};
+static asn_per_constraints_t asn_PER_memb_E2_ric_PolicyRanParameterDef_List_constr_5 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 8,  8,  1,  255 }	/* (SIZE(1..255)) */,
+	0, 0	/* No PER value map */
+};
+static asn_TYPE_member_t asn_MBR_E2_ric_PolicyRanParameterDef_List_5[] = {
+	{ ATF_POINTER, 0, 0,
+		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		0,
+		&asn_DEF_E2_RANparameterDef_Item,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		""
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_ric_PolicyRanParameterDef_List_tags_5[] = {
+	(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static asn_SET_OF_specifics_t asn_SPC_E2_ric_PolicyRanParameterDef_List_specs_5 = {
+	sizeof(struct E2_RIC_PolicyStyle_List__ric_PolicyRanParameterDef_List),
+	offsetof(struct E2_RIC_PolicyStyle_List__ric_PolicyRanParameterDef_List, _asn_ctx),
+	0,	/* XER encoding is XMLDelimitedItemList */
+};
+static /* Use -fall-defs-global to expose */
+asn_TYPE_descriptor_t asn_DEF_E2_ric_PolicyRanParameterDef_List_5 = {
+	"ric-PolicyRanParameterDef-List",
+	"ric-PolicyRanParameterDef-List",
+	&asn_OP_SEQUENCE_OF,
+	asn_DEF_E2_ric_PolicyRanParameterDef_List_tags_5,
+	sizeof(asn_DEF_E2_ric_PolicyRanParameterDef_List_tags_5)
+		/sizeof(asn_DEF_E2_ric_PolicyRanParameterDef_List_tags_5[0]) - 1, /* 1 */
+	asn_DEF_E2_ric_PolicyRanParameterDef_List_tags_5,	/* Same as above */
+	sizeof(asn_DEF_E2_ric_PolicyRanParameterDef_List_tags_5)
+		/sizeof(asn_DEF_E2_ric_PolicyRanParameterDef_List_tags_5[0]), /* 2 */
+	{ 0, &asn_PER_type_E2_ric_PolicyRanParameterDef_List_constr_5, SEQUENCE_OF_constraint },
+	asn_MBR_E2_ric_PolicyRanParameterDef_List_5,
+	1,	/* Single element */
+	&asn_SPC_E2_ric_PolicyRanParameterDef_List_specs_5	/* Additional specs */
+};
+
+asn_TYPE_member_t asn_MBR_E2_RIC_PolicyStyle_List_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_PolicyStyle_List, ric_PolicyStyle_Type),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Style_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-PolicyStyle-Type"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_PolicyStyle_List, ric_PolicyStyle_Name),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Style_Name,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-PolicyStyle-Name"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_PolicyStyle_List, ric_PolicyActionFormat_Type),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Format_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-PolicyActionFormat-Type"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_PolicyStyle_List, ric_PolicyRanParameterDef_List),
+		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
+		0,
+		&asn_DEF_E2_ric_PolicyRanParameterDef_List_5,
+		0,
+		{ 0, &asn_PER_memb_E2_ric_PolicyRanParameterDef_List_constr_5,  memb_E2_ric_PolicyRanParameterDef_List_constraint_1 },
+		0, 0, /* No default value */
+		"ric-PolicyRanParameterDef-List"
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_RIC_PolicyStyle_List_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_RIC_PolicyStyle_List_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* ric-PolicyStyle-Type */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* ric-PolicyStyle-Name */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* ric-PolicyActionFormat-Type */
+    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* ric-PolicyRanParameterDef-List */
+};
+asn_SEQUENCE_specifics_t asn_SPC_E2_RIC_PolicyStyle_List_specs_1 = {
+	sizeof(struct E2_RIC_PolicyStyle_List),
+	offsetof(struct E2_RIC_PolicyStyle_List, _asn_ctx),
+	asn_MAP_E2_RIC_PolicyStyle_List_tag2el_1,
+	4,	/* Count of tags in the map */
+	0, 0, 0,	/* Optional elements (not needed) */
+	4,	/* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_RIC_PolicyStyle_List = {
+	"RIC-PolicyStyle-List",
+	"RIC-PolicyStyle-List",
+	&asn_OP_SEQUENCE,
+	asn_DEF_E2_RIC_PolicyStyle_List_tags_1,
+	sizeof(asn_DEF_E2_RIC_PolicyStyle_List_tags_1)
+		/sizeof(asn_DEF_E2_RIC_PolicyStyle_List_tags_1[0]), /* 1 */
+	asn_DEF_E2_RIC_PolicyStyle_List_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_RIC_PolicyStyle_List_tags_1)
+		/sizeof(asn_DEF_E2_RIC_PolicyStyle_List_tags_1[0]), /* 1 */
+	{ 0, 0, SEQUENCE_constraint },
+	asn_MBR_E2_RIC_PolicyStyle_List_1,
+	4,	/* Elements count */
+	&asn_SPC_E2_RIC_PolicyStyle_List_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-PolicyStyle-List.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-PolicyStyle-List.h
new file mode 100644
index 0000000..3493fe4
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-PolicyStyle-List.h
@@ -0,0 +1,59 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_RIC_PolicyStyle_List_H_
+#define	_E2_RIC_PolicyStyle_List_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_RIC-Style-Type.h"
+#include "E2_RIC-Style-Name.h"
+#include "E2_RIC-Format-Type.h"
+#include "asn_SEQUENCE_OF.h"
+#include "constr_SEQUENCE_OF.h"
+#include "constr_SEQUENCE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct E2_RANparameterDef_Item;
+
+/* E2_RIC-PolicyStyle-List */
+typedef struct E2_RIC_PolicyStyle_List {
+	E2_RIC_Style_Type_t	 ric_PolicyStyle_Type;
+	E2_RIC_Style_Name_t	 ric_PolicyStyle_Name;
+	E2_RIC_Format_Type_t	 ric_PolicyActionFormat_Type;
+	struct E2_RIC_PolicyStyle_List__ric_PolicyRanParameterDef_List {
+		A_SEQUENCE_OF(struct E2_RANparameterDef_Item) list;
+		
+		/* Context for parsing across buffer boundaries */
+		asn_struct_ctx_t _asn_ctx;
+	} ric_PolicyRanParameterDef_List;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_RIC_PolicyStyle_List_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_RIC_PolicyStyle_List;
+extern asn_SEQUENCE_specifics_t asn_SPC_E2_RIC_PolicyStyle_List_specs_1;
+extern asn_TYPE_member_t asn_MBR_E2_RIC_PolicyStyle_List_1[4];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_RIC_PolicyStyle_List_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-ReportStyle-List.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-ReportStyle-List.c
new file mode 100644
index 0000000..2148fc5
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-ReportStyle-List.c
@@ -0,0 +1,174 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_RIC-ReportStyle-List.h"
+
+#include "E2_RANparameterDef-Item.h"
+static int
+memb_E2_ric_ReportRanParameterDef_List_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	/* Determine the number of elements */
+	size = _A_CSEQUENCE_FROM_VOID(sptr)->count;
+	
+	if((size >= 1 && size <= 255)) {
+		/* Perform validation of the inner elements */
+		return td->encoding_constraints.general_constraints(td, sptr, ctfailcb, app_key);
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static asn_per_constraints_t asn_PER_type_E2_ric_ReportRanParameterDef_List_constr_5 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 8,  8,  1,  255 }	/* (SIZE(1..255)) */,
+	0, 0	/* No PER value map */
+};
+static asn_per_constraints_t asn_PER_memb_E2_ric_ReportRanParameterDef_List_constr_5 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 8,  8,  1,  255 }	/* (SIZE(1..255)) */,
+	0, 0	/* No PER value map */
+};
+static asn_TYPE_member_t asn_MBR_E2_ric_ReportRanParameterDef_List_5[] = {
+	{ ATF_POINTER, 0, 0,
+		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		0,
+		&asn_DEF_E2_RANparameterDef_Item,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		""
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_ric_ReportRanParameterDef_List_tags_5[] = {
+	(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static asn_SET_OF_specifics_t asn_SPC_E2_ric_ReportRanParameterDef_List_specs_5 = {
+	sizeof(struct E2_RIC_ReportStyle_List__ric_ReportRanParameterDef_List),
+	offsetof(struct E2_RIC_ReportStyle_List__ric_ReportRanParameterDef_List, _asn_ctx),
+	0,	/* XER encoding is XMLDelimitedItemList */
+};
+static /* Use -fall-defs-global to expose */
+asn_TYPE_descriptor_t asn_DEF_E2_ric_ReportRanParameterDef_List_5 = {
+	"ric-ReportRanParameterDef-List",
+	"ric-ReportRanParameterDef-List",
+	&asn_OP_SEQUENCE_OF,
+	asn_DEF_E2_ric_ReportRanParameterDef_List_tags_5,
+	sizeof(asn_DEF_E2_ric_ReportRanParameterDef_List_tags_5)
+		/sizeof(asn_DEF_E2_ric_ReportRanParameterDef_List_tags_5[0]) - 1, /* 1 */
+	asn_DEF_E2_ric_ReportRanParameterDef_List_tags_5,	/* Same as above */
+	sizeof(asn_DEF_E2_ric_ReportRanParameterDef_List_tags_5)
+		/sizeof(asn_DEF_E2_ric_ReportRanParameterDef_List_tags_5[0]), /* 2 */
+	{ 0, &asn_PER_type_E2_ric_ReportRanParameterDef_List_constr_5, SEQUENCE_OF_constraint },
+	asn_MBR_E2_ric_ReportRanParameterDef_List_5,
+	1,	/* Single element */
+	&asn_SPC_E2_ric_ReportRanParameterDef_List_specs_5	/* Additional specs */
+};
+
+asn_TYPE_member_t asn_MBR_E2_RIC_ReportStyle_List_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_ReportStyle_List, ric_ReportStyle_Type),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Style_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-ReportStyle-Type"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_ReportStyle_List, ric_ReportStyle_Name),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Style_Name,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-ReportStyle-Name"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_ReportStyle_List, ric_ReportActionFormat_Type),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Format_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-ReportActionFormat-Type"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_ReportStyle_List, ric_ReportRanParameterDef_List),
+		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
+		0,
+		&asn_DEF_E2_ric_ReportRanParameterDef_List_5,
+		0,
+		{ 0, &asn_PER_memb_E2_ric_ReportRanParameterDef_List_constr_5,  memb_E2_ric_ReportRanParameterDef_List_constraint_1 },
+		0, 0, /* No default value */
+		"ric-ReportRanParameterDef-List"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_ReportStyle_List, ric_IndicationHeaderFormat_Type),
+		(ASN_TAG_CLASS_CONTEXT | (4 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Format_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-IndicationHeaderFormat-Type"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_ReportStyle_List, ric_IndicationMessageFormat_Type),
+		(ASN_TAG_CLASS_CONTEXT | (5 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Format_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-IndicationMessageFormat-Type"
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_RIC_ReportStyle_List_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_RIC_ReportStyle_List_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* ric-ReportStyle-Type */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* ric-ReportStyle-Name */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* ric-ReportActionFormat-Type */
+    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 }, /* ric-ReportRanParameterDef-List */
+    { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 4, 0, 0 }, /* ric-IndicationHeaderFormat-Type */
+    { (ASN_TAG_CLASS_CONTEXT | (5 << 2)), 5, 0, 0 } /* ric-IndicationMessageFormat-Type */
+};
+asn_SEQUENCE_specifics_t asn_SPC_E2_RIC_ReportStyle_List_specs_1 = {
+	sizeof(struct E2_RIC_ReportStyle_List),
+	offsetof(struct E2_RIC_ReportStyle_List, _asn_ctx),
+	asn_MAP_E2_RIC_ReportStyle_List_tag2el_1,
+	6,	/* Count of tags in the map */
+	0, 0, 0,	/* Optional elements (not needed) */
+	6,	/* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_RIC_ReportStyle_List = {
+	"RIC-ReportStyle-List",
+	"RIC-ReportStyle-List",
+	&asn_OP_SEQUENCE,
+	asn_DEF_E2_RIC_ReportStyle_List_tags_1,
+	sizeof(asn_DEF_E2_RIC_ReportStyle_List_tags_1)
+		/sizeof(asn_DEF_E2_RIC_ReportStyle_List_tags_1[0]), /* 1 */
+	asn_DEF_E2_RIC_ReportStyle_List_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_RIC_ReportStyle_List_tags_1)
+		/sizeof(asn_DEF_E2_RIC_ReportStyle_List_tags_1[0]), /* 1 */
+	{ 0, 0, SEQUENCE_constraint },
+	asn_MBR_E2_RIC_ReportStyle_List_1,
+	6,	/* Elements count */
+	&asn_SPC_E2_RIC_ReportStyle_List_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-ReportStyle-List.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-ReportStyle-List.h
new file mode 100644
index 0000000..ce66906
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-ReportStyle-List.h
@@ -0,0 +1,61 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_RIC_ReportStyle_List_H_
+#define	_E2_RIC_ReportStyle_List_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_RIC-Style-Type.h"
+#include "E2_RIC-Style-Name.h"
+#include "E2_RIC-Format-Type.h"
+#include "asn_SEQUENCE_OF.h"
+#include "constr_SEQUENCE_OF.h"
+#include "constr_SEQUENCE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct E2_RANparameterDef_Item;
+
+/* E2_RIC-ReportStyle-List */
+typedef struct E2_RIC_ReportStyle_List {
+	E2_RIC_Style_Type_t	 ric_ReportStyle_Type;
+	E2_RIC_Style_Name_t	 ric_ReportStyle_Name;
+	E2_RIC_Format_Type_t	 ric_ReportActionFormat_Type;
+	struct E2_RIC_ReportStyle_List__ric_ReportRanParameterDef_List {
+		A_SEQUENCE_OF(struct E2_RANparameterDef_Item) list;
+		
+		/* Context for parsing across buffer boundaries */
+		asn_struct_ctx_t _asn_ctx;
+	} ric_ReportRanParameterDef_List;
+	E2_RIC_Format_Type_t	 ric_IndicationHeaderFormat_Type;
+	E2_RIC_Format_Type_t	 ric_IndicationMessageFormat_Type;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_RIC_ReportStyle_List_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_RIC_ReportStyle_List;
+extern asn_SEQUENCE_specifics_t asn_SPC_E2_RIC_ReportStyle_List_specs_1;
+extern asn_TYPE_member_t asn_MBR_E2_RIC_ReportStyle_List_1[6];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_RIC_ReportStyle_List_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-Style-Name.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-Style-Name.c
new file mode 100644
index 0000000..656abfb
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-Style-Name.c
@@ -0,0 +1,106 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_RIC-Style-Name.h"
+
+static const int permitted_alphabet_table_1[256] = {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/*                  */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/*                  */
+ 1, 0, 0, 0, 0, 0, 0, 2, 3, 4, 0, 5, 6, 7, 8, 9,	/* .      '() +,-./ */
+10,11,12,13,14,15,16,17,18,19,20, 0, 0,21, 0,22,	/* 0123456789:  = ? */
+ 0,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,	/*  ABCDEFGHIJKLMNO */
+38,39,40,41,42,43,44,45,46,47,48, 0, 0, 0, 0, 0,	/* PQRSTUVWXYZ      */
+ 0,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,	/*  abcdefghijklmno */
+64,65,66,67,68,69,70,71,72,73,74, 0, 0, 0, 0, 0,	/* pqrstuvwxyz      */
+};
+static const int permitted_alphabet_code2value_1[74] = {
+32,39,40,41,43,44,45,46,47,48,49,50,51,52,53,54,
+55,56,57,58,61,63,65,66,67,68,69,70,71,72,73,74,
+75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,
+97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,
+113,114,115,116,117,118,119,120,121,122,};
+
+
+static int check_permitted_alphabet_1(const void *sptr) {
+	const int *table = permitted_alphabet_table_1;
+	/* The underlying type is PrintableString */
+	const PrintableString_t *st = (const PrintableString_t *)sptr;
+	const uint8_t *ch = st->buf;
+	const uint8_t *end = ch + st->size;
+	
+	for(; ch < end; ch++) {
+		uint8_t cv = *ch;
+		if(!table[cv]) return -1;
+	}
+	return 0;
+}
+
+int
+E2_RIC_Style_Name_constraint(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	const PrintableString_t *st = (const PrintableString_t *)sptr;
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	size = st->size;
+	
+	if((size >= 1 && size <= 150)
+		 && !check_permitted_alphabet_1(st)) {
+		/* Constraint check succeeded */
+		return 0;
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static int asn_PER_MAP_E2_RIC_Style_Name_1_v2c(unsigned int value) {
+	if(value >= sizeof(permitted_alphabet_table_1)/sizeof(permitted_alphabet_table_1[0]))
+		return -1;
+	return permitted_alphabet_table_1[value] - 1;
+}
+static int asn_PER_MAP_E2_RIC_Style_Name_1_c2v(unsigned int code) {
+	if(code >= sizeof(permitted_alphabet_code2value_1)/sizeof(permitted_alphabet_code2value_1[0]))
+		return -1;
+	return permitted_alphabet_code2value_1[code];
+}
+/*
+ * This type is implemented using PrintableString,
+ * so here we adjust the DEF accordingly.
+ */
+asn_per_constraints_t asn_PER_type_E2_RIC_Style_Name_constr_1 CC_NOTUSED = {
+	{ APC_CONSTRAINED,	 7,  7,  32,  122 }	/* (32..122) */,
+	{ APC_CONSTRAINED | APC_EXTENSIBLE,  8,  8,  1,  150 }	/* (SIZE(1..150,...)) */,
+	asn_PER_MAP_E2_RIC_Style_Name_1_v2c,	/* Value to PER code map */
+	asn_PER_MAP_E2_RIC_Style_Name_1_c2v	/* PER code to value map */
+};
+static const ber_tlv_tag_t asn_DEF_E2_RIC_Style_Name_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (19 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_E2_RIC_Style_Name = {
+	"RIC-Style-Name",
+	"RIC-Style-Name",
+	&asn_OP_PrintableString,
+	asn_DEF_E2_RIC_Style_Name_tags_1,
+	sizeof(asn_DEF_E2_RIC_Style_Name_tags_1)
+		/sizeof(asn_DEF_E2_RIC_Style_Name_tags_1[0]), /* 1 */
+	asn_DEF_E2_RIC_Style_Name_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_RIC_Style_Name_tags_1)
+		/sizeof(asn_DEF_E2_RIC_Style_Name_tags_1[0]), /* 1 */
+	{ 0, &asn_PER_type_E2_RIC_Style_Name_constr_1, E2_RIC_Style_Name_constraint },
+	0, 0,	/* No members */
+	0	/* No specifics */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-Style-Name.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-Style-Name.h
new file mode 100644
index 0000000..abb539b
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-Style-Name.h
@@ -0,0 +1,44 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_RIC_Style_Name_H_
+#define	_E2_RIC_Style_Name_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "PrintableString.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_RIC-Style-Name */
+typedef PrintableString_t	 E2_RIC_Style_Name_t;
+
+/* Implementation */
+extern asn_per_constraints_t asn_PER_type_E2_RIC_Style_Name_constr_1;
+extern asn_TYPE_descriptor_t asn_DEF_E2_RIC_Style_Name;
+asn_struct_free_f E2_RIC_Style_Name_free;
+asn_struct_print_f E2_RIC_Style_Name_print;
+asn_constr_check_f E2_RIC_Style_Name_constraint;
+ber_type_decoder_f E2_RIC_Style_Name_decode_ber;
+der_type_encoder_f E2_RIC_Style_Name_encode_der;
+xer_type_decoder_f E2_RIC_Style_Name_decode_xer;
+xer_type_encoder_f E2_RIC_Style_Name_encode_xer;
+per_type_decoder_f E2_RIC_Style_Name_decode_uper;
+per_type_encoder_f E2_RIC_Style_Name_encode_uper;
+per_type_decoder_f E2_RIC_Style_Name_decode_aper;
+per_type_encoder_f E2_RIC_Style_Name_encode_aper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_RIC_Style_Name_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-Style-Type.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-Style-Type.c
new file mode 100644
index 0000000..b1eeb8d
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-Style-Type.c
@@ -0,0 +1,31 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_RIC-Style-Type.h"
+
+/*
+ * This type is implemented using NativeInteger,
+ * so here we adjust the DEF accordingly.
+ */
+static const ber_tlv_tag_t asn_DEF_E2_RIC_Style_Type_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (2 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_E2_RIC_Style_Type = {
+	"RIC-Style-Type",
+	"RIC-Style-Type",
+	&asn_OP_NativeInteger,
+	asn_DEF_E2_RIC_Style_Type_tags_1,
+	sizeof(asn_DEF_E2_RIC_Style_Type_tags_1)
+		/sizeof(asn_DEF_E2_RIC_Style_Type_tags_1[0]), /* 1 */
+	asn_DEF_E2_RIC_Style_Type_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_RIC_Style_Type_tags_1)
+		/sizeof(asn_DEF_E2_RIC_Style_Type_tags_1[0]), /* 1 */
+	{ 0, 0, NativeInteger_constraint },
+	0, 0,	/* No members */
+	0	/* No specifics */
+};
+
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-Style-Type.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-Style-Type.h
new file mode 100644
index 0000000..6572e54
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_RIC-Style-Type.h
@@ -0,0 +1,43 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-NRT-IEs"
+ * 	found in "spec/e2sm-gNB-NRT-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_RIC_Style_Type_H_
+#define	_E2_RIC_Style_Type_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "NativeInteger.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_RIC-Style-Type */
+typedef long	 E2_RIC_Style_Type_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_RIC_Style_Type;
+asn_struct_free_f E2_RIC_Style_Type_free;
+asn_struct_print_f E2_RIC_Style_Type_print;
+asn_constr_check_f E2_RIC_Style_Type_constraint;
+ber_type_decoder_f E2_RIC_Style_Type_decode_ber;
+der_type_encoder_f E2_RIC_Style_Type_encode_der;
+xer_type_decoder_f E2_RIC_Style_Type_decode_xer;
+xer_type_encoder_f E2_RIC_Style_Type_encode_xer;
+per_type_decoder_f E2_RIC_Style_Type_decode_uper;
+per_type_encoder_f E2_RIC_Style_Type_encode_uper;
+per_type_decoder_f E2_RIC_Style_Type_decode_aper;
+per_type_encoder_f E2_RIC_Style_Type_encode_aper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_RIC_Style_Type_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_asn_constant.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_asn_constant.h
similarity index 64%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_asn_constant.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/E2_asn_constant.h
index 6ffc611..1bc1f28 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_asn_constant.h
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/E2_asn_constant.h
@@ -9,11 +9,10 @@
 extern "C" {
 #endif
 
-#define E2_maxProtocolIEs (65535)
-#define E2_maxofInterfaceProtocolIE (15)
-#define E2_maxofUEgroup (15)
-#define E2_maxofActionParameters (255)
+#define E2_maxofCellinRAN (16384)
+#define E2_maxNoOfNeighbours (1024)
 #define E2_maxofRANParameters (255)
+#define E2_maxofRICstyles (63)
 
 
 #ifdef __cplusplus
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/INTEGER.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/INTEGER.c
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/INTEGER.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/INTEGER.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/INTEGER.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/INTEGER.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/INTEGER.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/INTEGER.h
diff --git a/3rdparty/E2SM-gNB-NRT_V4.0.1/Makefile.am.libasncodec b/3rdparty/E2SM-gNB-NRT_V4.0.1/Makefile.am.libasncodec
new file mode 100644
index 0000000..10b6b09
--- /dev/null
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/Makefile.am.libasncodec
@@ -0,0 +1,161 @@
+ASN_MODULE_SRCS=	\
+	E2_ECGI.c	\
+	E2_EUTRANCellIdentifier.c	\
+	E2_NRCellIdentifier.c	\
+	E2_NRCGI.c	\
+	E2_PLMN-Identity.c	\
+	E2_E2SM-gNB-NRT-EventTriggerDefinition.c	\
+	E2_E2SM-gNB-NRT-EventTriggerDefinition-Format1.c	\
+	E2_E2SM-gNB-NRT-ActionDefinition.c	\
+	E2_E2SM-gNB-NRT-ActionDefinition-Format1.c	\
+	E2_E2SM-gNB-NRT-IndicationHeader.c	\
+	E2_E2SM-gNB-NRT-IndicationHeader-Format1.c	\
+	E2_E2SM-gNB-NRT-IndicationMessage.c	\
+	E2_NRT-Record-row-item.c	\
+	E2_NRT-Record-List-item.c	\
+	E2_E2SM-gNB-NRT-IndicationMessage-Format1.c	\
+	E2_E2SM-gNB-NRT-ControlHeader.c	\
+	E2_E2SM-gNB-NRT-ControlHeader-Format1.c	\
+	E2_E2SM-gNB-NRT-ControlMessage.c	\
+	E2_E2SM-gNB-NRT-ControlMessage-Format1.c	\
+	E2_E2SM-gNB-NRT-RANfunction-Definition.c	\
+	E2_NRT-Cell-ID.c	\
+	E2_NRT-ControlCommand.c	\
+	E2_NRT-TableRecord.c	\
+	E2_NRT-TimeStamp.c	\
+	E2_NRT-TriggerNature.c	\
+	E2_RANfunction-Name.c	\
+	E2_RANparameter-Item.c	\
+	E2_RANparameterDef-Item.c	\
+	E2_RANparameter-ID.c	\
+	E2_RANparameter-Name.c	\
+	E2_RANparameter-Test.c	\
+	E2_RANparameter-Type.c	\
+	E2_RANparameter-Value.c	\
+	E2_RIC-ControlStyle-List.c	\
+	E2_RIC-EventTriggerStyle-List.c	\
+	E2_RIC-InsertStyle-List.c	\
+	E2_RIC-PolicyStyle-List.c	\
+	E2_RIC-ReportStyle-List.c	\
+	E2_RIC-Format-Type.c	\
+	E2_RIC-Style-Type.c	\
+	E2_RIC-Style-Name.c
+
+ASN_MODULE_HDRS=	\
+	E2_ECGI.h	\
+	E2_EUTRANCellIdentifier.h	\
+	E2_NRCellIdentifier.h	\
+	E2_NRCGI.h	\
+	E2_PLMN-Identity.h	\
+	E2_E2SM-gNB-NRT-EventTriggerDefinition.h	\
+	E2_E2SM-gNB-NRT-EventTriggerDefinition-Format1.h	\
+	E2_E2SM-gNB-NRT-ActionDefinition.h	\
+	E2_E2SM-gNB-NRT-ActionDefinition-Format1.h	\
+	E2_E2SM-gNB-NRT-IndicationHeader.h	\
+	E2_E2SM-gNB-NRT-IndicationHeader-Format1.h	\
+	E2_E2SM-gNB-NRT-IndicationMessage.h	\
+	E2_NRT-Record-row-item.h	\
+	E2_NRT-Record-List-item.h	\
+	E2_E2SM-gNB-NRT-IndicationMessage-Format1.h	\
+	E2_E2SM-gNB-NRT-ControlHeader.h	\
+	E2_E2SM-gNB-NRT-ControlHeader-Format1.h	\
+	E2_E2SM-gNB-NRT-ControlMessage.h	\
+	E2_E2SM-gNB-NRT-ControlMessage-Format1.h	\
+	E2_E2SM-gNB-NRT-RANfunction-Definition.h	\
+	E2_NRT-Cell-ID.h	\
+	E2_NRT-ControlCommand.h	\
+	E2_NRT-TableRecord.h	\
+	E2_NRT-TimeStamp.h	\
+	E2_NRT-TriggerNature.h	\
+	E2_RANfunction-Name.h	\
+	E2_RANparameter-Item.h	\
+	E2_RANparameterDef-Item.h	\
+	E2_RANparameter-ID.h	\
+	E2_RANparameter-Name.h	\
+	E2_RANparameter-Test.h	\
+	E2_RANparameter-Type.h	\
+	E2_RANparameter-Value.h	\
+	E2_RIC-ControlStyle-List.h	\
+	E2_RIC-EventTriggerStyle-List.h	\
+	E2_RIC-InsertStyle-List.h	\
+	E2_RIC-PolicyStyle-List.h	\
+	E2_RIC-ReportStyle-List.h	\
+	E2_RIC-Format-Type.h	\
+	E2_RIC-Style-Type.h	\
+	E2_RIC-Style-Name.h
+
+ASN_MODULE_HDRS+=OPEN_TYPE.h
+ASN_MODULE_SRCS+=OPEN_TYPE.c
+ASN_MODULE_HDRS+=constr_CHOICE.h
+ASN_MODULE_HDRS+=BOOLEAN.h
+ASN_MODULE_SRCS+=BOOLEAN.c
+ASN_MODULE_HDRS+=INTEGER.h
+ASN_MODULE_SRCS+=INTEGER.c
+ASN_MODULE_HDRS+=NativeEnumerated.h
+ASN_MODULE_SRCS+=NativeEnumerated.c
+ASN_MODULE_HDRS+=NativeInteger.h
+ASN_MODULE_SRCS+=NativeInteger.c
+ASN_MODULE_HDRS+=PrintableString.h
+ASN_MODULE_SRCS+=PrintableString.c
+ASN_MODULE_HDRS+=OCTET_STRING.h
+ASN_MODULE_HDRS+=asn_SEQUENCE_OF.h
+ASN_MODULE_SRCS+=asn_SEQUENCE_OF.c
+ASN_MODULE_HDRS+=asn_SET_OF.h
+ASN_MODULE_SRCS+=asn_SET_OF.c
+ASN_MODULE_SRCS+=constr_CHOICE.c
+ASN_MODULE_HDRS+=constr_SEQUENCE.h
+ASN_MODULE_SRCS+=constr_SEQUENCE.c
+ASN_MODULE_HDRS+=constr_SEQUENCE_OF.h
+ASN_MODULE_SRCS+=constr_SEQUENCE_OF.c
+ASN_MODULE_HDRS+=constr_SET_OF.h
+ASN_MODULE_SRCS+=constr_SET_OF.c
+ASN_MODULE_HDRS+=asn_application.h
+ASN_MODULE_SRCS+=asn_application.c
+ASN_MODULE_HDRS+=asn_ioc.h
+ASN_MODULE_HDRS+=asn_system.h
+ASN_MODULE_HDRS+=asn_codecs.h
+ASN_MODULE_HDRS+=asn_internal.h
+ASN_MODULE_SRCS+=asn_internal.c
+ASN_MODULE_HDRS+=asn_random_fill.h
+ASN_MODULE_SRCS+=asn_random_fill.c
+ASN_MODULE_HDRS+=asn_bit_data.h
+ASN_MODULE_SRCS+=asn_bit_data.c
+ASN_MODULE_SRCS+=OCTET_STRING.c
+ASN_MODULE_HDRS+=BIT_STRING.h
+ASN_MODULE_SRCS+=BIT_STRING.c
+ASN_MODULE_SRCS+=asn_codecs_prim.c
+ASN_MODULE_HDRS+=asn_codecs_prim.h
+ASN_MODULE_HDRS+=ber_tlv_length.h
+ASN_MODULE_SRCS+=ber_tlv_length.c
+ASN_MODULE_HDRS+=ber_tlv_tag.h
+ASN_MODULE_SRCS+=ber_tlv_tag.c
+ASN_MODULE_HDRS+=ber_decoder.h
+ASN_MODULE_SRCS+=ber_decoder.c
+ASN_MODULE_HDRS+=der_encoder.h
+ASN_MODULE_SRCS+=der_encoder.c
+ASN_MODULE_HDRS+=constr_TYPE.h
+ASN_MODULE_SRCS+=constr_TYPE.c
+ASN_MODULE_HDRS+=constraints.h
+ASN_MODULE_SRCS+=constraints.c
+ASN_MODULE_HDRS+=xer_support.h
+ASN_MODULE_SRCS+=xer_support.c
+ASN_MODULE_HDRS+=xer_decoder.h
+ASN_MODULE_SRCS+=xer_decoder.c
+ASN_MODULE_HDRS+=xer_encoder.h
+ASN_MODULE_SRCS+=xer_encoder.c
+ASN_MODULE_HDRS+=per_support.h
+ASN_MODULE_SRCS+=per_support.c
+ASN_MODULE_HDRS+=per_decoder.h
+ASN_MODULE_SRCS+=per_decoder.c
+ASN_MODULE_HDRS+=per_encoder.h
+ASN_MODULE_SRCS+=per_encoder.c
+ASN_MODULE_HDRS+=per_opentype.h
+ASN_MODULE_SRCS+=per_opentype.c
+
+ASN_MODULE_CFLAGS=-DASN_DISABLE_OER_SUPPORT 
+
+lib_LTLIBRARIES+=libasncodec.la
+libasncodec_la_SOURCES=$(ASN_MODULE_SRCS) $(ASN_MODULE_HDRS)
+libasncodec_la_CPPFLAGS=-I$(top_srcdir)/
+libasncodec_la_CFLAGS=$(ASN_MODULE_CFLAGS)
+libasncodec_la_LDFLAGS=-lm
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/NativeEnumerated.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/NativeEnumerated.c
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/NativeEnumerated.c
rename to 3rdparty/E2SM-gNB-NRT_V4.0.1/NativeEnumerated.c
index 50ffb1d..800da97 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/NativeEnumerated.c
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/NativeEnumerated.c
@@ -97,7 +97,7 @@
     const asn_INTEGER_specifics_t *specs = td->specifics;
     asn_dec_rval_t rval = { RC_OK, 0 };
 	long *native = (long *)*sptr;
-	const asn_per_constraint_t *ct = NULL;
+	const asn_per_constraint_t *ct;
 	long value;
 
 	(void)opt_codec_ctx;
@@ -115,7 +115,7 @@
 
 	ASN_DEBUG("Decoding %s as NativeEnumerated", td->name);
 
-	if(ct && ct->flags & APC_EXTENSIBLE) {
+	if(ct->flags & APC_EXTENSIBLE) {
 		int inext = per_get_few_bits(pd, 1);
 		if(inext < 0) ASN__DECODE_STARVED;
 		if(inext) ct = 0;
@@ -165,7 +165,7 @@
         (const asn_INTEGER_specifics_t *)td->specifics;
 	asn_enc_rval_t er = {0,0,0};
 	long native, value;
-	const asn_per_constraint_t *ct = NULL;
+	const asn_per_constraint_t *ct;
 	int inext = 0;
 	asn_INTEGER_enum_map_t key;
 	const asn_INTEGER_enum_map_t *kf;
@@ -193,13 +193,13 @@
 	}
 	value = kf - specs->value2enum;
 
-	if(ct && ct->range_bits >= 0) {
+	if(ct->range_bits >= 0) {
 		int cmpWith = specs->extension
 				? specs->extension - 1 : specs->map_count;
 		if(value >= cmpWith)
 			inext = 1;
 	}
-	if(ct && ct->flags & APC_EXTENSIBLE) {
+	if(ct->flags & APC_EXTENSIBLE) {
 		if(per_put_few_bits(po, inext, 1))
 			ASN__ENCODE_FAILED;
 		if(inext) ct = 0;
@@ -236,7 +236,7 @@
 	const asn_INTEGER_specifics_t *specs = (const asn_INTEGER_specifics_t *)td->specifics;
 	asn_dec_rval_t rval = { RC_OK, 0 };
 	long *native = (long *)*sptr;
-	const asn_per_constraint_t *ct = NULL;
+	const asn_per_constraint_t *ct;
 	long value;
 
 	(void)opt_codec_ctx;
@@ -254,7 +254,7 @@
 
 	ASN_DEBUG("Decoding %s as NativeEnumerated", td->name);
 
-	if(ct && ct->flags & APC_EXTENSIBLE) {
+	if(ct->flags & APC_EXTENSIBLE) {
 		int inext = per_get_few_bits(pd, 1);
 		if(inext < 0) ASN__DECODE_STARVED;
 		if(inext) ct = 0;
@@ -302,7 +302,7 @@
 	const asn_INTEGER_specifics_t *specs = (const asn_INTEGER_specifics_t *)td->specifics;
 	asn_enc_rval_t er = {0,0,0};
 	long native, value;
-	const asn_per_constraint_t *ct = NULL;
+	const asn_per_constraint_t *ct;
 	int inext = 0;
 	asn_INTEGER_enum_map_t key;
 	asn_INTEGER_enum_map_t *kf;
@@ -331,13 +331,13 @@
 	}
 	value = kf - specs->value2enum;
 
-	if(ct && ct->range_bits >= 0) {
+	if(ct->range_bits >= 0) {
 		int cmpWith = specs->extension
 		              ? specs->extension - 1 : specs->map_count;
 		if(value >= cmpWith)
 			inext = 1;
 	}
-	if(ct && ct->flags & APC_EXTENSIBLE) {
+	if(ct->flags & APC_EXTENSIBLE) {
 		if(per_put_few_bits(po, inext, 1))
 			ASN__ENCODE_FAILED;
 		if(inext) ct = 0;
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/NativeEnumerated.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/NativeEnumerated.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/NativeEnumerated.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/NativeEnumerated.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/NativeInteger.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/NativeInteger.c
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/NativeInteger.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/NativeInteger.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/NativeInteger.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/NativeInteger.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/NativeInteger.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/NativeInteger.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/OCTET_STRING.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/OCTET_STRING.c
similarity index 99%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/OCTET_STRING.c
rename to 3rdparty/E2SM-gNB-NRT_V4.0.1/OCTET_STRING.c
index ae34c96..432ce5a 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/OCTET_STRING.c
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/OCTET_STRING.c
@@ -157,7 +157,7 @@
 		nel = (struct _stack_el *)CALLOC(1, sizeof(struct _stack_el));
 		if(nel == NULL)
 			return NULL;
-
+	
 		if(st->tail) {
 			/* Increase a subcontainment depth */
 			nel->cont_level = st->tail->cont_level + 1;
@@ -745,7 +745,7 @@
 			return 0;
 		}
 	}
-
+	
 	return -1;	/* No, it's not */
 }
 
@@ -1956,9 +1956,7 @@
 		        ret = aper_put_length(po, csiz->upper_bound - csiz->lower_bound + 1, sizeinunits - csiz->lower_bound);
 		        if(ret) ASN__ENCODE_FAILED;
 		}
-		/* EB MOD
-                   AFAIU if lb != ub it is aligned whatever the number of bits */
-		if ((st->size > 2) || (csiz->lower_bound != csiz->upper_bound)) { /* X.691 #16.11 */
+		if (st->size > 2) { /* X.691 #16 NOTE 1 */
 			if (aper_put_align(po) < 0)
 				ASN__ENCODE_FAILED;
 		}
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/OCTET_STRING.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/OCTET_STRING.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/OCTET_STRING.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/OCTET_STRING.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/OPEN_TYPE.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/OPEN_TYPE.c
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/OPEN_TYPE.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/OPEN_TYPE.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/OPEN_TYPE.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/OPEN_TYPE.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/OPEN_TYPE.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/OPEN_TYPE.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/PrintableString.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/PrintableString.c
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/PrintableString.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/PrintableString.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/PrintableString.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/PrintableString.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/PrintableString.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/PrintableString.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_SEQUENCE_OF.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/asn_SEQUENCE_OF.c
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_SEQUENCE_OF.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/asn_SEQUENCE_OF.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_SEQUENCE_OF.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/asn_SEQUENCE_OF.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_SEQUENCE_OF.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/asn_SEQUENCE_OF.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_SET_OF.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/asn_SET_OF.c
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_SET_OF.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/asn_SET_OF.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_SET_OF.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/asn_SET_OF.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_SET_OF.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/asn_SET_OF.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_application.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/asn_application.c
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_application.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/asn_application.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_application.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/asn_application.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_application.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/asn_application.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_bit_data.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/asn_bit_data.c
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_bit_data.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/asn_bit_data.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_bit_data.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/asn_bit_data.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_bit_data.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/asn_bit_data.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_codecs.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/asn_codecs.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_codecs.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/asn_codecs.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_codecs_prim.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/asn_codecs_prim.c
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_codecs_prim.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/asn_codecs_prim.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_codecs_prim.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/asn_codecs_prim.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_codecs_prim.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/asn_codecs_prim.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_internal.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/asn_internal.c
similarity index 93%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_internal.c
rename to 3rdparty/E2SM-gNB-NRT_V4.0.1/asn_internal.c
index 004660b..1aff95f 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_internal.c
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/asn_internal.c
@@ -26,12 +26,11 @@
         buf_size <<= 1;
         if(buf == scratch) {
             buf = MALLOC(buf_size);
-            if(!buf) { va_end(args); return -1; }
+            if(!buf) return -1;
         } else {
             void *p = REALLOC(buf, buf_size);
             if(!p) {
                 FREEMEM(buf);
-		va_end(args);
                 return -1;
             }
             buf = p;
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_internal.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/asn_internal.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_internal.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/asn_internal.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_ioc.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/asn_ioc.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_ioc.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/asn_ioc.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_random_fill.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/asn_random_fill.c
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_random_fill.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/asn_random_fill.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_random_fill.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/asn_random_fill.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_random_fill.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/asn_random_fill.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_system.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/asn_system.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_system.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/asn_system.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/ber_decoder.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/ber_decoder.c
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/ber_decoder.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/ber_decoder.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/ber_decoder.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/ber_decoder.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/ber_decoder.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/ber_decoder.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/ber_tlv_length.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/ber_tlv_length.c
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/ber_tlv_length.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/ber_tlv_length.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/ber_tlv_length.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/ber_tlv_length.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/ber_tlv_length.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/ber_tlv_length.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/ber_tlv_tag.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/ber_tlv_tag.c
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/ber_tlv_tag.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/ber_tlv_tag.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/ber_tlv_tag.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/ber_tlv_tag.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/ber_tlv_tag.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/ber_tlv_tag.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/constr_CHOICE.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/constr_CHOICE.c
similarity index 95%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/constr_CHOICE.c
rename to 3rdparty/E2SM-gNB-NRT_V4.0.1/constr_CHOICE.c
index 86dcbb0..613e6ea 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/constr_CHOICE.c
+++ b/3rdparty/E2SM-gNB-NRT_V4.0.1/constr_CHOICE.c
@@ -1017,7 +1017,6 @@
 	const asn_CHOICE_specifics_t *specs = (const asn_CHOICE_specifics_t *)td->specifics;
 	asn_dec_rval_t rv;
 	const asn_per_constraint_t *ct;
-	const asn_per_constraint_t *ext_ct = NULL;
 	asn_TYPE_member_t *elm;	/* CHOICE's element */
 	void *memb_ptr;
 	void **memb_ptr2;
@@ -1043,13 +1042,9 @@
 	if(ct && ct->flags & APC_EXTENSIBLE) {
 		value = per_get_few_bits(pd, 1);
 		if(value < 0) ASN__DECODE_STARVED;
-		if(value) {
-		  ext_ct = ct;
-		  ct = 0;	/* Not restricted */
-		}
+		if(value) ct = 0;	/* Not restricted */
 	}
 
-
 	if(ct && ct->range_bits >= 0) {
 		value = per_get_few_bits(pd, ct->range_bits);
 		if(value < 0) ASN__DECODE_STARVED;
@@ -1060,7 +1055,7 @@
 	} else {
 		if(specs->ext_start == -1)
 			ASN__DECODE_FAILED;
-		value = aper_get_nsnnwn(pd, ext_ct->range_bits);
+		value = uper_get_nsnnwn(pd);
 		if(value < 0) ASN__DECODE_STARVED;
 		value += specs->ext_start;
 		if((unsigned)value >= td->elements_count)
@@ -1088,7 +1083,7 @@
 		rv = elm->type->op->aper_decoder(opt_codec_ctx, elm->type,
 		                                 elm->encoding_constraints.per_constraints, memb_ptr2, pd);
 	} else {
-		rv = aper_open_type_get(opt_codec_ctx, elm->type,
+		rv = uper_open_type_get(opt_codec_ctx, elm->type,
 		                        elm->encoding_constraints.per_constraints, memb_ptr2, pd);
 	}
 
@@ -1104,12 +1099,10 @@
                    const void *sptr, asn_per_outp_t *po) {
 	const asn_CHOICE_specifics_t *specs = (const asn_CHOICE_specifics_t *)td->specifics;
 	const asn_TYPE_member_t *elm; /* CHOICE's element */
-	const asn_per_constraint_t *ct = NULL;
-	const asn_per_constraint_t *ext_ct = NULL;
+	const asn_per_constraint_t *ct;
 	const void *memb_ptr;
-	unsigned present;
-	int present_enc;
-	
+	int present;
+
 	if(!sptr) ASN__ENCODE_FAILED;
 
 	ASN_DEBUG("Encoding %s as CHOICE using ALIGNED PER", td->name);
@@ -1117,7 +1110,7 @@
 	if(constraints) ct = &constraints->value;
 	else if(td->encoding_constraints.per_constraints)
 		ct = &td->encoding_constraints.per_constraints->value;
-	else ct = NULL;
+	else ct = 0;
 
 	present = _fetch_present_idx(sptr,
 	                             specs->pres_offset, specs->pres_size);
@@ -1133,38 +1126,25 @@
 
 	/* Adjust if canonical order is different from natural order */
 	if(specs->to_canonical_order)
-		present_enc = specs->to_canonical_order[present];
-	else
-	        present_enc = present;
-	
+		present = specs->to_canonical_order[present];
+
 	ASN_DEBUG("Encoding %s CHOICE element %d", td->name, present);
 
-	if(ct && (ct->range_bits >= 0)) {
-	  // Value is not within the range of the primary values ?
-	  if(present < ct->lower_bound || present > ct->upper_bound) {
-	    if(ct->flags & APC_EXTENSIBLE) {
-	      ASN_DEBUG("CHOICE member %d (enc %d) is an extension (%ld..%ld)",
-			present, present_enc, ct->lower_bound, ct->upper_bound);
-	      // X691/23.5 Extension marker = 1 
-	      if(per_put_few_bits(po, 1, 1)) {
-		ASN__ENCODE_FAILED;
-	      }
-	    } else {
-	      ASN__ENCODE_FAILED;
-	    }
-	    // no more need of constraint.
-	    ext_ct = ct;
-	    ct = NULL;
-	  }
+	if(ct && ct->range_bits >= 0) {
+		if(present < ct->lower_bound
+		        || present > ct->upper_bound) {
+			if(ct->flags & APC_EXTENSIBLE) {
+				if(per_put_few_bits(po, 1, 1))
+					ASN__ENCODE_FAILED;
+			} else {
+				ASN__ENCODE_FAILED;
+			}
+			ct = 0;
+		}
 	}
-	
-	if(ct && (ct->flags & APC_EXTENSIBLE)) {
-	  ASN_DEBUG("CHOICE member %d (enc %d) is not an extension (%ld..%ld)",
-		    present, present, ct->lower_bound, ct->upper_bound);
-	  // X691.23.5 Extension marker = 0
-	  if(per_put_few_bits(po, 0, 1)) {
-	    ASN__ENCODE_FAILED;
-	  }
+	if(ct && ct->flags & APC_EXTENSIBLE) {
+		if(per_put_few_bits(po, 0, 1))
+			ASN__ENCODE_FAILED;
 	}
 
 	elm = &td->elements[present];
@@ -1176,10 +1156,8 @@
 		memb_ptr = (const char *)sptr + elm->memb_offset;
 	}
 
-	if(ct && (ct->range_bits >= 0)) {
-	        // By construction (ct != 0), the alternative value is a non extended one.
-	        // X691/23.7 X691/23.6 alternative value encoded as a range_bits bits value.
-		if(per_put_few_bits(po, present_enc, ct->range_bits))
+	if(ct && ct->range_bits >= 0) {
+		if(per_put_few_bits(po, present, ct->range_bits))
 			ASN__ENCODE_FAILED;
 
 		return elm->type->op->aper_encoder(elm->type, elm->encoding_constraints.per_constraints,
@@ -1188,10 +1166,10 @@
 		asn_enc_rval_t rval = {0,0,0};
 		if(specs->ext_start == -1)
 			ASN__ENCODE_FAILED;
-		// X691/23.8 normally encoded as a small non negative whole number
-		
-		if(ext_ct && aper_put_nsnnwn(po, ext_ct->range_bits, present_enc - specs->ext_start))
+		if (ct) {
+		  if(aper_put_nsnnwn(po, ct->range_bits, present - specs->ext_start))
 			ASN__ENCODE_FAILED;
+		}
 		if(aper_open_type_put(elm->type, elm->encoding_constraints.per_constraints,
 		                      memb_ptr, po))
 			ASN__ENCODE_FAILED;
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/constr_CHOICE.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/constr_CHOICE.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/constr_CHOICE.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/constr_CHOICE.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/constr_SEQUENCE.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/constr_SEQUENCE.c
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/constr_SEQUENCE.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/constr_SEQUENCE.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/constr_SEQUENCE.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/constr_SEQUENCE.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/constr_SEQUENCE.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/constr_SEQUENCE.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/constr_SEQUENCE_OF.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/constr_SEQUENCE_OF.c
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/constr_SEQUENCE_OF.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/constr_SEQUENCE_OF.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/constr_SEQUENCE_OF.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/constr_SEQUENCE_OF.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/constr_SEQUENCE_OF.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/constr_SEQUENCE_OF.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/constr_SET_OF.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/constr_SET_OF.c
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/constr_SET_OF.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/constr_SET_OF.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/constr_SET_OF.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/constr_SET_OF.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/constr_SET_OF.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/constr_SET_OF.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/constr_TYPE.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/constr_TYPE.c
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/constr_TYPE.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/constr_TYPE.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/constr_TYPE.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/constr_TYPE.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/constr_TYPE.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/constr_TYPE.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/constraints.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/constraints.c
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/constraints.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/constraints.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/constraints.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/constraints.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/constraints.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/constraints.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/der_encoder.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/der_encoder.c
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/der_encoder.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/der_encoder.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/der_encoder.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/der_encoder.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/der_encoder.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/der_encoder.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/per_decoder.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/per_decoder.c
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/per_decoder.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/per_decoder.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/per_decoder.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/per_decoder.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/per_decoder.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/per_decoder.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/per_encoder.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/per_encoder.c
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/per_encoder.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/per_encoder.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/per_encoder.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/per_encoder.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/per_encoder.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/per_encoder.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/per_opentype.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/per_opentype.c
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/per_opentype.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/per_opentype.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/per_opentype.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/per_opentype.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/per_opentype.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/per_opentype.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/per_support.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/per_support.c
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/per_support.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/per_support.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/per_support.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/per_support.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/per_support.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/per_support.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/xer_decoder.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/xer_decoder.c
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/xer_decoder.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/xer_decoder.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/xer_decoder.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/xer_decoder.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/xer_decoder.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/xer_decoder.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/xer_encoder.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/xer_encoder.c
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/xer_encoder.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/xer_encoder.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/xer_encoder.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/xer_encoder.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/xer_encoder.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/xer_encoder.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/xer_support.c b/3rdparty/E2SM-gNB-NRT_V4.0.1/xer_support.c
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/xer_support.c
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/xer_support.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/xer_support.h b/3rdparty/E2SM-gNB-NRT_V4.0.1/xer_support.h
similarity index 100%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/xer_support.h
copy to 3rdparty/E2SM-gNB-NRT_V4.0.1/xer_support.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/BIT_STRING.c b/3rdparty/E2SM-gNB-X2-V4.0.1/BIT_STRING.c
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/BIT_STRING.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/BIT_STRING.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/BIT_STRING.h b/3rdparty/E2SM-gNB-X2-V4.0.1/BIT_STRING.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/BIT_STRING.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/BIT_STRING.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/BOOLEAN.c b/3rdparty/E2SM-gNB-X2-V4.0.1/BOOLEAN.c
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/BOOLEAN.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/BOOLEAN.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/BOOLEAN.h b/3rdparty/E2SM-gNB-X2-V4.0.1/BOOLEAN.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/BOOLEAN.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/BOOLEAN.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_ActionParameter-ID.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_ActionParameter-ID.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_ActionParameter-ID.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_ActionParameter-ID.c
index ab335da..db59bdc 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_ActionParameter-ID.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_ActionParameter-ID.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_ActionParameter-ID.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_ActionParameter-ID.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_ActionParameter-ID.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_ActionParameter-ID.h
index fc9fba2..d70eb2a 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_ActionParameter-ID.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_ActionParameter-ID.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_ActionParameter-Item.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_ActionParameter-Item.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_ActionParameter-Item.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_ActionParameter-Item.c
index b091c67..bb06117 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_ActionParameter-Item.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_ActionParameter-Item.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_ActionParameter-Item.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_ActionParameter-Item.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_ActionParameter-Item.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_ActionParameter-Item.h
index ffa44d8..17171fc 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_ActionParameter-Item.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_ActionParameter-Item.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_ActionParameter-Value.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_ActionParameter-Value.c
similarity index 98%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_ActionParameter-Value.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_ActionParameter-Value.c
index 068e748..78953c0 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_ActionParameter-Value.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_ActionParameter-Value.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_ActionParameter-Value.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_ActionParameter-Value.h
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_ActionParameter-Value.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_ActionParameter-Value.h
index 80a9384..419429a 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_ActionParameter-Value.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_ActionParameter-Value.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_CallProcess-ID.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_CallProcess-ID.c
similarity index 95%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_CallProcess-ID.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_CallProcess-ID.c
index c55745d..36de089 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_CallProcess-ID.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_CallProcess-ID.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_CallProcess-ID.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_CallProcess-ID.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_CallProcess-ID.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_CallProcess-ID.h
index 1e74aeb..f1a1293 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_CallProcess-ID.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_CallProcess-ID.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_Criticality.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_Criticality.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_Criticality.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_Criticality.c
index 19a8ee2..45e7365 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_Criticality.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_Criticality.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_Criticality.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_Criticality.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_Criticality.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_Criticality.h
index 077e78f..a23afdf 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_Criticality.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_Criticality.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-ActionDefinition-Format2.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-ActionDefinition-Format2.c
similarity index 98%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-ActionDefinition-Format2.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-ActionDefinition-Format2.c
index 56299c1..da30805 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-ActionDefinition-Format2.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-ActionDefinition-Format2.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-ActionDefinition-Format2.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-ActionDefinition-Format2.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-ActionDefinition-Format2.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-ActionDefinition-Format2.h
index 83df94f..730020f 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-ActionDefinition-Format2.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-ActionDefinition-Format2.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-ActionDefinitionChoice.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-ActionDefinitionChoice.c
similarity index 98%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-ActionDefinitionChoice.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-ActionDefinitionChoice.c
index 589d3dd..989aaae 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-ActionDefinitionChoice.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-ActionDefinitionChoice.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-ActionDefinitionChoice.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-ActionDefinitionChoice.h
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-ActionDefinitionChoice.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-ActionDefinitionChoice.h
index a3a7c2e..527b128 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-ActionDefinitionChoice.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-ActionDefinitionChoice.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-CallProcessIDChoice.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-CallProcessIDChoice.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-CallProcessIDChoice.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-CallProcessIDChoice.c
index 29c66fb..3990504 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-CallProcessIDChoice.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-CallProcessIDChoice.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-CallProcessIDChoice.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-CallProcessIDChoice.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-CallProcessIDChoice.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-CallProcessIDChoice.h
index 7fbc92b..7428d2d 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-CallProcessIDChoice.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-CallProcessIDChoice.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-ControlHeaderChoice.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-ControlHeaderChoice.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-ControlHeaderChoice.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-ControlHeaderChoice.c
index 33e7d76..a3f277e 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-ControlHeaderChoice.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-ControlHeaderChoice.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-ControlHeaderChoice.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-ControlHeaderChoice.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-ControlHeaderChoice.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-ControlHeaderChoice.h
index 77251fc..b1d79da 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-ControlHeaderChoice.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-ControlHeaderChoice.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-ControlMessageChoice.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-ControlMessageChoice.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-ControlMessageChoice.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-ControlMessageChoice.c
index 678c8ba..e480872 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-ControlMessageChoice.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-ControlMessageChoice.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-ControlMessageChoice.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-ControlMessageChoice.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-ControlMessageChoice.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-ControlMessageChoice.h
index d5f450c..50e8aa1 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-ControlMessageChoice.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-ControlMessageChoice.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-EventTriggerDefinitionChoice.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-EventTriggerDefinitionChoice.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-EventTriggerDefinitionChoice.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-EventTriggerDefinitionChoice.c
index 4f3777a..ee01b6a 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-EventTriggerDefinitionChoice.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-EventTriggerDefinitionChoice.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-EventTriggerDefinitionChoice.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-EventTriggerDefinitionChoice.h
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-EventTriggerDefinitionChoice.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-EventTriggerDefinitionChoice.h
index 8b9a66f..a631534 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-EventTriggerDefinitionChoice.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-EventTriggerDefinitionChoice.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-IndicationHeaderChoice.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-IndicationHeaderChoice.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-IndicationHeaderChoice.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-IndicationHeaderChoice.c
index 0382eff..a3711fa 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-IndicationHeaderChoice.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-IndicationHeaderChoice.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-IndicationHeaderChoice.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-IndicationHeaderChoice.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-IndicationHeaderChoice.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-IndicationHeaderChoice.h
index c8b316c..2e962c1 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-IndicationHeaderChoice.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-IndicationHeaderChoice.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-IndicationMessageChoice.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-IndicationMessageChoice.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-IndicationMessageChoice.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-IndicationMessageChoice.c
index 1824441..d0aaa62 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-IndicationMessageChoice.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-IndicationMessageChoice.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-IndicationMessageChoice.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-IndicationMessageChoice.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-IndicationMessageChoice.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-IndicationMessageChoice.h
index 000d7e5..1dfcff3 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-IndicationMessageChoice.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-IndicationMessageChoice.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-RANfunction-Definition.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-RANfunction-Definition.c
new file mode 100644
index 0000000..4b8a7c8
--- /dev/null
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-RANfunction-Definition.c
@@ -0,0 +1,472 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-X2-IEs"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_E2SM-gNB-X2-RANfunction-Definition.h"
+
+#include "E2_RIC-EventTriggerStyle-List.h"
+#include "E2_RIC-ReportStyle-List.h"
+#include "E2_RIC-InsertStyle-List.h"
+#include "E2_RIC-ControlStyle-List.h"
+#include "E2_RIC-PolicyStyle-List.h"
+static int
+memb_E2_ric_EventTriggerStyle_List_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	/* Determine the number of elements */
+	size = _A_CSEQUENCE_FROM_VOID(sptr)->count;
+	
+	if((size >= 1 && size <= 63)) {
+		/* Perform validation of the inner elements */
+		return td->encoding_constraints.general_constraints(td, sptr, ctfailcb, app_key);
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static int
+memb_E2_ric_ReportStyle_List_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	/* Determine the number of elements */
+	size = _A_CSEQUENCE_FROM_VOID(sptr)->count;
+	
+	if((size >= 1 && size <= 63)) {
+		/* Perform validation of the inner elements */
+		return td->encoding_constraints.general_constraints(td, sptr, ctfailcb, app_key);
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static int
+memb_E2_ric_InsertStyle_List_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	/* Determine the number of elements */
+	size = _A_CSEQUENCE_FROM_VOID(sptr)->count;
+	
+	if((size >= 1 && size <= 63)) {
+		/* Perform validation of the inner elements */
+		return td->encoding_constraints.general_constraints(td, sptr, ctfailcb, app_key);
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static int
+memb_E2_ric_ControlStyle_List_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	/* Determine the number of elements */
+	size = _A_CSEQUENCE_FROM_VOID(sptr)->count;
+	
+	if((size >= 1 && size <= 63)) {
+		/* Perform validation of the inner elements */
+		return td->encoding_constraints.general_constraints(td, sptr, ctfailcb, app_key);
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static int
+memb_E2_ric_PolicyStyle_List_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	/* Determine the number of elements */
+	size = _A_CSEQUENCE_FROM_VOID(sptr)->count;
+	
+	if((size >= 1 && size <= 63)) {
+		/* Perform validation of the inner elements */
+		return td->encoding_constraints.general_constraints(td, sptr, ctfailcb, app_key);
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static asn_per_constraints_t asn_PER_type_E2_ric_EventTriggerStyle_List_constr_3 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 6,  6,  1,  63 }	/* (SIZE(1..63)) */,
+	0, 0	/* No PER value map */
+};
+static asn_per_constraints_t asn_PER_type_E2_ric_ReportStyle_List_constr_5 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 6,  6,  1,  63 }	/* (SIZE(1..63)) */,
+	0, 0	/* No PER value map */
+};
+static asn_per_constraints_t asn_PER_type_E2_ric_InsertStyle_List_constr_7 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 6,  6,  1,  63 }	/* (SIZE(1..63)) */,
+	0, 0	/* No PER value map */
+};
+static asn_per_constraints_t asn_PER_type_E2_ric_ControlStyle_List_constr_9 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 6,  6,  1,  63 }	/* (SIZE(1..63)) */,
+	0, 0	/* No PER value map */
+};
+static asn_per_constraints_t asn_PER_type_E2_ric_PolicyStyle_List_constr_11 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 6,  6,  1,  63 }	/* (SIZE(1..63)) */,
+	0, 0	/* No PER value map */
+};
+static asn_per_constraints_t asn_PER_memb_E2_ric_EventTriggerStyle_List_constr_3 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 6,  6,  1,  63 }	/* (SIZE(1..63)) */,
+	0, 0	/* No PER value map */
+};
+static asn_per_constraints_t asn_PER_memb_E2_ric_ReportStyle_List_constr_5 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 6,  6,  1,  63 }	/* (SIZE(1..63)) */,
+	0, 0	/* No PER value map */
+};
+static asn_per_constraints_t asn_PER_memb_E2_ric_InsertStyle_List_constr_7 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 6,  6,  1,  63 }	/* (SIZE(1..63)) */,
+	0, 0	/* No PER value map */
+};
+static asn_per_constraints_t asn_PER_memb_E2_ric_ControlStyle_List_constr_9 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 6,  6,  1,  63 }	/* (SIZE(1..63)) */,
+	0, 0	/* No PER value map */
+};
+static asn_per_constraints_t asn_PER_memb_E2_ric_PolicyStyle_List_constr_11 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 6,  6,  1,  63 }	/* (SIZE(1..63)) */,
+	0, 0	/* No PER value map */
+};
+static asn_TYPE_member_t asn_MBR_E2_ric_EventTriggerStyle_List_3[] = {
+	{ ATF_POINTER, 0, 0,
+		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		0,
+		&asn_DEF_E2_RIC_EventTriggerStyle_List,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		""
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_ric_EventTriggerStyle_List_tags_3[] = {
+	(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static asn_SET_OF_specifics_t asn_SPC_E2_ric_EventTriggerStyle_List_specs_3 = {
+	sizeof(struct E2_E2SM_gNB_X2_RANfunction_Definition__ric_EventTriggerStyle_List),
+	offsetof(struct E2_E2SM_gNB_X2_RANfunction_Definition__ric_EventTriggerStyle_List, _asn_ctx),
+	0,	/* XER encoding is XMLDelimitedItemList */
+};
+static /* Use -fall-defs-global to expose */
+asn_TYPE_descriptor_t asn_DEF_E2_ric_EventTriggerStyle_List_3 = {
+	"ric-EventTriggerStyle-List",
+	"ric-EventTriggerStyle-List",
+	&asn_OP_SEQUENCE_OF,
+	asn_DEF_E2_ric_EventTriggerStyle_List_tags_3,
+	sizeof(asn_DEF_E2_ric_EventTriggerStyle_List_tags_3)
+		/sizeof(asn_DEF_E2_ric_EventTriggerStyle_List_tags_3[0]) - 1, /* 1 */
+	asn_DEF_E2_ric_EventTriggerStyle_List_tags_3,	/* Same as above */
+	sizeof(asn_DEF_E2_ric_EventTriggerStyle_List_tags_3)
+		/sizeof(asn_DEF_E2_ric_EventTriggerStyle_List_tags_3[0]), /* 2 */
+	{ 0, &asn_PER_type_E2_ric_EventTriggerStyle_List_constr_3, SEQUENCE_OF_constraint },
+	asn_MBR_E2_ric_EventTriggerStyle_List_3,
+	1,	/* Single element */
+	&asn_SPC_E2_ric_EventTriggerStyle_List_specs_3	/* Additional specs */
+};
+
+static asn_TYPE_member_t asn_MBR_E2_ric_ReportStyle_List_5[] = {
+	{ ATF_POINTER, 0, 0,
+		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		0,
+		&asn_DEF_E2_RIC_ReportStyle_List,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		""
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_ric_ReportStyle_List_tags_5[] = {
+	(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static asn_SET_OF_specifics_t asn_SPC_E2_ric_ReportStyle_List_specs_5 = {
+	sizeof(struct E2_E2SM_gNB_X2_RANfunction_Definition__ric_ReportStyle_List),
+	offsetof(struct E2_E2SM_gNB_X2_RANfunction_Definition__ric_ReportStyle_List, _asn_ctx),
+	0,	/* XER encoding is XMLDelimitedItemList */
+};
+static /* Use -fall-defs-global to expose */
+asn_TYPE_descriptor_t asn_DEF_E2_ric_ReportStyle_List_5 = {
+	"ric-ReportStyle-List",
+	"ric-ReportStyle-List",
+	&asn_OP_SEQUENCE_OF,
+	asn_DEF_E2_ric_ReportStyle_List_tags_5,
+	sizeof(asn_DEF_E2_ric_ReportStyle_List_tags_5)
+		/sizeof(asn_DEF_E2_ric_ReportStyle_List_tags_5[0]) - 1, /* 1 */
+	asn_DEF_E2_ric_ReportStyle_List_tags_5,	/* Same as above */
+	sizeof(asn_DEF_E2_ric_ReportStyle_List_tags_5)
+		/sizeof(asn_DEF_E2_ric_ReportStyle_List_tags_5[0]), /* 2 */
+	{ 0, &asn_PER_type_E2_ric_ReportStyle_List_constr_5, SEQUENCE_OF_constraint },
+	asn_MBR_E2_ric_ReportStyle_List_5,
+	1,	/* Single element */
+	&asn_SPC_E2_ric_ReportStyle_List_specs_5	/* Additional specs */
+};
+
+static asn_TYPE_member_t asn_MBR_E2_ric_InsertStyle_List_7[] = {
+	{ ATF_POINTER, 0, 0,
+		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		0,
+		&asn_DEF_E2_RIC_InsertStyle_List,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		""
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_ric_InsertStyle_List_tags_7[] = {
+	(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static asn_SET_OF_specifics_t asn_SPC_E2_ric_InsertStyle_List_specs_7 = {
+	sizeof(struct E2_E2SM_gNB_X2_RANfunction_Definition__ric_InsertStyle_List),
+	offsetof(struct E2_E2SM_gNB_X2_RANfunction_Definition__ric_InsertStyle_List, _asn_ctx),
+	0,	/* XER encoding is XMLDelimitedItemList */
+};
+static /* Use -fall-defs-global to expose */
+asn_TYPE_descriptor_t asn_DEF_E2_ric_InsertStyle_List_7 = {
+	"ric-InsertStyle-List",
+	"ric-InsertStyle-List",
+	&asn_OP_SEQUENCE_OF,
+	asn_DEF_E2_ric_InsertStyle_List_tags_7,
+	sizeof(asn_DEF_E2_ric_InsertStyle_List_tags_7)
+		/sizeof(asn_DEF_E2_ric_InsertStyle_List_tags_7[0]) - 1, /* 1 */
+	asn_DEF_E2_ric_InsertStyle_List_tags_7,	/* Same as above */
+	sizeof(asn_DEF_E2_ric_InsertStyle_List_tags_7)
+		/sizeof(asn_DEF_E2_ric_InsertStyle_List_tags_7[0]), /* 2 */
+	{ 0, &asn_PER_type_E2_ric_InsertStyle_List_constr_7, SEQUENCE_OF_constraint },
+	asn_MBR_E2_ric_InsertStyle_List_7,
+	1,	/* Single element */
+	&asn_SPC_E2_ric_InsertStyle_List_specs_7	/* Additional specs */
+};
+
+static asn_TYPE_member_t asn_MBR_E2_ric_ControlStyle_List_9[] = {
+	{ ATF_POINTER, 0, 0,
+		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		0,
+		&asn_DEF_E2_RIC_ControlStyle_List,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		""
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_ric_ControlStyle_List_tags_9[] = {
+	(ASN_TAG_CLASS_CONTEXT | (4 << 2)),
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static asn_SET_OF_specifics_t asn_SPC_E2_ric_ControlStyle_List_specs_9 = {
+	sizeof(struct E2_E2SM_gNB_X2_RANfunction_Definition__ric_ControlStyle_List),
+	offsetof(struct E2_E2SM_gNB_X2_RANfunction_Definition__ric_ControlStyle_List, _asn_ctx),
+	0,	/* XER encoding is XMLDelimitedItemList */
+};
+static /* Use -fall-defs-global to expose */
+asn_TYPE_descriptor_t asn_DEF_E2_ric_ControlStyle_List_9 = {
+	"ric-ControlStyle-List",
+	"ric-ControlStyle-List",
+	&asn_OP_SEQUENCE_OF,
+	asn_DEF_E2_ric_ControlStyle_List_tags_9,
+	sizeof(asn_DEF_E2_ric_ControlStyle_List_tags_9)
+		/sizeof(asn_DEF_E2_ric_ControlStyle_List_tags_9[0]) - 1, /* 1 */
+	asn_DEF_E2_ric_ControlStyle_List_tags_9,	/* Same as above */
+	sizeof(asn_DEF_E2_ric_ControlStyle_List_tags_9)
+		/sizeof(asn_DEF_E2_ric_ControlStyle_List_tags_9[0]), /* 2 */
+	{ 0, &asn_PER_type_E2_ric_ControlStyle_List_constr_9, SEQUENCE_OF_constraint },
+	asn_MBR_E2_ric_ControlStyle_List_9,
+	1,	/* Single element */
+	&asn_SPC_E2_ric_ControlStyle_List_specs_9	/* Additional specs */
+};
+
+static asn_TYPE_member_t asn_MBR_E2_ric_PolicyStyle_List_11[] = {
+	{ ATF_POINTER, 0, 0,
+		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		0,
+		&asn_DEF_E2_RIC_PolicyStyle_List,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		""
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_ric_PolicyStyle_List_tags_11[] = {
+	(ASN_TAG_CLASS_CONTEXT | (5 << 2)),
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static asn_SET_OF_specifics_t asn_SPC_E2_ric_PolicyStyle_List_specs_11 = {
+	sizeof(struct E2_E2SM_gNB_X2_RANfunction_Definition__ric_PolicyStyle_List),
+	offsetof(struct E2_E2SM_gNB_X2_RANfunction_Definition__ric_PolicyStyle_List, _asn_ctx),
+	0,	/* XER encoding is XMLDelimitedItemList */
+};
+static /* Use -fall-defs-global to expose */
+asn_TYPE_descriptor_t asn_DEF_E2_ric_PolicyStyle_List_11 = {
+	"ric-PolicyStyle-List",
+	"ric-PolicyStyle-List",
+	&asn_OP_SEQUENCE_OF,
+	asn_DEF_E2_ric_PolicyStyle_List_tags_11,
+	sizeof(asn_DEF_E2_ric_PolicyStyle_List_tags_11)
+		/sizeof(asn_DEF_E2_ric_PolicyStyle_List_tags_11[0]) - 1, /* 1 */
+	asn_DEF_E2_ric_PolicyStyle_List_tags_11,	/* Same as above */
+	sizeof(asn_DEF_E2_ric_PolicyStyle_List_tags_11)
+		/sizeof(asn_DEF_E2_ric_PolicyStyle_List_tags_11[0]), /* 2 */
+	{ 0, &asn_PER_type_E2_ric_PolicyStyle_List_constr_11, SEQUENCE_OF_constraint },
+	asn_MBR_E2_ric_PolicyStyle_List_11,
+	1,	/* Single element */
+	&asn_SPC_E2_ric_PolicyStyle_List_specs_11	/* Additional specs */
+};
+
+static asn_TYPE_member_t asn_MBR_E2_E2SM_gNB_X2_RANfunction_Definition_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_E2SM_gNB_X2_RANfunction_Definition, ranFunction_Name),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RANfunction_Name,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ranFunction-Name"
+		},
+	{ ATF_POINTER, 5, offsetof(struct E2_E2SM_gNB_X2_RANfunction_Definition, ric_EventTriggerStyle_List),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		0,
+		&asn_DEF_E2_ric_EventTriggerStyle_List_3,
+		0,
+		{ 0, &asn_PER_memb_E2_ric_EventTriggerStyle_List_constr_3,  memb_E2_ric_EventTriggerStyle_List_constraint_1 },
+		0, 0, /* No default value */
+		"ric-EventTriggerStyle-List"
+		},
+	{ ATF_POINTER, 4, offsetof(struct E2_E2SM_gNB_X2_RANfunction_Definition, ric_ReportStyle_List),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		0,
+		&asn_DEF_E2_ric_ReportStyle_List_5,
+		0,
+		{ 0, &asn_PER_memb_E2_ric_ReportStyle_List_constr_5,  memb_E2_ric_ReportStyle_List_constraint_1 },
+		0, 0, /* No default value */
+		"ric-ReportStyle-List"
+		},
+	{ ATF_POINTER, 3, offsetof(struct E2_E2SM_gNB_X2_RANfunction_Definition, ric_InsertStyle_List),
+		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
+		0,
+		&asn_DEF_E2_ric_InsertStyle_List_7,
+		0,
+		{ 0, &asn_PER_memb_E2_ric_InsertStyle_List_constr_7,  memb_E2_ric_InsertStyle_List_constraint_1 },
+		0, 0, /* No default value */
+		"ric-InsertStyle-List"
+		},
+	{ ATF_POINTER, 2, offsetof(struct E2_E2SM_gNB_X2_RANfunction_Definition, ric_ControlStyle_List),
+		(ASN_TAG_CLASS_CONTEXT | (4 << 2)),
+		0,
+		&asn_DEF_E2_ric_ControlStyle_List_9,
+		0,
+		{ 0, &asn_PER_memb_E2_ric_ControlStyle_List_constr_9,  memb_E2_ric_ControlStyle_List_constraint_1 },
+		0, 0, /* No default value */
+		"ric-ControlStyle-List"
+		},
+	{ ATF_POINTER, 1, offsetof(struct E2_E2SM_gNB_X2_RANfunction_Definition, ric_PolicyStyle_List),
+		(ASN_TAG_CLASS_CONTEXT | (5 << 2)),
+		0,
+		&asn_DEF_E2_ric_PolicyStyle_List_11,
+		0,
+		{ 0, &asn_PER_memb_E2_ric_PolicyStyle_List_constr_11,  memb_E2_ric_PolicyStyle_List_constraint_1 },
+		0, 0, /* No default value */
+		"ric-PolicyStyle-List"
+		},
+};
+static const int asn_MAP_E2_E2SM_gNB_X2_RANfunction_Definition_oms_1[] = { 1, 2, 3, 4, 5 };
+static const ber_tlv_tag_t asn_DEF_E2_E2SM_gNB_X2_RANfunction_Definition_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_E2SM_gNB_X2_RANfunction_Definition_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* ranFunction-Name */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* ric-EventTriggerStyle-List */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* ric-ReportStyle-List */
+    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 }, /* ric-InsertStyle-List */
+    { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 4, 0, 0 }, /* ric-ControlStyle-List */
+    { (ASN_TAG_CLASS_CONTEXT | (5 << 2)), 5, 0, 0 } /* ric-PolicyStyle-List */
+};
+static asn_SEQUENCE_specifics_t asn_SPC_E2_E2SM_gNB_X2_RANfunction_Definition_specs_1 = {
+	sizeof(struct E2_E2SM_gNB_X2_RANfunction_Definition),
+	offsetof(struct E2_E2SM_gNB_X2_RANfunction_Definition, _asn_ctx),
+	asn_MAP_E2_E2SM_gNB_X2_RANfunction_Definition_tag2el_1,
+	6,	/* Count of tags in the map */
+	asn_MAP_E2_E2SM_gNB_X2_RANfunction_Definition_oms_1,	/* Optional members */
+	5, 0,	/* Root/Additions */
+	6,	/* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_E2SM_gNB_X2_RANfunction_Definition = {
+	"E2SM-gNB-X2-RANfunction-Definition",
+	"E2SM-gNB-X2-RANfunction-Definition",
+	&asn_OP_SEQUENCE,
+	asn_DEF_E2_E2SM_gNB_X2_RANfunction_Definition_tags_1,
+	sizeof(asn_DEF_E2_E2SM_gNB_X2_RANfunction_Definition_tags_1)
+		/sizeof(asn_DEF_E2_E2SM_gNB_X2_RANfunction_Definition_tags_1[0]), /* 1 */
+	asn_DEF_E2_E2SM_gNB_X2_RANfunction_Definition_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_E2SM_gNB_X2_RANfunction_Definition_tags_1)
+		/sizeof(asn_DEF_E2_E2SM_gNB_X2_RANfunction_Definition_tags_1[0]), /* 1 */
+	{ 0, 0, SEQUENCE_constraint },
+	asn_MBR_E2_E2SM_gNB_X2_RANfunction_Definition_1,
+	6,	/* Elements count */
+	&asn_SPC_E2_E2SM_gNB_X2_RANfunction_Definition_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-RANfunction-Definition.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-RANfunction-Definition.h
new file mode 100644
index 0000000..80cc5e0
--- /dev/null
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-RANfunction-Definition.h
@@ -0,0 +1,81 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-X2-IEs"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_E2SM_gNB_X2_RANfunction_Definition_H_
+#define	_E2_E2SM_gNB_X2_RANfunction_Definition_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_RANfunction-Name.h"
+#include "asn_SEQUENCE_OF.h"
+#include "constr_SEQUENCE_OF.h"
+#include "constr_SEQUENCE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct E2_RIC_EventTriggerStyle_List;
+struct E2_RIC_ReportStyle_List;
+struct E2_RIC_InsertStyle_List;
+struct E2_RIC_ControlStyle_List;
+struct E2_RIC_PolicyStyle_List;
+
+/* E2_E2SM-gNB-X2-RANfunction-Definition */
+typedef struct E2_E2SM_gNB_X2_RANfunction_Definition {
+	E2_RANfunction_Name_t	 ranFunction_Name;
+	struct E2_E2SM_gNB_X2_RANfunction_Definition__ric_EventTriggerStyle_List {
+		A_SEQUENCE_OF(struct E2_RIC_EventTriggerStyle_List) list;
+		
+		/* Context for parsing across buffer boundaries */
+		asn_struct_ctx_t _asn_ctx;
+	} *ric_EventTriggerStyle_List;
+	struct E2_E2SM_gNB_X2_RANfunction_Definition__ric_ReportStyle_List {
+		A_SEQUENCE_OF(struct E2_RIC_ReportStyle_List) list;
+		
+		/* Context for parsing across buffer boundaries */
+		asn_struct_ctx_t _asn_ctx;
+	} *ric_ReportStyle_List;
+	struct E2_E2SM_gNB_X2_RANfunction_Definition__ric_InsertStyle_List {
+		A_SEQUENCE_OF(struct E2_RIC_InsertStyle_List) list;
+		
+		/* Context for parsing across buffer boundaries */
+		asn_struct_ctx_t _asn_ctx;
+	} *ric_InsertStyle_List;
+	struct E2_E2SM_gNB_X2_RANfunction_Definition__ric_ControlStyle_List {
+		A_SEQUENCE_OF(struct E2_RIC_ControlStyle_List) list;
+		
+		/* Context for parsing across buffer boundaries */
+		asn_struct_ctx_t _asn_ctx;
+	} *ric_ControlStyle_List;
+	struct E2_E2SM_gNB_X2_RANfunction_Definition__ric_PolicyStyle_List {
+		A_SEQUENCE_OF(struct E2_RIC_PolicyStyle_List) list;
+		
+		/* Context for parsing across buffer boundaries */
+		asn_struct_ctx_t _asn_ctx;
+	} *ric_PolicyStyle_List;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_E2SM_gNB_X2_RANfunction_Definition_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_E2SM_gNB_X2_RANfunction_Definition;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_E2SM_gNB_X2_RANfunction_Definition_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-actionDefinition.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-actionDefinition.c
similarity index 98%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-actionDefinition.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-actionDefinition.c
index 2eda881..18ef330 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-actionDefinition.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-actionDefinition.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-actionDefinition.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-actionDefinition.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-actionDefinition.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-actionDefinition.h
index 8b50300..a4da06f 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-actionDefinition.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-actionDefinition.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-callProcessID.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-callProcessID.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-callProcessID.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-callProcessID.c
index 49da203..ceb49f9 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-callProcessID.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-callProcessID.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-callProcessID.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-callProcessID.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-callProcessID.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-callProcessID.h
index f2231bf..fd0a06e 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-callProcessID.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-callProcessID.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-controlHeader.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-controlHeader.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-controlHeader.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-controlHeader.c
index f4ad685..52a48d0 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-controlHeader.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-controlHeader.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-controlHeader.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-controlHeader.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-controlHeader.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-controlHeader.h
index c36bf70..bb65235 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-controlHeader.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-controlHeader.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-controlMessage.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-controlMessage.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-controlMessage.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-controlMessage.c
index f9aed50..1f52178 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-controlMessage.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-controlMessage.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-controlMessage.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-controlMessage.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-controlMessage.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-controlMessage.h
index 15d6221..4380d5b 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-controlMessage.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-controlMessage.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-eventTriggerDefinition.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-eventTriggerDefinition.c
similarity index 99%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-eventTriggerDefinition.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-eventTriggerDefinition.c
index fbe7b7d..6198967 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-eventTriggerDefinition.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-eventTriggerDefinition.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-eventTriggerDefinition.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-eventTriggerDefinition.h
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-eventTriggerDefinition.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-eventTriggerDefinition.h
index 8eb708e..79ca11a 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-eventTriggerDefinition.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-eventTriggerDefinition.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-indicationHeader.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-indicationHeader.c
similarity index 98%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-indicationHeader.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-indicationHeader.c
index 5fc9909..826f879 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-indicationHeader.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-indicationHeader.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-indicationHeader.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-indicationHeader.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-indicationHeader.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-indicationHeader.h
index 93198c6..d00dfcb 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-indicationHeader.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-indicationHeader.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-indicationMessage.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-indicationMessage.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-indicationMessage.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-indicationMessage.c
index 88b15ff..776335f 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-indicationMessage.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-indicationMessage.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-indicationMessage.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-indicationMessage.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-indicationMessage.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-indicationMessage.h
index 1e7c966..95d6b0d 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_E2SM-gNB-X2-indicationMessage.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_E2SM-gNB-X2-indicationMessage.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_ENB-ID.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_ENB-ID.c
similarity index 99%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_ENB-ID.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_ENB-ID.c
index 4861ea7..2a6ce42 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_ENB-ID.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_ENB-ID.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_ENB-ID.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_ENB-ID.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_ENB-ID.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_ENB-ID.h
index c0423d2..d195a89 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_ENB-ID.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_ENB-ID.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_GNB-ID.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_GNB-ID.c
similarity index 98%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_GNB-ID.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_GNB-ID.c
index 157dbd4..2604fd6 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_GNB-ID.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_GNB-ID.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_GNB-ID.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_GNB-ID.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_GNB-ID.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_GNB-ID.h
index 7a2d257..5144a28 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_GNB-ID.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_GNB-ID.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_GlobalENB-ID.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_GlobalENB-ID.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_GlobalENB-ID.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_GlobalENB-ID.c
index 7fea0be..b50c251 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_GlobalENB-ID.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_GlobalENB-ID.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_GlobalENB-ID.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_GlobalENB-ID.h
similarity index 95%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_GlobalENB-ID.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_GlobalENB-ID.h
index 77865c2..214dff3 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_GlobalENB-ID.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_GlobalENB-ID.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_GlobalGNB-ID.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_GlobalGNB-ID.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_GlobalGNB-ID.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_GlobalGNB-ID.c
index 3723ad9..9386b97 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_GlobalGNB-ID.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_GlobalGNB-ID.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_GlobalGNB-ID.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_GlobalGNB-ID.h
similarity index 95%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_GlobalGNB-ID.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_GlobalGNB-ID.h
index 7bccc89..2241f3a 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_GlobalGNB-ID.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_GlobalGNB-ID.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_Interface-ID.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_Interface-ID.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_Interface-ID.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_Interface-ID.c
index dbb1b47..4cc9b0c 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_Interface-ID.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_Interface-ID.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_Interface-ID.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_Interface-ID.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_Interface-ID.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_Interface-ID.h
index 9c44d0a..9ff1b40 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_Interface-ID.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_Interface-ID.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceDirection.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceDirection.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceDirection.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceDirection.c
index 01a2684..caf2543 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceDirection.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceDirection.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceDirection.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceDirection.h
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceDirection.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceDirection.h
index 416c45f..b26e7a6 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceDirection.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceDirection.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceMessage.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceMessage.c
similarity index 95%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceMessage.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceMessage.c
index d921453..aa3f5de 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceMessage.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceMessage.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceMessage.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceMessage.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceMessage.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceMessage.h
index 821f7b3..5b931cf 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceMessage.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceMessage.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceMessageType.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceMessageType.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceMessageType.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceMessageType.c
index 91d017a..e3042ce 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceMessageType.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceMessageType.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceMessageType.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceMessageType.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceMessageType.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceMessageType.h
index ac6eae9..2a29d2d 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceMessageType.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceMessageType.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceProtocolIE-ID.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceProtocolIE-ID.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceProtocolIE-ID.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceProtocolIE-ID.c
index bb1aeae..1a9e2cf 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceProtocolIE-ID.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceProtocolIE-ID.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceProtocolIE-ID.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceProtocolIE-ID.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceProtocolIE-ID.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceProtocolIE-ID.h
index 009a72c..aaec6b9 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceProtocolIE-ID.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceProtocolIE-ID.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceProtocolIE-Item.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceProtocolIE-Item.c
similarity index 98%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceProtocolIE-Item.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceProtocolIE-Item.c
index 662c200..a2afa07 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceProtocolIE-Item.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceProtocolIE-Item.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceProtocolIE-Item.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceProtocolIE-Item.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceProtocolIE-Item.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceProtocolIE-Item.h
index 9401cc5..d172331 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceProtocolIE-Item.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceProtocolIE-Item.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceProtocolIE-Test.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceProtocolIE-Test.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceProtocolIE-Test.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceProtocolIE-Test.c
index 5ce8aec..0ff7aa6 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceProtocolIE-Test.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceProtocolIE-Test.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceProtocolIE-Test.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceProtocolIE-Test.h
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceProtocolIE-Test.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceProtocolIE-Test.h
index 3711389..2c42dd9 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceProtocolIE-Test.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceProtocolIE-Test.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceProtocolIE-Value.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceProtocolIE-Value.c
similarity index 98%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceProtocolIE-Value.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceProtocolIE-Value.c
index 6b019c0..c46e90a 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceProtocolIE-Value.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceProtocolIE-Value.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceProtocolIE-Value.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceProtocolIE-Value.h
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceProtocolIE-Value.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceProtocolIE-Value.h
index 1e56e6f..3a40e0a 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_InterfaceProtocolIE-Value.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_InterfaceProtocolIE-Value.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_PLMN-Identity.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_PLMN-Identity.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_PLMN-Identity.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_PLMN-Identity.c
index 815aca8..90d16a4 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_PLMN-Identity.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_PLMN-Identity.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_PLMN-Identity.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_PLMN-Identity.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_PLMN-Identity.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_PLMN-Identity.h
index 58be608..d4d11b0 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_PLMN-Identity.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_PLMN-Identity.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_Presence.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_Presence.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_Presence.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_Presence.c
index 8c55c04..50d73a7 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_Presence.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_Presence.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_Presence.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_Presence.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_Presence.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_Presence.h
index c82f601..81633c1 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_Presence.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_Presence.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_ProcedureCode.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_ProcedureCode.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_ProcedureCode.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_ProcedureCode.c
index c12a5f7..b24de76 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_ProcedureCode.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_ProcedureCode.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_ProcedureCode.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_ProcedureCode.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_ProcedureCode.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_ProcedureCode.h
index ec8b77a..62fde94 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_ProcedureCode.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_ProcedureCode.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_ProtocolIE-ID.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_ProtocolIE-ID.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_ProtocolIE-ID.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_ProtocolIE-ID.c
index 6d57747..c39285d 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_ProtocolIE-ID.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_ProtocolIE-ID.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_ProtocolIE-ID.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_ProtocolIE-ID.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_ProtocolIE-ID.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_ProtocolIE-ID.h
index 1b7e5fa..0906d4b 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_ProtocolIE-ID.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_ProtocolIE-ID.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANParameter-ID.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-ID.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANParameter-ID.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-ID.c
index 95e574a..d3926f8 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANParameter-ID.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-ID.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANParameter-ID.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-ID.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANParameter-ID.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-ID.h
index b5d8fbb..9dde2a6 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANParameter-ID.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-ID.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANParameter-Item.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Item.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANParameter-Item.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Item.c
index 2196877..40aac3e 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANParameter-Item.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Item.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANParameter-Item.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Item.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANParameter-Item.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Item.h
index 440194d..b427828 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANParameter-Item.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Item.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Name.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Name.c
new file mode 100644
index 0000000..f17a7f8
--- /dev/null
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Name.c
@@ -0,0 +1,106 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-X2-IEs"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_RANParameter-Name.h"
+
+static const int permitted_alphabet_table_1[256] = {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/*                  */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/*                  */
+ 1, 0, 0, 0, 0, 0, 0, 2, 3, 4, 0, 5, 6, 7, 8, 9,	/* .      '() +,-./ */
+10,11,12,13,14,15,16,17,18,19,20, 0, 0,21, 0,22,	/* 0123456789:  = ? */
+ 0,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,	/*  ABCDEFGHIJKLMNO */
+38,39,40,41,42,43,44,45,46,47,48, 0, 0, 0, 0, 0,	/* PQRSTUVWXYZ      */
+ 0,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,	/*  abcdefghijklmno */
+64,65,66,67,68,69,70,71,72,73,74, 0, 0, 0, 0, 0,	/* pqrstuvwxyz      */
+};
+static const int permitted_alphabet_code2value_1[74] = {
+32,39,40,41,43,44,45,46,47,48,49,50,51,52,53,54,
+55,56,57,58,61,63,65,66,67,68,69,70,71,72,73,74,
+75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,
+97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,
+113,114,115,116,117,118,119,120,121,122,};
+
+
+static int check_permitted_alphabet_1(const void *sptr) {
+	const int *table = permitted_alphabet_table_1;
+	/* The underlying type is PrintableString */
+	const PrintableString_t *st = (const PrintableString_t *)sptr;
+	const uint8_t *ch = st->buf;
+	const uint8_t *end = ch + st->size;
+	
+	for(; ch < end; ch++) {
+		uint8_t cv = *ch;
+		if(!table[cv]) return -1;
+	}
+	return 0;
+}
+
+int
+E2_RANParameter_Name_constraint(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	const PrintableString_t *st = (const PrintableString_t *)sptr;
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	size = st->size;
+	
+	if((size >= 1 && size <= 150)
+		 && !check_permitted_alphabet_1(st)) {
+		/* Constraint check succeeded */
+		return 0;
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static int asn_PER_MAP_E2_RANParameter_Name_1_v2c(unsigned int value) {
+	if(value >= sizeof(permitted_alphabet_table_1)/sizeof(permitted_alphabet_table_1[0]))
+		return -1;
+	return permitted_alphabet_table_1[value] - 1;
+}
+static int asn_PER_MAP_E2_RANParameter_Name_1_c2v(unsigned int code) {
+	if(code >= sizeof(permitted_alphabet_code2value_1)/sizeof(permitted_alphabet_code2value_1[0]))
+		return -1;
+	return permitted_alphabet_code2value_1[code];
+}
+/*
+ * This type is implemented using PrintableString,
+ * so here we adjust the DEF accordingly.
+ */
+asn_per_constraints_t asn_PER_type_E2_RANParameter_Name_constr_1 CC_NOTUSED = {
+	{ APC_CONSTRAINED,	 7,  7,  32,  122 }	/* (32..122) */,
+	{ APC_CONSTRAINED | APC_EXTENSIBLE,  8,  8,  1,  150 }	/* (SIZE(1..150,...)) */,
+	asn_PER_MAP_E2_RANParameter_Name_1_v2c,	/* Value to PER code map */
+	asn_PER_MAP_E2_RANParameter_Name_1_c2v	/* PER code to value map */
+};
+static const ber_tlv_tag_t asn_DEF_E2_RANParameter_Name_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (19 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_E2_RANParameter_Name = {
+	"RANParameter-Name",
+	"RANParameter-Name",
+	&asn_OP_PrintableString,
+	asn_DEF_E2_RANParameter_Name_tags_1,
+	sizeof(asn_DEF_E2_RANParameter_Name_tags_1)
+		/sizeof(asn_DEF_E2_RANParameter_Name_tags_1[0]), /* 1 */
+	asn_DEF_E2_RANParameter_Name_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_RANParameter_Name_tags_1)
+		/sizeof(asn_DEF_E2_RANParameter_Name_tags_1[0]), /* 1 */
+	{ 0, &asn_PER_type_E2_RANParameter_Name_constr_1, E2_RANParameter_Name_constraint },
+	0, 0,	/* No members */
+	0	/* No specifics */
+};
+
diff --git a/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Name.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Name.h
new file mode 100644
index 0000000..ec8deb6
--- /dev/null
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Name.h
@@ -0,0 +1,44 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-X2-IEs"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_RANParameter_Name_H_
+#define	_E2_RANParameter_Name_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "PrintableString.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_RANParameter-Name */
+typedef PrintableString_t	 E2_RANParameter_Name_t;
+
+/* Implementation */
+extern asn_per_constraints_t asn_PER_type_E2_RANParameter_Name_constr_1;
+extern asn_TYPE_descriptor_t asn_DEF_E2_RANParameter_Name;
+asn_struct_free_f E2_RANParameter_Name_free;
+asn_struct_print_f E2_RANParameter_Name_print;
+asn_constr_check_f E2_RANParameter_Name_constraint;
+ber_type_decoder_f E2_RANParameter_Name_decode_ber;
+der_type_encoder_f E2_RANParameter_Name_encode_der;
+xer_type_decoder_f E2_RANParameter_Name_decode_xer;
+xer_type_encoder_f E2_RANParameter_Name_encode_xer;
+per_type_decoder_f E2_RANParameter_Name_decode_uper;
+per_type_encoder_f E2_RANParameter_Name_encode_uper;
+per_type_decoder_f E2_RANParameter_Name_decode_aper;
+per_type_encoder_f E2_RANParameter_Name_encode_aper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_RANParameter_Name_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANParameter-Test.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Test.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANParameter-Test.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Test.c
index b8e8305..717c726 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANParameter-Test.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Test.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANParameter-Test.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Test.h
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANParameter-Test.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Test.h
index b026fff..1e4527e 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANParameter-Test.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Test.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Type.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Type.c
new file mode 100644
index 0000000..9f0f3a9
--- /dev/null
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Type.c
@@ -0,0 +1,63 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-X2-IEs"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_RANParameter-Type.h"
+
+/*
+ * This type is implemented using NativeEnumerated,
+ * so here we adjust the DEF accordingly.
+ */
+asn_per_constraints_t asn_PER_type_E2_RANParameter_Type_constr_1 CC_NOTUSED = {
+	{ APC_CONSTRAINED | APC_EXTENSIBLE,  3,  3,  0,  5 }	/* (0..5,...) */,
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	0, 0	/* No PER value map */
+};
+static const asn_INTEGER_enum_map_t asn_MAP_E2_RANParameter_Type_value2enum_1[] = {
+	{ 0,	7,	"integer" },
+	{ 1,	10,	"enumerated" },
+	{ 2,	7,	"boolean" },
+	{ 3,	10,	"bit-string" },
+	{ 4,	12,	"octet-string" },
+	{ 5,	16,	"printable-string" }
+	/* This list is extensible */
+};
+static const unsigned int asn_MAP_E2_RANParameter_Type_enum2value_1[] = {
+	3,	/* bit-string(3) */
+	2,	/* boolean(2) */
+	1,	/* enumerated(1) */
+	0,	/* integer(0) */
+	4,	/* octet-string(4) */
+	5	/* printable-string(5) */
+	/* This list is extensible */
+};
+const asn_INTEGER_specifics_t asn_SPC_E2_RANParameter_Type_specs_1 = {
+	asn_MAP_E2_RANParameter_Type_value2enum_1,	/* "tag" => N; sorted by tag */
+	asn_MAP_E2_RANParameter_Type_enum2value_1,	/* N => "tag"; sorted by N */
+	6,	/* Number of elements in the maps */
+	7,	/* Extensions before this member */
+	1,	/* Strict enumeration */
+	0,	/* Native long size */
+	0
+};
+static const ber_tlv_tag_t asn_DEF_E2_RANParameter_Type_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (10 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_E2_RANParameter_Type = {
+	"RANParameter-Type",
+	"RANParameter-Type",
+	&asn_OP_NativeEnumerated,
+	asn_DEF_E2_RANParameter_Type_tags_1,
+	sizeof(asn_DEF_E2_RANParameter_Type_tags_1)
+		/sizeof(asn_DEF_E2_RANParameter_Type_tags_1[0]), /* 1 */
+	asn_DEF_E2_RANParameter_Type_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_RANParameter_Type_tags_1)
+		/sizeof(asn_DEF_E2_RANParameter_Type_tags_1[0]), /* 1 */
+	{ 0, &asn_PER_type_E2_RANParameter_Type_constr_1, NativeEnumerated_constraint },
+	0, 0,	/* Defined elsewhere */
+	&asn_SPC_E2_RANParameter_Type_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Type.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Type.h
new file mode 100644
index 0000000..0036a71
--- /dev/null
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Type.h
@@ -0,0 +1,58 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-X2-IEs"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_RANParameter_Type_H_
+#define	_E2_RANParameter_Type_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "NativeEnumerated.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dependencies */
+typedef enum E2_RANParameter_Type {
+	E2_RANParameter_Type_integer	= 0,
+	E2_RANParameter_Type_enumerated	= 1,
+	E2_RANParameter_Type_boolean	= 2,
+	E2_RANParameter_Type_bit_string	= 3,
+	E2_RANParameter_Type_octet_string	= 4,
+	E2_RANParameter_Type_printable_string	= 5
+	/*
+	 * Enumeration is extensible
+	 */
+} e_E2_RANParameter_Type;
+
+/* E2_RANParameter-Type */
+typedef long	 E2_RANParameter_Type_t;
+
+/* Implementation */
+extern asn_per_constraints_t asn_PER_type_E2_RANParameter_Type_constr_1;
+extern asn_TYPE_descriptor_t asn_DEF_E2_RANParameter_Type;
+extern const asn_INTEGER_specifics_t asn_SPC_RANParameter_Type_specs_1;
+asn_struct_free_f RANParameter_Type_free;
+asn_struct_print_f RANParameter_Type_print;
+asn_constr_check_f RANParameter_Type_constraint;
+ber_type_decoder_f RANParameter_Type_decode_ber;
+der_type_encoder_f RANParameter_Type_encode_der;
+xer_type_decoder_f RANParameter_Type_decode_xer;
+xer_type_encoder_f RANParameter_Type_encode_xer;
+per_type_decoder_f RANParameter_Type_decode_uper;
+per_type_encoder_f RANParameter_Type_encode_uper;
+per_type_decoder_f RANParameter_Type_decode_aper;
+per_type_encoder_f RANParameter_Type_encode_aper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_RANParameter_Type_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANParameter-Value.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Value.c
similarity index 98%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANParameter-Value.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Value.c
index bb7d320..946e262 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANParameter-Value.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Value.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANParameter-Value.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Value.h
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANParameter-Value.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Value.h
index 2988122..5783a50 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANParameter-Value.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANParameter-Value.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANfunction-Name.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANfunction-Name.c
new file mode 100644
index 0000000..0d31573
--- /dev/null
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANfunction-Name.c
@@ -0,0 +1,307 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-X2-IEs"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_RANfunction-Name.h"
+
+static const int permitted_alphabet_table_2[256] = {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/*                  */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/*                  */
+ 1, 0, 0, 0, 0, 0, 0, 2, 3, 4, 0, 5, 6, 7, 8, 9,	/* .      '() +,-./ */
+10,11,12,13,14,15,16,17,18,19,20, 0, 0,21, 0,22,	/* 0123456789:  = ? */
+ 0,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,	/*  ABCDEFGHIJKLMNO */
+38,39,40,41,42,43,44,45,46,47,48, 0, 0, 0, 0, 0,	/* PQRSTUVWXYZ      */
+ 0,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,	/*  abcdefghijklmno */
+64,65,66,67,68,69,70,71,72,73,74, 0, 0, 0, 0, 0,	/* pqrstuvwxyz      */
+};
+static const int permitted_alphabet_code2value_2[74] = {
+32,39,40,41,43,44,45,46,47,48,49,50,51,52,53,54,
+55,56,57,58,61,63,65,66,67,68,69,70,71,72,73,74,
+75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,
+97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,
+113,114,115,116,117,118,119,120,121,122,};
+
+
+static int check_permitted_alphabet_2(const void *sptr) {
+	const int *table = permitted_alphabet_table_2;
+	/* The underlying type is PrintableString */
+	const PrintableString_t *st = (const PrintableString_t *)sptr;
+	const uint8_t *ch = st->buf;
+	const uint8_t *end = ch + st->size;
+	
+	for(; ch < end; ch++) {
+		uint8_t cv = *ch;
+		if(!table[cv]) return -1;
+	}
+	return 0;
+}
+
+static const int permitted_alphabet_table_3[256] = {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/*                  */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/*                  */
+ 1, 0, 0, 0, 0, 0, 0, 2, 3, 4, 0, 5, 6, 7, 8, 9,	/* .      '() +,-./ */
+10,11,12,13,14,15,16,17,18,19,20, 0, 0,21, 0,22,	/* 0123456789:  = ? */
+ 0,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,	/*  ABCDEFGHIJKLMNO */
+38,39,40,41,42,43,44,45,46,47,48, 0, 0, 0, 0, 0,	/* PQRSTUVWXYZ      */
+ 0,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,	/*  abcdefghijklmno */
+64,65,66,67,68,69,70,71,72,73,74, 0, 0, 0, 0, 0,	/* pqrstuvwxyz      */
+};
+static const int permitted_alphabet_code2value_3[74] = {
+32,39,40,41,43,44,45,46,47,48,49,50,51,52,53,54,
+55,56,57,58,61,63,65,66,67,68,69,70,71,72,73,74,
+75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,
+97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,
+113,114,115,116,117,118,119,120,121,122,};
+
+
+static int check_permitted_alphabet_3(const void *sptr) {
+	const int *table = permitted_alphabet_table_3;
+	/* The underlying type is PrintableString */
+	const PrintableString_t *st = (const PrintableString_t *)sptr;
+	const uint8_t *ch = st->buf;
+	const uint8_t *end = ch + st->size;
+	
+	for(; ch < end; ch++) {
+		uint8_t cv = *ch;
+		if(!table[cv]) return -1;
+	}
+	return 0;
+}
+
+static const int permitted_alphabet_table_4[256] = {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/*                  */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/*                  */
+ 1, 0, 0, 0, 0, 0, 0, 2, 3, 4, 0, 5, 6, 7, 8, 9,	/* .      '() +,-./ */
+10,11,12,13,14,15,16,17,18,19,20, 0, 0,21, 0,22,	/* 0123456789:  = ? */
+ 0,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,	/*  ABCDEFGHIJKLMNO */
+38,39,40,41,42,43,44,45,46,47,48, 0, 0, 0, 0, 0,	/* PQRSTUVWXYZ      */
+ 0,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,	/*  abcdefghijklmno */
+64,65,66,67,68,69,70,71,72,73,74, 0, 0, 0, 0, 0,	/* pqrstuvwxyz      */
+};
+static const int permitted_alphabet_code2value_4[74] = {
+32,39,40,41,43,44,45,46,47,48,49,50,51,52,53,54,
+55,56,57,58,61,63,65,66,67,68,69,70,71,72,73,74,
+75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,
+97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,
+113,114,115,116,117,118,119,120,121,122,};
+
+
+static int check_permitted_alphabet_4(const void *sptr) {
+	const int *table = permitted_alphabet_table_4;
+	/* The underlying type is PrintableString */
+	const PrintableString_t *st = (const PrintableString_t *)sptr;
+	const uint8_t *ch = st->buf;
+	const uint8_t *end = ch + st->size;
+	
+	for(; ch < end; ch++) {
+		uint8_t cv = *ch;
+		if(!table[cv]) return -1;
+	}
+	return 0;
+}
+
+static int
+memb_E2_ranFunction_ShortName_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	const PrintableString_t *st = (const PrintableString_t *)sptr;
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	size = st->size;
+	
+	if((size >= 1 && size <= 150)
+		 && !check_permitted_alphabet_2(st)) {
+		/* Constraint check succeeded */
+		return 0;
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static int asn_PER_MAP_E2_ranFunction_ShortName_2_v2c(unsigned int value) {
+	if(value >= sizeof(permitted_alphabet_table_2)/sizeof(permitted_alphabet_table_2[0]))
+		return -1;
+	return permitted_alphabet_table_2[value] - 1;
+}
+static int asn_PER_MAP_E2_ranFunction_ShortName_2_c2v(unsigned int code) {
+	if(code >= sizeof(permitted_alphabet_code2value_2)/sizeof(permitted_alphabet_code2value_2[0]))
+		return -1;
+	return permitted_alphabet_code2value_2[code];
+}
+static int
+memb_E2_ranFunction_E2SM_OID_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	const PrintableString_t *st = (const PrintableString_t *)sptr;
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	size = st->size;
+	
+	if((size >= 1 && size <= 1000)
+		 && !check_permitted_alphabet_3(st)) {
+		/* Constraint check succeeded */
+		return 0;
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static int asn_PER_MAP_E2_ranFunction_E2SM_OID_3_v2c(unsigned int value) {
+	if(value >= sizeof(permitted_alphabet_table_3)/sizeof(permitted_alphabet_table_3[0]))
+		return -1;
+	return permitted_alphabet_table_3[value] - 1;
+}
+static int asn_PER_MAP_E2_ranFunction_E2SM_OID_3_c2v(unsigned int code) {
+	if(code >= sizeof(permitted_alphabet_code2value_3)/sizeof(permitted_alphabet_code2value_3[0]))
+		return -1;
+	return permitted_alphabet_code2value_3[code];
+}
+static int
+memb_E2_ranFunction_Description_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	const PrintableString_t *st = (const PrintableString_t *)sptr;
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	size = st->size;
+	
+	if((size >= 1 && size <= 150)
+		 && !check_permitted_alphabet_4(st)) {
+		/* Constraint check succeeded */
+		return 0;
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static int asn_PER_MAP_E2_ranFunction_Description_4_v2c(unsigned int value) {
+	if(value >= sizeof(permitted_alphabet_table_4)/sizeof(permitted_alphabet_table_4[0]))
+		return -1;
+	return permitted_alphabet_table_4[value] - 1;
+}
+static int asn_PER_MAP_E2_ranFunction_Description_4_c2v(unsigned int code) {
+	if(code >= sizeof(permitted_alphabet_code2value_4)/sizeof(permitted_alphabet_code2value_4[0]))
+		return -1;
+	return permitted_alphabet_code2value_4[code];
+}
+static asn_per_constraints_t asn_PER_memb_E2_ranFunction_ShortName_constr_2 CC_NOTUSED = {
+	{ APC_CONSTRAINED,	 7,  7,  32,  122 }	/* (32..122) */,
+	{ APC_CONSTRAINED | APC_EXTENSIBLE,  8,  8,  1,  150 }	/* (SIZE(1..150,...)) */,
+	asn_PER_MAP_E2_ranFunction_ShortName_2_v2c,	/* Value to PER code map */
+	asn_PER_MAP_E2_ranFunction_ShortName_2_c2v	/* PER code to value map */
+};
+static asn_per_constraints_t asn_PER_memb_E2_ranFunction_E2SM_OID_constr_3 CC_NOTUSED = {
+	{ APC_CONSTRAINED,	 7,  7,  32,  122 }	/* (32..122) */,
+	{ APC_CONSTRAINED | APC_EXTENSIBLE,  10,  10,  1,  1000 }	/* (SIZE(1..1000,...)) */,
+	asn_PER_MAP_E2_ranFunction_E2SM_OID_3_v2c,	/* Value to PER code map */
+	asn_PER_MAP_E2_ranFunction_E2SM_OID_3_c2v	/* PER code to value map */
+};
+static asn_per_constraints_t asn_PER_memb_E2_ranFunction_Description_constr_4 CC_NOTUSED = {
+	{ APC_CONSTRAINED,	 7,  7,  32,  122 }	/* (32..122) */,
+	{ APC_CONSTRAINED | APC_EXTENSIBLE,  8,  8,  1,  150 }	/* (SIZE(1..150,...)) */,
+	asn_PER_MAP_E2_ranFunction_Description_4_v2c,	/* Value to PER code map */
+	asn_PER_MAP_E2_ranFunction_Description_4_c2v	/* PER code to value map */
+};
+asn_TYPE_member_t asn_MBR_E2_RANfunction_Name_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RANfunction_Name, ranFunction_ShortName),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_PrintableString,
+		0,
+		{ 0, &asn_PER_memb_E2_ranFunction_ShortName_constr_2,  memb_E2_ranFunction_ShortName_constraint_1 },
+		0, 0, /* No default value */
+		"ranFunction-ShortName"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RANfunction_Name, ranFunction_E2SM_OID),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_PrintableString,
+		0,
+		{ 0, &asn_PER_memb_E2_ranFunction_E2SM_OID_constr_3,  memb_E2_ranFunction_E2SM_OID_constraint_1 },
+		0, 0, /* No default value */
+		"ranFunction-E2SM-OID"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RANfunction_Name, ranFunction_Description),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_PrintableString,
+		0,
+		{ 0, &asn_PER_memb_E2_ranFunction_Description_constr_4,  memb_E2_ranFunction_Description_constraint_1 },
+		0, 0, /* No default value */
+		"ranFunction-Description"
+		},
+	{ ATF_POINTER, 1, offsetof(struct E2_RANfunction_Name, ranFunction_Instance),
+		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_NativeInteger,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ranFunction-Instance"
+		},
+};
+static const int asn_MAP_E2_RANfunction_Name_oms_1[] = { 3 };
+static const ber_tlv_tag_t asn_DEF_E2_RANfunction_Name_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_RANfunction_Name_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* ranFunction-ShortName */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* ranFunction-E2SM-OID */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* ranFunction-Description */
+    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* ranFunction-Instance */
+};
+asn_SEQUENCE_specifics_t asn_SPC_E2_RANfunction_Name_specs_1 = {
+	sizeof(struct E2_RANfunction_Name),
+	offsetof(struct E2_RANfunction_Name, _asn_ctx),
+	asn_MAP_E2_RANfunction_Name_tag2el_1,
+	4,	/* Count of tags in the map */
+	asn_MAP_E2_RANfunction_Name_oms_1,	/* Optional members */
+	1, 0,	/* Root/Additions */
+	4,	/* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_RANfunction_Name = {
+	"RANfunction-Name",
+	"RANfunction-Name",
+	&asn_OP_SEQUENCE,
+	asn_DEF_E2_RANfunction_Name_tags_1,
+	sizeof(asn_DEF_E2_RANfunction_Name_tags_1)
+		/sizeof(asn_DEF_E2_RANfunction_Name_tags_1[0]), /* 1 */
+	asn_DEF_E2_RANfunction_Name_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_RANfunction_Name_tags_1)
+		/sizeof(asn_DEF_E2_RANfunction_Name_tags_1[0]), /* 1 */
+	{ 0, 0, SEQUENCE_constraint },
+	asn_MBR_E2_RANfunction_Name_1,
+	4,	/* Elements count */
+	&asn_SPC_E2_RANfunction_Name_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANfunction-Name.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANfunction-Name.h
new file mode 100644
index 0000000..4bac198
--- /dev/null
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANfunction-Name.h
@@ -0,0 +1,48 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-X2-IEs"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_RANfunction_Name_H_
+#define	_E2_RANfunction_Name_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "PrintableString.h"
+#include "NativeInteger.h"
+#include "constr_SEQUENCE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_RANfunction-Name */
+typedef struct E2_RANfunction_Name {
+	PrintableString_t	 ranFunction_ShortName;
+	PrintableString_t	 ranFunction_E2SM_OID;
+	PrintableString_t	 ranFunction_Description;
+	long	*ranFunction_Instance;	/* OPTIONAL */
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_RANfunction_Name_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_RANfunction_Name;
+extern asn_SEQUENCE_specifics_t asn_SPC_E2_RANfunction_Name_specs_1;
+extern asn_TYPE_member_t asn_MBR_E2_RANfunction_Name_1[4];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_RANfunction_Name_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANimperativePolicy.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANimperativePolicy.c
similarity index 98%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANimperativePolicy.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANimperativePolicy.c
index 5f149eb..9f2c4e2 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANimperativePolicy.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANimperativePolicy.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANimperativePolicy.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANimperativePolicy.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANimperativePolicy.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANimperativePolicy.h
index de13ea0..25096bb 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANimperativePolicy.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANimperativePolicy.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANparameterDef-Item.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANparameterDef-Item.c
new file mode 100644
index 0000000..b99e48f
--- /dev/null
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANparameterDef-Item.c
@@ -0,0 +1,70 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-X2-IEs"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_RANparameterDef-Item.h"
+
+asn_TYPE_member_t asn_MBR_E2_RANparameterDef_Item_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RANparameterDef_Item, ranParameter_ID),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RANParameter_ID,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ranParameter-ID"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RANparameterDef_Item, ranParameter_Name),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RANParameter_Name,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ranParameter-Name"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RANparameterDef_Item, ranParameter_Type),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RANParameter_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ranParameter-Type"
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_RANparameterDef_Item_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_RANparameterDef_Item_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* ranParameter-ID */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* ranParameter-Name */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* ranParameter-Type */
+};
+asn_SEQUENCE_specifics_t asn_SPC_E2_RANparameterDef_Item_specs_1 = {
+	sizeof(struct E2_RANparameterDef_Item),
+	offsetof(struct E2_RANparameterDef_Item, _asn_ctx),
+	asn_MAP_E2_RANparameterDef_Item_tag2el_1,
+	3,	/* Count of tags in the map */
+	0, 0, 0,	/* Optional elements (not needed) */
+	3,	/* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_RANparameterDef_Item = {
+	"RANparameterDef-Item",
+	"RANparameterDef-Item",
+	&asn_OP_SEQUENCE,
+	asn_DEF_E2_RANparameterDef_Item_tags_1,
+	sizeof(asn_DEF_E2_RANparameterDef_Item_tags_1)
+		/sizeof(asn_DEF_E2_RANparameterDef_Item_tags_1[0]), /* 1 */
+	asn_DEF_E2_RANparameterDef_Item_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_RANparameterDef_Item_tags_1)
+		/sizeof(asn_DEF_E2_RANparameterDef_Item_tags_1[0]), /* 1 */
+	{ 0, 0, SEQUENCE_constraint },
+	asn_MBR_E2_RANparameterDef_Item_1,
+	3,	/* Elements count */
+	&asn_SPC_E2_RANparameterDef_Item_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANparameterDef-Item.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANparameterDef-Item.h
new file mode 100644
index 0000000..eb8be4e
--- /dev/null
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANparameterDef-Item.h
@@ -0,0 +1,48 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-X2-IEs"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_RANparameterDef_Item_H_
+#define	_E2_RANparameterDef_Item_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_RANParameter-ID.h"
+#include "E2_RANParameter-Name.h"
+#include "E2_RANParameter-Type.h"
+#include "constr_SEQUENCE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_RANparameterDef-Item */
+typedef struct E2_RANparameterDef_Item {
+	E2_RANParameter_ID_t	 ranParameter_ID;
+	E2_RANParameter_Name_t	 ranParameter_Name;
+	E2_RANParameter_Type_t	 ranParameter_Type;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_RANparameterDef_Item_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_RANparameterDef_Item;
+extern asn_SEQUENCE_specifics_t asn_SPC_E2_RANparameterDef_Item_specs_1;
+extern asn_TYPE_member_t asn_MBR_E2_RANparameterDef_Item_1[3];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_RANparameterDef_Item_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANueGroup-Item.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANueGroup-Item.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANueGroup-Item.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANueGroup-Item.c
index 081bdaf..6ae5381 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANueGroup-Item.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANueGroup-Item.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANueGroup-Item.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANueGroup-Item.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANueGroup-Item.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANueGroup-Item.h
index 0db6bae..e732c33 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANueGroup-Item.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANueGroup-Item.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANueGroupDef-Item.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANueGroupDef-Item.c
similarity index 98%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANueGroupDef-Item.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANueGroupDef-Item.c
index fd923de..5cf8076 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANueGroupDef-Item.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANueGroupDef-Item.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANueGroupDef-Item.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANueGroupDef-Item.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANueGroupDef-Item.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANueGroupDef-Item.h
index 46d37e3..9cd8e70 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANueGroupDef-Item.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANueGroupDef-Item.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANueGroupDefinition.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANueGroupDefinition.c
similarity index 98%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANueGroupDefinition.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANueGroupDefinition.c
index 4dff0ad..c216dbd 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANueGroupDefinition.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANueGroupDefinition.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANueGroupDefinition.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANueGroupDefinition.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANueGroupDefinition.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANueGroupDefinition.h
index 0fd1150..971c24a 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANueGroupDefinition.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANueGroupDefinition.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANueGroupID.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANueGroupID.c
similarity index 95%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANueGroupID.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANueGroupID.c
index b849661..fd2ec17 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANueGroupID.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANueGroupID.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANueGroupID.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANueGroupID.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANueGroupID.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANueGroupID.h
index 3238314..095f216 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_RANueGroupID.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RANueGroupID.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-ControlStyle-List.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-ControlStyle-List.c
new file mode 100644
index 0000000..b71d0e9
--- /dev/null
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-ControlStyle-List.c
@@ -0,0 +1,90 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-X2-IEs"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_RIC-ControlStyle-List.h"
+
+asn_TYPE_member_t asn_MBR_E2_RIC_ControlStyle_List_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_ControlStyle_List, ric_ControlStyle_Type),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Style_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-ControlStyle-Type"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_ControlStyle_List, ric_ControlStyle_Name),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Style_Name,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-ControlStyle-Name"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_ControlStyle_List, ric_ControlHeaderFormat_Type),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Format_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-ControlHeaderFormat-Type"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_ControlStyle_List, ric_ControlMessageFormat_Type),
+		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Format_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-ControlMessageFormat-Type"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_ControlStyle_List, ric_CallProcessIDFormat_Type),
+		(ASN_TAG_CLASS_CONTEXT | (4 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Format_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-CallProcessIDFormat-Type"
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_RIC_ControlStyle_List_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_RIC_ControlStyle_List_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* ric-ControlStyle-Type */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* ric-ControlStyle-Name */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* ric-ControlHeaderFormat-Type */
+    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 }, /* ric-ControlMessageFormat-Type */
+    { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 4, 0, 0 } /* ric-CallProcessIDFormat-Type */
+};
+asn_SEQUENCE_specifics_t asn_SPC_E2_RIC_ControlStyle_List_specs_1 = {
+	sizeof(struct E2_RIC_ControlStyle_List),
+	offsetof(struct E2_RIC_ControlStyle_List, _asn_ctx),
+	asn_MAP_E2_RIC_ControlStyle_List_tag2el_1,
+	5,	/* Count of tags in the map */
+	0, 0, 0,	/* Optional elements (not needed) */
+	5,	/* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_RIC_ControlStyle_List = {
+	"RIC-ControlStyle-List",
+	"RIC-ControlStyle-List",
+	&asn_OP_SEQUENCE,
+	asn_DEF_E2_RIC_ControlStyle_List_tags_1,
+	sizeof(asn_DEF_E2_RIC_ControlStyle_List_tags_1)
+		/sizeof(asn_DEF_E2_RIC_ControlStyle_List_tags_1[0]), /* 1 */
+	asn_DEF_E2_RIC_ControlStyle_List_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_RIC_ControlStyle_List_tags_1)
+		/sizeof(asn_DEF_E2_RIC_ControlStyle_List_tags_1[0]), /* 1 */
+	{ 0, 0, SEQUENCE_constraint },
+	asn_MBR_E2_RIC_ControlStyle_List_1,
+	5,	/* Elements count */
+	&asn_SPC_E2_RIC_ControlStyle_List_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-ControlStyle-List.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-ControlStyle-List.h
new file mode 100644
index 0000000..fc0a765
--- /dev/null
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-ControlStyle-List.h
@@ -0,0 +1,50 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-X2-IEs"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_RIC_ControlStyle_List_H_
+#define	_E2_RIC_ControlStyle_List_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_RIC-Style-Type.h"
+#include "E2_RIC-Style-Name.h"
+#include "E2_RIC-Format-Type.h"
+#include "constr_SEQUENCE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_RIC-ControlStyle-List */
+typedef struct E2_RIC_ControlStyle_List {
+	E2_RIC_Style_Type_t	 ric_ControlStyle_Type;
+	E2_RIC_Style_Name_t	 ric_ControlStyle_Name;
+	E2_RIC_Format_Type_t	 ric_ControlHeaderFormat_Type;
+	E2_RIC_Format_Type_t	 ric_ControlMessageFormat_Type;
+	E2_RIC_Format_Type_t	 ric_CallProcessIDFormat_Type;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_RIC_ControlStyle_List_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_RIC_ControlStyle_List;
+extern asn_SEQUENCE_specifics_t asn_SPC_E2_RIC_ControlStyle_List_specs_1;
+extern asn_TYPE_member_t asn_MBR_E2_RIC_ControlStyle_List_1[5];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_RIC_ControlStyle_List_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-EventTriggerStyle-List.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-EventTriggerStyle-List.c
new file mode 100644
index 0000000..812d904
--- /dev/null
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-EventTriggerStyle-List.c
@@ -0,0 +1,70 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-X2-IEs"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_RIC-EventTriggerStyle-List.h"
+
+asn_TYPE_member_t asn_MBR_E2_RIC_EventTriggerStyle_List_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_EventTriggerStyle_List, ric_EventTriggerStyle_Type),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Style_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-EventTriggerStyle-Type"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_EventTriggerStyle_List, ric_EventTriggerStyle_Name),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Style_Name,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-EventTriggerStyle-Name"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_EventTriggerStyle_List, ric_EventTriggerFormat_Type),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Format_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-EventTriggerFormat-Type"
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_RIC_EventTriggerStyle_List_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_RIC_EventTriggerStyle_List_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* ric-EventTriggerStyle-Type */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* ric-EventTriggerStyle-Name */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* ric-EventTriggerFormat-Type */
+};
+asn_SEQUENCE_specifics_t asn_SPC_E2_RIC_EventTriggerStyle_List_specs_1 = {
+	sizeof(struct E2_RIC_EventTriggerStyle_List),
+	offsetof(struct E2_RIC_EventTriggerStyle_List, _asn_ctx),
+	asn_MAP_E2_RIC_EventTriggerStyle_List_tag2el_1,
+	3,	/* Count of tags in the map */
+	0, 0, 0,	/* Optional elements (not needed) */
+	3,	/* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_RIC_EventTriggerStyle_List = {
+	"RIC-EventTriggerStyle-List",
+	"RIC-EventTriggerStyle-List",
+	&asn_OP_SEQUENCE,
+	asn_DEF_E2_RIC_EventTriggerStyle_List_tags_1,
+	sizeof(asn_DEF_E2_RIC_EventTriggerStyle_List_tags_1)
+		/sizeof(asn_DEF_E2_RIC_EventTriggerStyle_List_tags_1[0]), /* 1 */
+	asn_DEF_E2_RIC_EventTriggerStyle_List_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_RIC_EventTriggerStyle_List_tags_1)
+		/sizeof(asn_DEF_E2_RIC_EventTriggerStyle_List_tags_1[0]), /* 1 */
+	{ 0, 0, SEQUENCE_constraint },
+	asn_MBR_E2_RIC_EventTriggerStyle_List_1,
+	3,	/* Elements count */
+	&asn_SPC_E2_RIC_EventTriggerStyle_List_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-EventTriggerStyle-List.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-EventTriggerStyle-List.h
new file mode 100644
index 0000000..b2e9b4d
--- /dev/null
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-EventTriggerStyle-List.h
@@ -0,0 +1,48 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-X2-IEs"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_RIC_EventTriggerStyle_List_H_
+#define	_E2_RIC_EventTriggerStyle_List_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_RIC-Style-Type.h"
+#include "E2_RIC-Style-Name.h"
+#include "E2_RIC-Format-Type.h"
+#include "constr_SEQUENCE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_RIC-EventTriggerStyle-List */
+typedef struct E2_RIC_EventTriggerStyle_List {
+	E2_RIC_Style_Type_t	 ric_EventTriggerStyle_Type;
+	E2_RIC_Style_Name_t	 ric_EventTriggerStyle_Name;
+	E2_RIC_Format_Type_t	 ric_EventTriggerFormat_Type;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_RIC_EventTriggerStyle_List_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_RIC_EventTriggerStyle_List;
+extern asn_SEQUENCE_specifics_t asn_SPC_E2_RIC_EventTriggerStyle_List_specs_1;
+extern asn_TYPE_member_t asn_MBR_E2_RIC_EventTriggerStyle_List_1[3];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_RIC_EventTriggerStyle_List_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-Format-Type.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-Format-Type.c
new file mode 100644
index 0000000..c08afc8
--- /dev/null
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-Format-Type.c
@@ -0,0 +1,31 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-X2-IEs"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_RIC-Format-Type.h"
+
+/*
+ * This type is implemented using NativeInteger,
+ * so here we adjust the DEF accordingly.
+ */
+static const ber_tlv_tag_t asn_DEF_E2_RIC_Format_Type_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (2 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_E2_RIC_Format_Type = {
+	"RIC-Format-Type",
+	"RIC-Format-Type",
+	&asn_OP_NativeInteger,
+	asn_DEF_E2_RIC_Format_Type_tags_1,
+	sizeof(asn_DEF_E2_RIC_Format_Type_tags_1)
+		/sizeof(asn_DEF_E2_RIC_Format_Type_tags_1[0]), /* 1 */
+	asn_DEF_E2_RIC_Format_Type_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_RIC_Format_Type_tags_1)
+		/sizeof(asn_DEF_E2_RIC_Format_Type_tags_1[0]), /* 1 */
+	{ 0, 0, NativeInteger_constraint },
+	0, 0,	/* No members */
+	0	/* No specifics */
+};
+
diff --git a/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-Format-Type.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-Format-Type.h
new file mode 100644
index 0000000..063c447
--- /dev/null
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-Format-Type.h
@@ -0,0 +1,43 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-X2-IEs"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_RIC_Format_Type_H_
+#define	_E2_RIC_Format_Type_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "NativeInteger.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_RIC-Format-Type */
+typedef long	 E2_RIC_Format_Type_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_RIC_Format_Type;
+asn_struct_free_f E2_RIC_Format_Type_free;
+asn_struct_print_f E2_RIC_Format_Type_print;
+asn_constr_check_f E2_RIC_Format_Type_constraint;
+ber_type_decoder_f E2_RIC_Format_Type_decode_ber;
+der_type_encoder_f E2_RIC_Format_Type_encode_der;
+xer_type_decoder_f E2_RIC_Format_Type_decode_xer;
+xer_type_encoder_f E2_RIC_Format_Type_encode_xer;
+per_type_decoder_f E2_RIC_Format_Type_decode_uper;
+per_type_encoder_f E2_RIC_Format_Type_encode_uper;
+per_type_decoder_f E2_RIC_Format_Type_decode_aper;
+per_type_encoder_f E2_RIC_Format_Type_encode_aper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_RIC_Format_Type_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-InsertStyle-List.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-InsertStyle-List.c
new file mode 100644
index 0000000..88df479
--- /dev/null
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-InsertStyle-List.c
@@ -0,0 +1,184 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-X2-IEs"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_RIC-InsertStyle-List.h"
+
+#include "E2_RANparameterDef-Item.h"
+static int
+memb_E2_ric_InsertRanParameterDef_List_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	/* Determine the number of elements */
+	size = _A_CSEQUENCE_FROM_VOID(sptr)->count;
+	
+	if((size >= 1 && size <= 255)) {
+		/* Perform validation of the inner elements */
+		return td->encoding_constraints.general_constraints(td, sptr, ctfailcb, app_key);
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static asn_per_constraints_t asn_PER_type_E2_ric_InsertRanParameterDef_List_constr_5 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 8,  8,  1,  255 }	/* (SIZE(1..255)) */,
+	0, 0	/* No PER value map */
+};
+static asn_per_constraints_t asn_PER_memb_E2_ric_InsertRanParameterDef_List_constr_5 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 8,  8,  1,  255 }	/* (SIZE(1..255)) */,
+	0, 0	/* No PER value map */
+};
+static asn_TYPE_member_t asn_MBR_E2_ric_InsertRanParameterDef_List_5[] = {
+	{ ATF_POINTER, 0, 0,
+		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		0,
+		&asn_DEF_E2_RANparameterDef_Item,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		""
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_ric_InsertRanParameterDef_List_tags_5[] = {
+	(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static asn_SET_OF_specifics_t asn_SPC_E2_ric_InsertRanParameterDef_List_specs_5 = {
+	sizeof(struct E2_RIC_InsertStyle_List__ric_InsertRanParameterDef_List),
+	offsetof(struct E2_RIC_InsertStyle_List__ric_InsertRanParameterDef_List, _asn_ctx),
+	0,	/* XER encoding is XMLDelimitedItemList */
+};
+static /* Use -fall-defs-global to expose */
+asn_TYPE_descriptor_t asn_DEF_E2_ric_InsertRanParameterDef_List_5 = {
+	"ric-InsertRanParameterDef-List",
+	"ric-InsertRanParameterDef-List",
+	&asn_OP_SEQUENCE_OF,
+	asn_DEF_E2_ric_InsertRanParameterDef_List_tags_5,
+	sizeof(asn_DEF_E2_ric_InsertRanParameterDef_List_tags_5)
+		/sizeof(asn_DEF_E2_ric_InsertRanParameterDef_List_tags_5[0]) - 1, /* 1 */
+	asn_DEF_E2_ric_InsertRanParameterDef_List_tags_5,	/* Same as above */
+	sizeof(asn_DEF_E2_ric_InsertRanParameterDef_List_tags_5)
+		/sizeof(asn_DEF_E2_ric_InsertRanParameterDef_List_tags_5[0]), /* 2 */
+	{ 0, &asn_PER_type_E2_ric_InsertRanParameterDef_List_constr_5, SEQUENCE_OF_constraint },
+	asn_MBR_E2_ric_InsertRanParameterDef_List_5,
+	1,	/* Single element */
+	&asn_SPC_E2_ric_InsertRanParameterDef_List_specs_5	/* Additional specs */
+};
+
+asn_TYPE_member_t asn_MBR_E2_RIC_InsertStyle_List_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_InsertStyle_List, ric_InsertStyle_Type),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Style_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-InsertStyle-Type"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_InsertStyle_List, ric_InsertStyle_Name),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Style_Name,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-InsertStyle-Name"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_InsertStyle_List, ric_InsertActionFormat_Type),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Format_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-InsertActionFormat-Type"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_InsertStyle_List, ric_InsertRanParameterDef_List),
+		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
+		0,
+		&asn_DEF_E2_ric_InsertRanParameterDef_List_5,
+		0,
+		{ 0, &asn_PER_memb_E2_ric_InsertRanParameterDef_List_constr_5,  memb_E2_ric_InsertRanParameterDef_List_constraint_1 },
+		0, 0, /* No default value */
+		"ric-InsertRanParameterDef-List"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_InsertStyle_List, ric_IndicationHeaderFormat_Type),
+		(ASN_TAG_CLASS_CONTEXT | (4 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Format_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-IndicationHeaderFormat-Type"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_InsertStyle_List, ric_IndicationMessageFormat_Type),
+		(ASN_TAG_CLASS_CONTEXT | (5 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Format_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-IndicationMessageFormat-Type"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_InsertStyle_List, ric_CallProcessIDFormat_Type),
+		(ASN_TAG_CLASS_CONTEXT | (6 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Format_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-CallProcessIDFormat-Type"
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_RIC_InsertStyle_List_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_RIC_InsertStyle_List_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* ric-InsertStyle-Type */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* ric-InsertStyle-Name */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* ric-InsertActionFormat-Type */
+    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 }, /* ric-InsertRanParameterDef-List */
+    { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 4, 0, 0 }, /* ric-IndicationHeaderFormat-Type */
+    { (ASN_TAG_CLASS_CONTEXT | (5 << 2)), 5, 0, 0 }, /* ric-IndicationMessageFormat-Type */
+    { (ASN_TAG_CLASS_CONTEXT | (6 << 2)), 6, 0, 0 } /* ric-CallProcessIDFormat-Type */
+};
+asn_SEQUENCE_specifics_t asn_SPC_E2_RIC_InsertStyle_List_specs_1 = {
+	sizeof(struct E2_RIC_InsertStyle_List),
+	offsetof(struct E2_RIC_InsertStyle_List, _asn_ctx),
+	asn_MAP_E2_RIC_InsertStyle_List_tag2el_1,
+	7,	/* Count of tags in the map */
+	0, 0, 0,	/* Optional elements (not needed) */
+	7,	/* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_RIC_InsertStyle_List = {
+	"RIC-InsertStyle-List",
+	"RIC-InsertStyle-List",
+	&asn_OP_SEQUENCE,
+	asn_DEF_E2_RIC_InsertStyle_List_tags_1,
+	sizeof(asn_DEF_E2_RIC_InsertStyle_List_tags_1)
+		/sizeof(asn_DEF_E2_RIC_InsertStyle_List_tags_1[0]), /* 1 */
+	asn_DEF_E2_RIC_InsertStyle_List_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_RIC_InsertStyle_List_tags_1)
+		/sizeof(asn_DEF_E2_RIC_InsertStyle_List_tags_1[0]), /* 1 */
+	{ 0, 0, SEQUENCE_constraint },
+	asn_MBR_E2_RIC_InsertStyle_List_1,
+	7,	/* Elements count */
+	&asn_SPC_E2_RIC_InsertStyle_List_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-InsertStyle-List.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-InsertStyle-List.h
new file mode 100644
index 0000000..4a26a73
--- /dev/null
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-InsertStyle-List.h
@@ -0,0 +1,62 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-X2-IEs"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_RIC_InsertStyle_List_H_
+#define	_E2_RIC_InsertStyle_List_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_RIC-Style-Type.h"
+#include "E2_RIC-Style-Name.h"
+#include "E2_RIC-Format-Type.h"
+#include "asn_SEQUENCE_OF.h"
+#include "constr_SEQUENCE_OF.h"
+#include "constr_SEQUENCE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct E2_RANparameterDef_Item;
+
+/* E2_RIC-InsertStyle-List */
+typedef struct E2_RIC_InsertStyle_List {
+	E2_RIC_Style_Type_t	 ric_InsertStyle_Type;
+	E2_RIC_Style_Name_t	 ric_InsertStyle_Name;
+	E2_RIC_Format_Type_t	 ric_InsertActionFormat_Type;
+	struct E2_RIC_InsertStyle_List__ric_InsertRanParameterDef_List {
+		A_SEQUENCE_OF(struct E2_RANparameterDef_Item) list;
+		
+		/* Context for parsing across buffer boundaries */
+		asn_struct_ctx_t _asn_ctx;
+	} ric_InsertRanParameterDef_List;
+	E2_RIC_Format_Type_t	 ric_IndicationHeaderFormat_Type;
+	E2_RIC_Format_Type_t	 ric_IndicationMessageFormat_Type;
+	E2_RIC_Format_Type_t	 ric_CallProcessIDFormat_Type;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_RIC_InsertStyle_List_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_RIC_InsertStyle_List;
+extern asn_SEQUENCE_specifics_t asn_SPC_E2_RIC_InsertStyle_List_specs_1;
+extern asn_TYPE_member_t asn_MBR_E2_RIC_InsertStyle_List_1[7];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_RIC_InsertStyle_List_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-PolicyStyle-List.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-PolicyStyle-List.c
new file mode 100644
index 0000000..7c71a46
--- /dev/null
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-PolicyStyle-List.c
@@ -0,0 +1,154 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-X2-IEs"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_RIC-PolicyStyle-List.h"
+
+#include "E2_RANparameterDef-Item.h"
+static int
+memb_E2_ric_PolicyRanParameterDef_List_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	/* Determine the number of elements */
+	size = _A_CSEQUENCE_FROM_VOID(sptr)->count;
+	
+	if((size >= 1 && size <= 255)) {
+		/* Perform validation of the inner elements */
+		return td->encoding_constraints.general_constraints(td, sptr, ctfailcb, app_key);
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static asn_per_constraints_t asn_PER_type_E2_ric_PolicyRanParameterDef_List_constr_5 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 8,  8,  1,  255 }	/* (SIZE(1..255)) */,
+	0, 0	/* No PER value map */
+};
+static asn_per_constraints_t asn_PER_memb_E2_ric_PolicyRanParameterDef_List_constr_5 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 8,  8,  1,  255 }	/* (SIZE(1..255)) */,
+	0, 0	/* No PER value map */
+};
+static asn_TYPE_member_t asn_MBR_E2_ric_PolicyRanParameterDef_List_5[] = {
+	{ ATF_POINTER, 0, 0,
+		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		0,
+		&asn_DEF_E2_RANparameterDef_Item,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		""
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_ric_PolicyRanParameterDef_List_tags_5[] = {
+	(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static asn_SET_OF_specifics_t asn_SPC_E2_ric_PolicyRanParameterDef_List_specs_5 = {
+	sizeof(struct E2_RIC_PolicyStyle_List__ric_PolicyRanParameterDef_List),
+	offsetof(struct E2_RIC_PolicyStyle_List__ric_PolicyRanParameterDef_List, _asn_ctx),
+	0,	/* XER encoding is XMLDelimitedItemList */
+};
+static /* Use -fall-defs-global to expose */
+asn_TYPE_descriptor_t asn_DEF_E2_ric_PolicyRanParameterDef_List_5 = {
+	"ric-PolicyRanParameterDef-List",
+	"ric-PolicyRanParameterDef-List",
+	&asn_OP_SEQUENCE_OF,
+	asn_DEF_E2_ric_PolicyRanParameterDef_List_tags_5,
+	sizeof(asn_DEF_E2_ric_PolicyRanParameterDef_List_tags_5)
+		/sizeof(asn_DEF_E2_ric_PolicyRanParameterDef_List_tags_5[0]) - 1, /* 1 */
+	asn_DEF_E2_ric_PolicyRanParameterDef_List_tags_5,	/* Same as above */
+	sizeof(asn_DEF_E2_ric_PolicyRanParameterDef_List_tags_5)
+		/sizeof(asn_DEF_E2_ric_PolicyRanParameterDef_List_tags_5[0]), /* 2 */
+	{ 0, &asn_PER_type_E2_ric_PolicyRanParameterDef_List_constr_5, SEQUENCE_OF_constraint },
+	asn_MBR_E2_ric_PolicyRanParameterDef_List_5,
+	1,	/* Single element */
+	&asn_SPC_E2_ric_PolicyRanParameterDef_List_specs_5	/* Additional specs */
+};
+
+asn_TYPE_member_t asn_MBR_E2_RIC_PolicyStyle_List_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_PolicyStyle_List, ric_PolicyStyle_Type),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Style_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-PolicyStyle-Type"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_PolicyStyle_List, ric_PolicyStyle_Name),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Style_Name,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-PolicyStyle-Name"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_PolicyStyle_List, ric_PolicyActionFormat_Type),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Format_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-PolicyActionFormat-Type"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_PolicyStyle_List, ric_PolicyRanParameterDef_List),
+		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
+		0,
+		&asn_DEF_E2_ric_PolicyRanParameterDef_List_5,
+		0,
+		{ 0, &asn_PER_memb_E2_ric_PolicyRanParameterDef_List_constr_5,  memb_E2_ric_PolicyRanParameterDef_List_constraint_1 },
+		0, 0, /* No default value */
+		"ric-PolicyRanParameterDef-List"
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_RIC_PolicyStyle_List_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_RIC_PolicyStyle_List_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* ric-PolicyStyle-Type */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* ric-PolicyStyle-Name */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* ric-PolicyActionFormat-Type */
+    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* ric-PolicyRanParameterDef-List */
+};
+asn_SEQUENCE_specifics_t asn_SPC_E2_RIC_PolicyStyle_List_specs_1 = {
+	sizeof(struct E2_RIC_PolicyStyle_List),
+	offsetof(struct E2_RIC_PolicyStyle_List, _asn_ctx),
+	asn_MAP_E2_RIC_PolicyStyle_List_tag2el_1,
+	4,	/* Count of tags in the map */
+	0, 0, 0,	/* Optional elements (not needed) */
+	4,	/* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_RIC_PolicyStyle_List = {
+	"RIC-PolicyStyle-List",
+	"RIC-PolicyStyle-List",
+	&asn_OP_SEQUENCE,
+	asn_DEF_E2_RIC_PolicyStyle_List_tags_1,
+	sizeof(asn_DEF_E2_RIC_PolicyStyle_List_tags_1)
+		/sizeof(asn_DEF_E2_RIC_PolicyStyle_List_tags_1[0]), /* 1 */
+	asn_DEF_E2_RIC_PolicyStyle_List_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_RIC_PolicyStyle_List_tags_1)
+		/sizeof(asn_DEF_E2_RIC_PolicyStyle_List_tags_1[0]), /* 1 */
+	{ 0, 0, SEQUENCE_constraint },
+	asn_MBR_E2_RIC_PolicyStyle_List_1,
+	4,	/* Elements count */
+	&asn_SPC_E2_RIC_PolicyStyle_List_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-PolicyStyle-List.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-PolicyStyle-List.h
new file mode 100644
index 0000000..120bb52
--- /dev/null
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-PolicyStyle-List.h
@@ -0,0 +1,59 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-X2-IEs"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_RIC_PolicyStyle_List_H_
+#define	_E2_RIC_PolicyStyle_List_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_RIC-Style-Type.h"
+#include "E2_RIC-Style-Name.h"
+#include "E2_RIC-Format-Type.h"
+#include "asn_SEQUENCE_OF.h"
+#include "constr_SEQUENCE_OF.h"
+#include "constr_SEQUENCE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct E2_RANparameterDef_Item;
+
+/* E2_RIC-PolicyStyle-List */
+typedef struct E2_RIC_PolicyStyle_List {
+	E2_RIC_Style_Type_t	 ric_PolicyStyle_Type;
+	E2_RIC_Style_Name_t	 ric_PolicyStyle_Name;
+	E2_RIC_Format_Type_t	 ric_PolicyActionFormat_Type;
+	struct E2_RIC_PolicyStyle_List__ric_PolicyRanParameterDef_List {
+		A_SEQUENCE_OF(struct E2_RANparameterDef_Item) list;
+		
+		/* Context for parsing across buffer boundaries */
+		asn_struct_ctx_t _asn_ctx;
+	} ric_PolicyRanParameterDef_List;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_RIC_PolicyStyle_List_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_RIC_PolicyStyle_List;
+extern asn_SEQUENCE_specifics_t asn_SPC_E2_RIC_PolicyStyle_List_specs_1;
+extern asn_TYPE_member_t asn_MBR_E2_RIC_PolicyStyle_List_1[4];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_RIC_PolicyStyle_List_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-ReportStyle-List.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-ReportStyle-List.c
new file mode 100644
index 0000000..fa2e626
--- /dev/null
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-ReportStyle-List.c
@@ -0,0 +1,174 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-X2-IEs"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_RIC-ReportStyle-List.h"
+
+#include "E2_RANparameterDef-Item.h"
+static int
+memb_E2_ric_ReportRanParameterDef_List_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	/* Determine the number of elements */
+	size = _A_CSEQUENCE_FROM_VOID(sptr)->count;
+	
+	if((size >= 1 && size <= 255)) {
+		/* Perform validation of the inner elements */
+		return td->encoding_constraints.general_constraints(td, sptr, ctfailcb, app_key);
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static asn_per_constraints_t asn_PER_type_E2_ric_ReportRanParameterDef_List_constr_5 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 8,  8,  1,  255 }	/* (SIZE(1..255)) */,
+	0, 0	/* No PER value map */
+};
+static asn_per_constraints_t asn_PER_memb_E2_ric_ReportRanParameterDef_List_constr_5 CC_NOTUSED = {
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	{ APC_CONSTRAINED,	 8,  8,  1,  255 }	/* (SIZE(1..255)) */,
+	0, 0	/* No PER value map */
+};
+static asn_TYPE_member_t asn_MBR_E2_ric_ReportRanParameterDef_List_5[] = {
+	{ ATF_POINTER, 0, 0,
+		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		0,
+		&asn_DEF_E2_RANparameterDef_Item,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		""
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_ric_ReportRanParameterDef_List_tags_5[] = {
+	(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static asn_SET_OF_specifics_t asn_SPC_E2_ric_ReportRanParameterDef_List_specs_5 = {
+	sizeof(struct E2_RIC_ReportStyle_List__ric_ReportRanParameterDef_List),
+	offsetof(struct E2_RIC_ReportStyle_List__ric_ReportRanParameterDef_List, _asn_ctx),
+	0,	/* XER encoding is XMLDelimitedItemList */
+};
+static /* Use -fall-defs-global to expose */
+asn_TYPE_descriptor_t asn_DEF_E2_ric_ReportRanParameterDef_List_5 = {
+	"ric-ReportRanParameterDef-List",
+	"ric-ReportRanParameterDef-List",
+	&asn_OP_SEQUENCE_OF,
+	asn_DEF_E2_ric_ReportRanParameterDef_List_tags_5,
+	sizeof(asn_DEF_E2_ric_ReportRanParameterDef_List_tags_5)
+		/sizeof(asn_DEF_E2_ric_ReportRanParameterDef_List_tags_5[0]) - 1, /* 1 */
+	asn_DEF_E2_ric_ReportRanParameterDef_List_tags_5,	/* Same as above */
+	sizeof(asn_DEF_E2_ric_ReportRanParameterDef_List_tags_5)
+		/sizeof(asn_DEF_E2_ric_ReportRanParameterDef_List_tags_5[0]), /* 2 */
+	{ 0, &asn_PER_type_E2_ric_ReportRanParameterDef_List_constr_5, SEQUENCE_OF_constraint },
+	asn_MBR_E2_ric_ReportRanParameterDef_List_5,
+	1,	/* Single element */
+	&asn_SPC_E2_ric_ReportRanParameterDef_List_specs_5	/* Additional specs */
+};
+
+asn_TYPE_member_t asn_MBR_E2_RIC_ReportStyle_List_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_ReportStyle_List, ric_ReportStyle_Type),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Style_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-ReportStyle-Type"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_ReportStyle_List, ric_ReportStyle_Name),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Style_Name,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-ReportStyle-Name"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_ReportStyle_List, ric_ReportActionFormat_Type),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Format_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-ReportActionFormat-Type"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_ReportStyle_List, ric_ReportRanParameterDef_List),
+		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
+		0,
+		&asn_DEF_E2_ric_ReportRanParameterDef_List_5,
+		0,
+		{ 0, &asn_PER_memb_E2_ric_ReportRanParameterDef_List_constr_5,  memb_E2_ric_ReportRanParameterDef_List_constraint_1 },
+		0, 0, /* No default value */
+		"ric-ReportRanParameterDef-List"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_ReportStyle_List, ric_IndicationHeaderFormat_Type),
+		(ASN_TAG_CLASS_CONTEXT | (4 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Format_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-IndicationHeaderFormat-Type"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct E2_RIC_ReportStyle_List, ric_IndicationMessageFormat_Type),
+		(ASN_TAG_CLASS_CONTEXT | (5 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_E2_RIC_Format_Type,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"ric-IndicationMessageFormat-Type"
+		},
+};
+static const ber_tlv_tag_t asn_DEF_E2_RIC_ReportStyle_List_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_E2_RIC_ReportStyle_List_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* ric-ReportStyle-Type */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* ric-ReportStyle-Name */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* ric-ReportActionFormat-Type */
+    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 }, /* ric-ReportRanParameterDef-List */
+    { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 4, 0, 0 }, /* ric-IndicationHeaderFormat-Type */
+    { (ASN_TAG_CLASS_CONTEXT | (5 << 2)), 5, 0, 0 } /* ric-IndicationMessageFormat-Type */
+};
+asn_SEQUENCE_specifics_t asn_SPC_E2_RIC_ReportStyle_List_specs_1 = {
+	sizeof(struct E2_RIC_ReportStyle_List),
+	offsetof(struct E2_RIC_ReportStyle_List, _asn_ctx),
+	asn_MAP_E2_RIC_ReportStyle_List_tag2el_1,
+	6,	/* Count of tags in the map */
+	0, 0, 0,	/* Optional elements (not needed) */
+	6,	/* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_E2_RIC_ReportStyle_List = {
+	"RIC-ReportStyle-List",
+	"RIC-ReportStyle-List",
+	&asn_OP_SEQUENCE,
+	asn_DEF_E2_RIC_ReportStyle_List_tags_1,
+	sizeof(asn_DEF_E2_RIC_ReportStyle_List_tags_1)
+		/sizeof(asn_DEF_E2_RIC_ReportStyle_List_tags_1[0]), /* 1 */
+	asn_DEF_E2_RIC_ReportStyle_List_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_RIC_ReportStyle_List_tags_1)
+		/sizeof(asn_DEF_E2_RIC_ReportStyle_List_tags_1[0]), /* 1 */
+	{ 0, 0, SEQUENCE_constraint },
+	asn_MBR_E2_RIC_ReportStyle_List_1,
+	6,	/* Elements count */
+	&asn_SPC_E2_RIC_ReportStyle_List_specs_1	/* Additional specs */
+};
+
diff --git a/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-ReportStyle-List.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-ReportStyle-List.h
new file mode 100644
index 0000000..83cec43
--- /dev/null
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-ReportStyle-List.h
@@ -0,0 +1,61 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-X2-IEs"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_RIC_ReportStyle_List_H_
+#define	_E2_RIC_ReportStyle_List_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "E2_RIC-Style-Type.h"
+#include "E2_RIC-Style-Name.h"
+#include "E2_RIC-Format-Type.h"
+#include "asn_SEQUENCE_OF.h"
+#include "constr_SEQUENCE_OF.h"
+#include "constr_SEQUENCE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct E2_RANparameterDef_Item;
+
+/* E2_RIC-ReportStyle-List */
+typedef struct E2_RIC_ReportStyle_List {
+	E2_RIC_Style_Type_t	 ric_ReportStyle_Type;
+	E2_RIC_Style_Name_t	 ric_ReportStyle_Name;
+	E2_RIC_Format_Type_t	 ric_ReportActionFormat_Type;
+	struct E2_RIC_ReportStyle_List__ric_ReportRanParameterDef_List {
+		A_SEQUENCE_OF(struct E2_RANparameterDef_Item) list;
+		
+		/* Context for parsing across buffer boundaries */
+		asn_struct_ctx_t _asn_ctx;
+	} ric_ReportRanParameterDef_List;
+	E2_RIC_Format_Type_t	 ric_IndicationHeaderFormat_Type;
+	E2_RIC_Format_Type_t	 ric_IndicationMessageFormat_Type;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} E2_RIC_ReportStyle_List_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_RIC_ReportStyle_List;
+extern asn_SEQUENCE_specifics_t asn_SPC_E2_RIC_ReportStyle_List_specs_1;
+extern asn_TYPE_member_t asn_MBR_E2_RIC_ReportStyle_List_1[6];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_RIC_ReportStyle_List_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-Style-Name.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-Style-Name.c
new file mode 100644
index 0000000..4052755
--- /dev/null
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-Style-Name.c
@@ -0,0 +1,106 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-X2-IEs"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_RIC-Style-Name.h"
+
+static const int permitted_alphabet_table_1[256] = {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/*                  */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/*                  */
+ 1, 0, 0, 0, 0, 0, 0, 2, 3, 4, 0, 5, 6, 7, 8, 9,	/* .      '() +,-./ */
+10,11,12,13,14,15,16,17,18,19,20, 0, 0,21, 0,22,	/* 0123456789:  = ? */
+ 0,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,	/*  ABCDEFGHIJKLMNO */
+38,39,40,41,42,43,44,45,46,47,48, 0, 0, 0, 0, 0,	/* PQRSTUVWXYZ      */
+ 0,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,	/*  abcdefghijklmno */
+64,65,66,67,68,69,70,71,72,73,74, 0, 0, 0, 0, 0,	/* pqrstuvwxyz      */
+};
+static const int permitted_alphabet_code2value_1[74] = {
+32,39,40,41,43,44,45,46,47,48,49,50,51,52,53,54,
+55,56,57,58,61,63,65,66,67,68,69,70,71,72,73,74,
+75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,
+97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,
+113,114,115,116,117,118,119,120,121,122,};
+
+
+static int check_permitted_alphabet_1(const void *sptr) {
+	const int *table = permitted_alphabet_table_1;
+	/* The underlying type is PrintableString */
+	const PrintableString_t *st = (const PrintableString_t *)sptr;
+	const uint8_t *ch = st->buf;
+	const uint8_t *end = ch + st->size;
+	
+	for(; ch < end; ch++) {
+		uint8_t cv = *ch;
+		if(!table[cv]) return -1;
+	}
+	return 0;
+}
+
+int
+E2_RIC_Style_Name_constraint(const asn_TYPE_descriptor_t *td, const void *sptr,
+			asn_app_constraint_failed_f *ctfailcb, void *app_key) {
+	const PrintableString_t *st = (const PrintableString_t *)sptr;
+	size_t size;
+	
+	if(!sptr) {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: value not given (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+	
+	size = st->size;
+	
+	if((size >= 1 && size <= 150)
+		 && !check_permitted_alphabet_1(st)) {
+		/* Constraint check succeeded */
+		return 0;
+	} else {
+		ASN__CTFAIL(app_key, td, sptr,
+			"%s: constraint failed (%s:%d)",
+			td->name, __FILE__, __LINE__);
+		return -1;
+	}
+}
+
+static int asn_PER_MAP_E2_RIC_Style_Name_1_v2c(unsigned int value) {
+	if(value >= sizeof(permitted_alphabet_table_1)/sizeof(permitted_alphabet_table_1[0]))
+		return -1;
+	return permitted_alphabet_table_1[value] - 1;
+}
+static int asn_PER_MAP_E2_RIC_Style_Name_1_c2v(unsigned int code) {
+	if(code >= sizeof(permitted_alphabet_code2value_1)/sizeof(permitted_alphabet_code2value_1[0]))
+		return -1;
+	return permitted_alphabet_code2value_1[code];
+}
+/*
+ * This type is implemented using PrintableString,
+ * so here we adjust the DEF accordingly.
+ */
+asn_per_constraints_t asn_PER_type_E2_RIC_Style_Name_constr_1 CC_NOTUSED = {
+	{ APC_CONSTRAINED,	 7,  7,  32,  122 }	/* (32..122) */,
+	{ APC_CONSTRAINED | APC_EXTENSIBLE,  8,  8,  1,  150 }	/* (SIZE(1..150,...)) */,
+	asn_PER_MAP_E2_RIC_Style_Name_1_v2c,	/* Value to PER code map */
+	asn_PER_MAP_E2_RIC_Style_Name_1_c2v	/* PER code to value map */
+};
+static const ber_tlv_tag_t asn_DEF_E2_RIC_Style_Name_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (19 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_E2_RIC_Style_Name = {
+	"RIC-Style-Name",
+	"RIC-Style-Name",
+	&asn_OP_PrintableString,
+	asn_DEF_E2_RIC_Style_Name_tags_1,
+	sizeof(asn_DEF_E2_RIC_Style_Name_tags_1)
+		/sizeof(asn_DEF_E2_RIC_Style_Name_tags_1[0]), /* 1 */
+	asn_DEF_E2_RIC_Style_Name_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_RIC_Style_Name_tags_1)
+		/sizeof(asn_DEF_E2_RIC_Style_Name_tags_1[0]), /* 1 */
+	{ 0, &asn_PER_type_E2_RIC_Style_Name_constr_1, E2_RIC_Style_Name_constraint },
+	0, 0,	/* No members */
+	0	/* No specifics */
+};
+
diff --git a/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-Style-Name.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-Style-Name.h
new file mode 100644
index 0000000..e5977be
--- /dev/null
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-Style-Name.h
@@ -0,0 +1,44 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-X2-IEs"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_RIC_Style_Name_H_
+#define	_E2_RIC_Style_Name_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "PrintableString.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_RIC-Style-Name */
+typedef PrintableString_t	 E2_RIC_Style_Name_t;
+
+/* Implementation */
+extern asn_per_constraints_t asn_PER_type_E2_RIC_Style_Name_constr_1;
+extern asn_TYPE_descriptor_t asn_DEF_E2_RIC_Style_Name;
+asn_struct_free_f E2_RIC_Style_Name_free;
+asn_struct_print_f E2_RIC_Style_Name_print;
+asn_constr_check_f E2_RIC_Style_Name_constraint;
+ber_type_decoder_f E2_RIC_Style_Name_decode_ber;
+der_type_encoder_f E2_RIC_Style_Name_encode_der;
+xer_type_decoder_f E2_RIC_Style_Name_decode_xer;
+xer_type_encoder_f E2_RIC_Style_Name_encode_xer;
+per_type_decoder_f E2_RIC_Style_Name_decode_uper;
+per_type_encoder_f E2_RIC_Style_Name_encode_uper;
+per_type_decoder_f E2_RIC_Style_Name_decode_aper;
+per_type_encoder_f E2_RIC_Style_Name_encode_aper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_RIC_Style_Name_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-Style-Type.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-Style-Type.c
new file mode 100644
index 0000000..82e938d
--- /dev/null
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-Style-Type.c
@@ -0,0 +1,31 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-X2-IEs"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#include "E2_RIC-Style-Type.h"
+
+/*
+ * This type is implemented using NativeInteger,
+ * so here we adjust the DEF accordingly.
+ */
+static const ber_tlv_tag_t asn_DEF_E2_RIC_Style_Type_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (2 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_E2_RIC_Style_Type = {
+	"RIC-Style-Type",
+	"RIC-Style-Type",
+	&asn_OP_NativeInteger,
+	asn_DEF_E2_RIC_Style_Type_tags_1,
+	sizeof(asn_DEF_E2_RIC_Style_Type_tags_1)
+		/sizeof(asn_DEF_E2_RIC_Style_Type_tags_1[0]), /* 1 */
+	asn_DEF_E2_RIC_Style_Type_tags_1,	/* Same as above */
+	sizeof(asn_DEF_E2_RIC_Style_Type_tags_1)
+		/sizeof(asn_DEF_E2_RIC_Style_Type_tags_1[0]), /* 1 */
+	{ 0, 0, NativeInteger_constraint },
+	0, 0,	/* No members */
+	0	/* No specifics */
+};
+
diff --git a/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-Style-Type.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-Style-Type.h
new file mode 100644
index 0000000..ec2704a
--- /dev/null
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_RIC-Style-Type.h
@@ -0,0 +1,43 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "E2SM-gNB-X2-IEs"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
+ * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
+ */
+
+#ifndef	_E2_RIC_Style_Type_H_
+#define	_E2_RIC_Style_Type_H_
+
+
+#include "asn_application.h"
+
+/* Including external dependencies */
+#include "NativeInteger.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* E2_RIC-Style-Type */
+typedef long	 E2_RIC_Style_Type_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_E2_RIC_Style_Type;
+asn_struct_free_f E2_RIC_Style_Type_free;
+asn_struct_print_f E2_RIC_Style_Type_print;
+asn_constr_check_f E2_RIC_Style_Type_constraint;
+ber_type_decoder_f E2_RIC_Style_Type_decode_ber;
+der_type_encoder_f E2_RIC_Style_Type_encode_der;
+xer_type_decoder_f E2_RIC_Style_Type_decode_xer;
+xer_type_encoder_f E2_RIC_Style_Type_encode_xer;
+per_type_decoder_f E2_RIC_Style_Type_decode_uper;
+per_type_encoder_f E2_RIC_Style_Type_encode_uper;
+per_type_decoder_f E2_RIC_Style_Type_decode_aper;
+per_type_encoder_f E2_RIC_Style_Type_encode_aper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _E2_RIC_Style_Type_H_ */
+#include "asn_internal.h"
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_Style-ID.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_Style-ID.c
similarity index 95%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_Style-ID.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_Style-ID.c
index 02d5676..829c8b7 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_Style-ID.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_Style-ID.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_Style-ID.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_Style-ID.h
similarity index 95%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_Style-ID.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_Style-ID.h
index b1cc66a..d959947 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_Style-ID.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_Style-ID.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_TimeStamp.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_TimeStamp.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_TimeStamp.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_TimeStamp.c
index 760b4f0..fba0d1f 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_TimeStamp.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_TimeStamp.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_TimeStamp.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_TimeStamp.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_TimeStamp.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_TimeStamp.h
index 1b1e6e8..91b6417 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_TimeStamp.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_TimeStamp.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_TypeOfMessage.c b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_TypeOfMessage.c
similarity index 97%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_TypeOfMessage.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_TypeOfMessage.c
index 3872b04..8f60c5b 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_TypeOfMessage.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_TypeOfMessage.c
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_TypeOfMessage.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_TypeOfMessage.h
similarity index 96%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_TypeOfMessage.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_TypeOfMessage.h
index 7949847..948b3da 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_TypeOfMessage.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_TypeOfMessage.h
@@ -1,7 +1,7 @@
 /*
  * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
  * From ASN.1 module "E2SM-gNB-X2-IEs"
- * 	found in "spec/e2sm-gNB-X2-v308.asn1"
+ * 	found in "spec/e2sm-gNB-X2-v401.asn"
  * 	`asn1c -pdu=auto -fincludes-quoted -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example`
  */
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_asn_constant.h b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_asn_constant.h
similarity index 92%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/E2_asn_constant.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/E2_asn_constant.h
index 6ffc611..bb823f0 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/E2_asn_constant.h
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/E2_asn_constant.h
@@ -14,6 +14,7 @@
 #define E2_maxofUEgroup (15)
 #define E2_maxofActionParameters (255)
 #define E2_maxofRANParameters (255)
+#define E2_maxofRICstyles (63)
 
 
 #ifdef __cplusplus
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/INTEGER.c b/3rdparty/E2SM-gNB-X2-V4.0.1/INTEGER.c
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/INTEGER.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/INTEGER.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/INTEGER.h b/3rdparty/E2SM-gNB-X2-V4.0.1/INTEGER.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/INTEGER.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/INTEGER.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/Makefile.am.libasncodec b/3rdparty/E2SM-gNB-X2-V4.0.1/Makefile.am.libasncodec
similarity index 87%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/Makefile.am.libasncodec
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/Makefile.am.libasncodec
index 345a9ee..151b249 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/Makefile.am.libasncodec
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/Makefile.am.libasncodec
@@ -23,6 +23,7 @@
 	E2_E2SM-gNB-X2-ControlHeaderChoice.c	\
 	E2_E2SM-gNB-X2-controlMessage.c	\
 	E2_E2SM-gNB-X2-ControlMessageChoice.c	\
+	E2_E2SM-gNB-X2-RANfunction-Definition.c	\
 	E2_ActionParameter-Item.c	\
 	E2_ActionParameter-ID.c	\
 	E2_ActionParameter-Value.c	\
@@ -36,15 +37,27 @@
 	E2_InterfaceProtocolIE-ID.c	\
 	E2_InterfaceProtocolIE-Test.c	\
 	E2_InterfaceProtocolIE-Value.c	\
+	E2_RANfunction-Name.c	\
 	E2_RANParameter-Item.c	\
+	E2_RANparameterDef-Item.c	\
 	E2_RANParameter-ID.c	\
+	E2_RANParameter-Name.c	\
 	E2_RANParameter-Test.c	\
+	E2_RANParameter-Type.c	\
 	E2_RANParameter-Value.c	\
 	E2_RANueGroup-Item.c	\
 	E2_RANimperativePolicy.c	\
 	E2_RANueGroupID.c	\
 	E2_RANueGroupDefinition.c	\
 	E2_RANueGroupDef-Item.c	\
+	E2_RIC-ControlStyle-List.c	\
+	E2_RIC-EventTriggerStyle-List.c	\
+	E2_RIC-InsertStyle-List.c	\
+	E2_RIC-PolicyStyle-List.c	\
+	E2_RIC-ReportStyle-List.c	\
+	E2_RIC-Format-Type.c	\
+	E2_RIC-Style-Type.c	\
+	E2_RIC-Style-Name.c	\
 	E2_Style-ID.c	\
 	E2_TimeStamp.c
 
@@ -73,6 +86,7 @@
 	E2_E2SM-gNB-X2-ControlHeaderChoice.h	\
 	E2_E2SM-gNB-X2-controlMessage.h	\
 	E2_E2SM-gNB-X2-ControlMessageChoice.h	\
+	E2_E2SM-gNB-X2-RANfunction-Definition.h	\
 	E2_ActionParameter-Item.h	\
 	E2_ActionParameter-ID.h	\
 	E2_ActionParameter-Value.h	\
@@ -86,15 +100,27 @@
 	E2_InterfaceProtocolIE-ID.h	\
 	E2_InterfaceProtocolIE-Test.h	\
 	E2_InterfaceProtocolIE-Value.h	\
+	E2_RANfunction-Name.h	\
 	E2_RANParameter-Item.h	\
+	E2_RANparameterDef-Item.h	\
 	E2_RANParameter-ID.h	\
+	E2_RANParameter-Name.h	\
 	E2_RANParameter-Test.h	\
+	E2_RANParameter-Type.h	\
 	E2_RANParameter-Value.h	\
 	E2_RANueGroup-Item.h	\
 	E2_RANimperativePolicy.h	\
 	E2_RANueGroupID.h	\
 	E2_RANueGroupDefinition.h	\
 	E2_RANueGroupDef-Item.h	\
+	E2_RIC-ControlStyle-List.h	\
+	E2_RIC-EventTriggerStyle-List.h	\
+	E2_RIC-InsertStyle-List.h	\
+	E2_RIC-PolicyStyle-List.h	\
+	E2_RIC-ReportStyle-List.h	\
+	E2_RIC-Format-Type.h	\
+	E2_RIC-Style-Type.h	\
+	E2_RIC-Style-Name.h	\
 	E2_Style-ID.h	\
 	E2_TimeStamp.h
 
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/NativeEnumerated.c b/3rdparty/E2SM-gNB-X2-V4.0.1/NativeEnumerated.c
similarity index 96%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/NativeEnumerated.c
copy to 3rdparty/E2SM-gNB-X2-V4.0.1/NativeEnumerated.c
index 50ffb1d..800da97 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/NativeEnumerated.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/NativeEnumerated.c
@@ -97,7 +97,7 @@
     const asn_INTEGER_specifics_t *specs = td->specifics;
     asn_dec_rval_t rval = { RC_OK, 0 };
 	long *native = (long *)*sptr;
-	const asn_per_constraint_t *ct = NULL;
+	const asn_per_constraint_t *ct;
 	long value;
 
 	(void)opt_codec_ctx;
@@ -115,7 +115,7 @@
 
 	ASN_DEBUG("Decoding %s as NativeEnumerated", td->name);
 
-	if(ct && ct->flags & APC_EXTENSIBLE) {
+	if(ct->flags & APC_EXTENSIBLE) {
 		int inext = per_get_few_bits(pd, 1);
 		if(inext < 0) ASN__DECODE_STARVED;
 		if(inext) ct = 0;
@@ -165,7 +165,7 @@
         (const asn_INTEGER_specifics_t *)td->specifics;
 	asn_enc_rval_t er = {0,0,0};
 	long native, value;
-	const asn_per_constraint_t *ct = NULL;
+	const asn_per_constraint_t *ct;
 	int inext = 0;
 	asn_INTEGER_enum_map_t key;
 	const asn_INTEGER_enum_map_t *kf;
@@ -193,13 +193,13 @@
 	}
 	value = kf - specs->value2enum;
 
-	if(ct && ct->range_bits >= 0) {
+	if(ct->range_bits >= 0) {
 		int cmpWith = specs->extension
 				? specs->extension - 1 : specs->map_count;
 		if(value >= cmpWith)
 			inext = 1;
 	}
-	if(ct && ct->flags & APC_EXTENSIBLE) {
+	if(ct->flags & APC_EXTENSIBLE) {
 		if(per_put_few_bits(po, inext, 1))
 			ASN__ENCODE_FAILED;
 		if(inext) ct = 0;
@@ -236,7 +236,7 @@
 	const asn_INTEGER_specifics_t *specs = (const asn_INTEGER_specifics_t *)td->specifics;
 	asn_dec_rval_t rval = { RC_OK, 0 };
 	long *native = (long *)*sptr;
-	const asn_per_constraint_t *ct = NULL;
+	const asn_per_constraint_t *ct;
 	long value;
 
 	(void)opt_codec_ctx;
@@ -254,7 +254,7 @@
 
 	ASN_DEBUG("Decoding %s as NativeEnumerated", td->name);
 
-	if(ct && ct->flags & APC_EXTENSIBLE) {
+	if(ct->flags & APC_EXTENSIBLE) {
 		int inext = per_get_few_bits(pd, 1);
 		if(inext < 0) ASN__DECODE_STARVED;
 		if(inext) ct = 0;
@@ -302,7 +302,7 @@
 	const asn_INTEGER_specifics_t *specs = (const asn_INTEGER_specifics_t *)td->specifics;
 	asn_enc_rval_t er = {0,0,0};
 	long native, value;
-	const asn_per_constraint_t *ct = NULL;
+	const asn_per_constraint_t *ct;
 	int inext = 0;
 	asn_INTEGER_enum_map_t key;
 	asn_INTEGER_enum_map_t *kf;
@@ -331,13 +331,13 @@
 	}
 	value = kf - specs->value2enum;
 
-	if(ct && ct->range_bits >= 0) {
+	if(ct->range_bits >= 0) {
 		int cmpWith = specs->extension
 		              ? specs->extension - 1 : specs->map_count;
 		if(value >= cmpWith)
 			inext = 1;
 	}
-	if(ct && ct->flags & APC_EXTENSIBLE) {
+	if(ct->flags & APC_EXTENSIBLE) {
 		if(per_put_few_bits(po, inext, 1))
 			ASN__ENCODE_FAILED;
 		if(inext) ct = 0;
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/NativeEnumerated.h b/3rdparty/E2SM-gNB-X2-V4.0.1/NativeEnumerated.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/NativeEnumerated.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/NativeEnumerated.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/NativeInteger.c b/3rdparty/E2SM-gNB-X2-V4.0.1/NativeInteger.c
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/NativeInteger.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/NativeInteger.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/NativeInteger.h b/3rdparty/E2SM-gNB-X2-V4.0.1/NativeInteger.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/NativeInteger.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/NativeInteger.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/OCTET_STRING.c b/3rdparty/E2SM-gNB-X2-V4.0.1/OCTET_STRING.c
similarity index 99%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/OCTET_STRING.c
copy to 3rdparty/E2SM-gNB-X2-V4.0.1/OCTET_STRING.c
index ae34c96..432ce5a 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/OCTET_STRING.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/OCTET_STRING.c
@@ -157,7 +157,7 @@
 		nel = (struct _stack_el *)CALLOC(1, sizeof(struct _stack_el));
 		if(nel == NULL)
 			return NULL;
-
+	
 		if(st->tail) {
 			/* Increase a subcontainment depth */
 			nel->cont_level = st->tail->cont_level + 1;
@@ -745,7 +745,7 @@
 			return 0;
 		}
 	}
-
+	
 	return -1;	/* No, it's not */
 }
 
@@ -1956,9 +1956,7 @@
 		        ret = aper_put_length(po, csiz->upper_bound - csiz->lower_bound + 1, sizeinunits - csiz->lower_bound);
 		        if(ret) ASN__ENCODE_FAILED;
 		}
-		/* EB MOD
-                   AFAIU if lb != ub it is aligned whatever the number of bits */
-		if ((st->size > 2) || (csiz->lower_bound != csiz->upper_bound)) { /* X.691 #16.11 */
+		if (st->size > 2) { /* X.691 #16 NOTE 1 */
 			if (aper_put_align(po) < 0)
 				ASN__ENCODE_FAILED;
 		}
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/OCTET_STRING.h b/3rdparty/E2SM-gNB-X2-V4.0.1/OCTET_STRING.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/OCTET_STRING.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/OCTET_STRING.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/OPEN_TYPE.c b/3rdparty/E2SM-gNB-X2-V4.0.1/OPEN_TYPE.c
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/OPEN_TYPE.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/OPEN_TYPE.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/OPEN_TYPE.h b/3rdparty/E2SM-gNB-X2-V4.0.1/OPEN_TYPE.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/OPEN_TYPE.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/OPEN_TYPE.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/PrintableString.c b/3rdparty/E2SM-gNB-X2-V4.0.1/PrintableString.c
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/PrintableString.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/PrintableString.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/PrintableString.h b/3rdparty/E2SM-gNB-X2-V4.0.1/PrintableString.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/PrintableString.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/PrintableString.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_SEQUENCE_OF.c b/3rdparty/E2SM-gNB-X2-V4.0.1/asn_SEQUENCE_OF.c
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_SEQUENCE_OF.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/asn_SEQUENCE_OF.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_SEQUENCE_OF.h b/3rdparty/E2SM-gNB-X2-V4.0.1/asn_SEQUENCE_OF.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_SEQUENCE_OF.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/asn_SEQUENCE_OF.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_SET_OF.c b/3rdparty/E2SM-gNB-X2-V4.0.1/asn_SET_OF.c
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_SET_OF.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/asn_SET_OF.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_SET_OF.h b/3rdparty/E2SM-gNB-X2-V4.0.1/asn_SET_OF.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_SET_OF.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/asn_SET_OF.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_application.c b/3rdparty/E2SM-gNB-X2-V4.0.1/asn_application.c
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_application.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/asn_application.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_application.h b/3rdparty/E2SM-gNB-X2-V4.0.1/asn_application.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_application.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/asn_application.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_bit_data.c b/3rdparty/E2SM-gNB-X2-V4.0.1/asn_bit_data.c
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_bit_data.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/asn_bit_data.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_bit_data.h b/3rdparty/E2SM-gNB-X2-V4.0.1/asn_bit_data.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_bit_data.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/asn_bit_data.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_codecs.h b/3rdparty/E2SM-gNB-X2-V4.0.1/asn_codecs.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_codecs.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/asn_codecs.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_codecs_prim.c b/3rdparty/E2SM-gNB-X2-V4.0.1/asn_codecs_prim.c
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_codecs_prim.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/asn_codecs_prim.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_codecs_prim.h b/3rdparty/E2SM-gNB-X2-V4.0.1/asn_codecs_prim.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_codecs_prim.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/asn_codecs_prim.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_internal.c b/3rdparty/E2SM-gNB-X2-V4.0.1/asn_internal.c
similarity index 93%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_internal.c
copy to 3rdparty/E2SM-gNB-X2-V4.0.1/asn_internal.c
index 004660b..1aff95f 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_internal.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/asn_internal.c
@@ -26,12 +26,11 @@
         buf_size <<= 1;
         if(buf == scratch) {
             buf = MALLOC(buf_size);
-            if(!buf) { va_end(args); return -1; }
+            if(!buf) return -1;
         } else {
             void *p = REALLOC(buf, buf_size);
             if(!p) {
                 FREEMEM(buf);
-		va_end(args);
                 return -1;
             }
             buf = p;
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_internal.h b/3rdparty/E2SM-gNB-X2-V4.0.1/asn_internal.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_internal.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/asn_internal.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_ioc.h b/3rdparty/E2SM-gNB-X2-V4.0.1/asn_ioc.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_ioc.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/asn_ioc.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_random_fill.c b/3rdparty/E2SM-gNB-X2-V4.0.1/asn_random_fill.c
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_random_fill.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/asn_random_fill.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_random_fill.h b/3rdparty/E2SM-gNB-X2-V4.0.1/asn_random_fill.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_random_fill.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/asn_random_fill.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/asn_system.h b/3rdparty/E2SM-gNB-X2-V4.0.1/asn_system.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/asn_system.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/asn_system.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/ber_decoder.c b/3rdparty/E2SM-gNB-X2-V4.0.1/ber_decoder.c
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/ber_decoder.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/ber_decoder.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/ber_decoder.h b/3rdparty/E2SM-gNB-X2-V4.0.1/ber_decoder.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/ber_decoder.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/ber_decoder.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/ber_tlv_length.c b/3rdparty/E2SM-gNB-X2-V4.0.1/ber_tlv_length.c
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/ber_tlv_length.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/ber_tlv_length.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/ber_tlv_length.h b/3rdparty/E2SM-gNB-X2-V4.0.1/ber_tlv_length.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/ber_tlv_length.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/ber_tlv_length.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/ber_tlv_tag.c b/3rdparty/E2SM-gNB-X2-V4.0.1/ber_tlv_tag.c
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/ber_tlv_tag.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/ber_tlv_tag.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/ber_tlv_tag.h b/3rdparty/E2SM-gNB-X2-V4.0.1/ber_tlv_tag.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/ber_tlv_tag.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/ber_tlv_tag.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/constr_CHOICE.c b/3rdparty/E2SM-gNB-X2-V4.0.1/constr_CHOICE.c
similarity index 95%
copy from 3rdparty/E2SM-gNB-X2-V3.0.8/constr_CHOICE.c
copy to 3rdparty/E2SM-gNB-X2-V4.0.1/constr_CHOICE.c
index 86dcbb0..613e6ea 100644
--- a/3rdparty/E2SM-gNB-X2-V3.0.8/constr_CHOICE.c
+++ b/3rdparty/E2SM-gNB-X2-V4.0.1/constr_CHOICE.c
@@ -1017,7 +1017,6 @@
 	const asn_CHOICE_specifics_t *specs = (const asn_CHOICE_specifics_t *)td->specifics;
 	asn_dec_rval_t rv;
 	const asn_per_constraint_t *ct;
-	const asn_per_constraint_t *ext_ct = NULL;
 	asn_TYPE_member_t *elm;	/* CHOICE's element */
 	void *memb_ptr;
 	void **memb_ptr2;
@@ -1043,13 +1042,9 @@
 	if(ct && ct->flags & APC_EXTENSIBLE) {
 		value = per_get_few_bits(pd, 1);
 		if(value < 0) ASN__DECODE_STARVED;
-		if(value) {
-		  ext_ct = ct;
-		  ct = 0;	/* Not restricted */
-		}
+		if(value) ct = 0;	/* Not restricted */
 	}
 
-
 	if(ct && ct->range_bits >= 0) {
 		value = per_get_few_bits(pd, ct->range_bits);
 		if(value < 0) ASN__DECODE_STARVED;
@@ -1060,7 +1055,7 @@
 	} else {
 		if(specs->ext_start == -1)
 			ASN__DECODE_FAILED;
-		value = aper_get_nsnnwn(pd, ext_ct->range_bits);
+		value = uper_get_nsnnwn(pd);
 		if(value < 0) ASN__DECODE_STARVED;
 		value += specs->ext_start;
 		if((unsigned)value >= td->elements_count)
@@ -1088,7 +1083,7 @@
 		rv = elm->type->op->aper_decoder(opt_codec_ctx, elm->type,
 		                                 elm->encoding_constraints.per_constraints, memb_ptr2, pd);
 	} else {
-		rv = aper_open_type_get(opt_codec_ctx, elm->type,
+		rv = uper_open_type_get(opt_codec_ctx, elm->type,
 		                        elm->encoding_constraints.per_constraints, memb_ptr2, pd);
 	}
 
@@ -1104,12 +1099,10 @@
                    const void *sptr, asn_per_outp_t *po) {
 	const asn_CHOICE_specifics_t *specs = (const asn_CHOICE_specifics_t *)td->specifics;
 	const asn_TYPE_member_t *elm; /* CHOICE's element */
-	const asn_per_constraint_t *ct = NULL;
-	const asn_per_constraint_t *ext_ct = NULL;
+	const asn_per_constraint_t *ct;
 	const void *memb_ptr;
-	unsigned present;
-	int present_enc;
-	
+	int present;
+
 	if(!sptr) ASN__ENCODE_FAILED;
 
 	ASN_DEBUG("Encoding %s as CHOICE using ALIGNED PER", td->name);
@@ -1117,7 +1110,7 @@
 	if(constraints) ct = &constraints->value;
 	else if(td->encoding_constraints.per_constraints)
 		ct = &td->encoding_constraints.per_constraints->value;
-	else ct = NULL;
+	else ct = 0;
 
 	present = _fetch_present_idx(sptr,
 	                             specs->pres_offset, specs->pres_size);
@@ -1133,38 +1126,25 @@
 
 	/* Adjust if canonical order is different from natural order */
 	if(specs->to_canonical_order)
-		present_enc = specs->to_canonical_order[present];
-	else
-	        present_enc = present;
-	
+		present = specs->to_canonical_order[present];
+
 	ASN_DEBUG("Encoding %s CHOICE element %d", td->name, present);
 
-	if(ct && (ct->range_bits >= 0)) {
-	  // Value is not within the range of the primary values ?
-	  if(present < ct->lower_bound || present > ct->upper_bound) {
-	    if(ct->flags & APC_EXTENSIBLE) {
-	      ASN_DEBUG("CHOICE member %d (enc %d) is an extension (%ld..%ld)",
-			present, present_enc, ct->lower_bound, ct->upper_bound);
-	      // X691/23.5 Extension marker = 1 
-	      if(per_put_few_bits(po, 1, 1)) {
-		ASN__ENCODE_FAILED;
-	      }
-	    } else {
-	      ASN__ENCODE_FAILED;
-	    }
-	    // no more need of constraint.
-	    ext_ct = ct;
-	    ct = NULL;
-	  }
+	if(ct && ct->range_bits >= 0) {
+		if(present < ct->lower_bound
+		        || present > ct->upper_bound) {
+			if(ct->flags & APC_EXTENSIBLE) {
+				if(per_put_few_bits(po, 1, 1))
+					ASN__ENCODE_FAILED;
+			} else {
+				ASN__ENCODE_FAILED;
+			}
+			ct = 0;
+		}
 	}
-	
-	if(ct && (ct->flags & APC_EXTENSIBLE)) {
-	  ASN_DEBUG("CHOICE member %d (enc %d) is not an extension (%ld..%ld)",
-		    present, present, ct->lower_bound, ct->upper_bound);
-	  // X691.23.5 Extension marker = 0
-	  if(per_put_few_bits(po, 0, 1)) {
-	    ASN__ENCODE_FAILED;
-	  }
+	if(ct && ct->flags & APC_EXTENSIBLE) {
+		if(per_put_few_bits(po, 0, 1))
+			ASN__ENCODE_FAILED;
 	}
 
 	elm = &td->elements[present];
@@ -1176,10 +1156,8 @@
 		memb_ptr = (const char *)sptr + elm->memb_offset;
 	}
 
-	if(ct && (ct->range_bits >= 0)) {
-	        // By construction (ct != 0), the alternative value is a non extended one.
-	        // X691/23.7 X691/23.6 alternative value encoded as a range_bits bits value.
-		if(per_put_few_bits(po, present_enc, ct->range_bits))
+	if(ct && ct->range_bits >= 0) {
+		if(per_put_few_bits(po, present, ct->range_bits))
 			ASN__ENCODE_FAILED;
 
 		return elm->type->op->aper_encoder(elm->type, elm->encoding_constraints.per_constraints,
@@ -1188,10 +1166,10 @@
 		asn_enc_rval_t rval = {0,0,0};
 		if(specs->ext_start == -1)
 			ASN__ENCODE_FAILED;
-		// X691/23.8 normally encoded as a small non negative whole number
-		
-		if(ext_ct && aper_put_nsnnwn(po, ext_ct->range_bits, present_enc - specs->ext_start))
+		if (ct) {
+		  if(aper_put_nsnnwn(po, ct->range_bits, present - specs->ext_start))
 			ASN__ENCODE_FAILED;
+		}
 		if(aper_open_type_put(elm->type, elm->encoding_constraints.per_constraints,
 		                      memb_ptr, po))
 			ASN__ENCODE_FAILED;
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/constr_CHOICE.h b/3rdparty/E2SM-gNB-X2-V4.0.1/constr_CHOICE.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/constr_CHOICE.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/constr_CHOICE.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/constr_SEQUENCE.c b/3rdparty/E2SM-gNB-X2-V4.0.1/constr_SEQUENCE.c
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/constr_SEQUENCE.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/constr_SEQUENCE.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/constr_SEQUENCE.h b/3rdparty/E2SM-gNB-X2-V4.0.1/constr_SEQUENCE.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/constr_SEQUENCE.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/constr_SEQUENCE.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/constr_SEQUENCE_OF.c b/3rdparty/E2SM-gNB-X2-V4.0.1/constr_SEQUENCE_OF.c
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/constr_SEQUENCE_OF.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/constr_SEQUENCE_OF.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/constr_SEQUENCE_OF.h b/3rdparty/E2SM-gNB-X2-V4.0.1/constr_SEQUENCE_OF.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/constr_SEQUENCE_OF.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/constr_SEQUENCE_OF.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/constr_SET_OF.c b/3rdparty/E2SM-gNB-X2-V4.0.1/constr_SET_OF.c
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/constr_SET_OF.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/constr_SET_OF.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/constr_SET_OF.h b/3rdparty/E2SM-gNB-X2-V4.0.1/constr_SET_OF.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/constr_SET_OF.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/constr_SET_OF.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/constr_TYPE.c b/3rdparty/E2SM-gNB-X2-V4.0.1/constr_TYPE.c
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/constr_TYPE.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/constr_TYPE.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/constr_TYPE.h b/3rdparty/E2SM-gNB-X2-V4.0.1/constr_TYPE.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/constr_TYPE.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/constr_TYPE.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/constraints.c b/3rdparty/E2SM-gNB-X2-V4.0.1/constraints.c
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/constraints.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/constraints.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/constraints.h b/3rdparty/E2SM-gNB-X2-V4.0.1/constraints.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/constraints.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/constraints.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/der_encoder.c b/3rdparty/E2SM-gNB-X2-V4.0.1/der_encoder.c
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/der_encoder.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/der_encoder.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/der_encoder.h b/3rdparty/E2SM-gNB-X2-V4.0.1/der_encoder.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/der_encoder.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/der_encoder.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/per_decoder.c b/3rdparty/E2SM-gNB-X2-V4.0.1/per_decoder.c
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/per_decoder.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/per_decoder.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/per_decoder.h b/3rdparty/E2SM-gNB-X2-V4.0.1/per_decoder.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/per_decoder.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/per_decoder.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/per_encoder.c b/3rdparty/E2SM-gNB-X2-V4.0.1/per_encoder.c
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/per_encoder.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/per_encoder.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/per_encoder.h b/3rdparty/E2SM-gNB-X2-V4.0.1/per_encoder.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/per_encoder.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/per_encoder.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/per_opentype.c b/3rdparty/E2SM-gNB-X2-V4.0.1/per_opentype.c
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/per_opentype.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/per_opentype.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/per_opentype.h b/3rdparty/E2SM-gNB-X2-V4.0.1/per_opentype.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/per_opentype.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/per_opentype.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/per_support.c b/3rdparty/E2SM-gNB-X2-V4.0.1/per_support.c
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/per_support.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/per_support.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/per_support.h b/3rdparty/E2SM-gNB-X2-V4.0.1/per_support.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/per_support.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/per_support.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/xer_decoder.c b/3rdparty/E2SM-gNB-X2-V4.0.1/xer_decoder.c
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/xer_decoder.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/xer_decoder.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/xer_decoder.h b/3rdparty/E2SM-gNB-X2-V4.0.1/xer_decoder.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/xer_decoder.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/xer_decoder.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/xer_encoder.c b/3rdparty/E2SM-gNB-X2-V4.0.1/xer_encoder.c
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/xer_encoder.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/xer_encoder.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/xer_encoder.h b/3rdparty/E2SM-gNB-X2-V4.0.1/xer_encoder.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/xer_encoder.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/xer_encoder.h
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/xer_support.c b/3rdparty/E2SM-gNB-X2-V4.0.1/xer_support.c
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/xer_support.c
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/xer_support.c
diff --git a/3rdparty/E2SM-gNB-X2-V3.0.8/xer_support.h b/3rdparty/E2SM-gNB-X2-V4.0.1/xer_support.h
similarity index 100%
rename from 3rdparty/E2SM-gNB-X2-V3.0.8/xer_support.h
rename to 3rdparty/E2SM-gNB-X2-V4.0.1/xer_support.h
diff --git a/Dockerfile b/Dockerfile
index 41c8f46..cb71b39 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -65,7 +65,14 @@
     cp *.h /usr/local/include/ && \
     ldconfig
 
-RUN cd 3rdparty/E2SM-gNB-X2-V3.0.8 && \
+RUN cd 3rdparty/E2SM-gNB-NRT_V4.0.1 && \
+    gcc -c ${CFLAGS} -I. -g -fPIC *.c  && \
+    gcc *.o -g -shared -o libgnbnrt.so && \
+    cp libgnbnrt.so /usr/local/lib/ && \
+    cp *.h /usr/local/include/ && \
+    ldconfig
+
+RUN cd 3rdparty/E2SM-gNB-X2-V4.0.1 && \
     gcc -c ${CFLAGS} -I. -g -fPIC *.c  && \
     gcc *.o -g -shared -o libgnbx2.so && \
     cp libgnbx2.so /usr/local/lib/ && \
diff --git a/container-tag.yaml b/container-tag.yaml
index 9309d4e..90815ea 100644
--- a/container-tag.yaml
+++ b/container-tag.yaml
@@ -2,4 +2,4 @@
 # By default this file is in the docker build directory,
 # but the location can configured in the JJB template.
 ---
-tag: "4.0.0.3"
+tag: "4.1.0.0"
diff --git a/e2ap/libe2ap_wrapper/E2AP_if.c b/e2ap/libe2ap_wrapper/E2AP_if.c
index 8bcf446..761d953 100644
--- a/e2ap/libe2ap_wrapper/E2AP_if.c
+++ b/e2ap/libe2ap_wrapper/E2AP_if.c
@@ -25,6 +25,7 @@
 #include "ProtocolIE-Field.h"
 #include "RICsubsequentAction.h"
 #include "E2_E2SM-gNB-X2-eventTriggerDefinition.h"
+#include "E2_E2SM-gNB-NRT-EventTriggerDefinition.h"
 #include "E2_E2SM-gNB-X2-ActionDefinitionChoice.h"
 #include "E2_E2SM-gNB-X2-actionDefinition.h"
 #include "E2_ActionParameter-Item.h"
@@ -33,9 +34,17 @@
 #include "E2_RANueGroupDef-Item.h"
 #include "E2_RANimperativePolicy.h"
 #include "E2_RANParameter-Item.h"
+
+// E2SM-gNB-NRT
+#include "E2_E2SM-gNB-NRT-ActionDefinition.h"
+#include "E2_E2SM-gNB-NRT-ActionDefinition-Format1.h"
+#include "E2_RANparameter-Item.h"
+
 #include "asn_constant.h"
+#include "E2_asn_constant.h"
 #include "E2AP_if.h"
 
+
 #ifdef DEBUG
     static const bool debug = true;
 #else
@@ -254,476 +263,664 @@
 //////////////////////////////////////////////////////////////////////
 uint64_t packRICEventTriggerDefinition(char* pLogBuffer, RICEventTriggerDefinition_t* pRICEventTriggerDefinition) {
 
+    if (pRICEventTriggerDefinition->E2SMgNBX2EventTriggerDefinitionPresent)
+        return packRICEventTriggerDefinitionX2Format(pLogBuffer, pRICEventTriggerDefinition);
+    else if(pRICEventTriggerDefinition->E2SMgNBNRTEventTriggerDefinitionPresent)
+        return packRICEventTriggerDefinitionNRTFormat(pLogBuffer, pRICEventTriggerDefinition);
+    else
+        return e2err_RICEventTriggerDefinitionAllocEventTriggerDefinitionEmptyFail;
+}
+
+//////////////////////////////////////////////////////////////////////
+uint64_t packRICEventTriggerDefinitionX2Format(char* pLogBuffer, RICEventTriggerDefinition_t* pRICEventTriggerDefinition) {
+
     E2_E2SM_gNB_X2_eventTriggerDefinition_t* pE2SM_gNB_X2_eventTriggerDefinition = calloc(1, sizeof(E2_E2SM_gNB_X2_eventTriggerDefinition_t));
-    if(pE2SM_gNB_X2_eventTriggerDefinition)
-	{
-        // RICeventTriggerDefinition
-        // InterfaceID
-        if ((pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBIDPresent == true &&
-             pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBIDPresent == true) ||
-            (pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBIDPresent == false &&
-             pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBIDPresent == false))
-            return e2err_RICEventTriggerDefinitionIEValueFail_1;
+    if(pE2SM_gNB_X2_eventTriggerDefinition == NULL)
+        return e2err_RICEventTriggerDefinitionAllocE2SM_gNB_X2_eventTriggerDefinitionFail;
 
-        // GlobalENB-ID or GlobalGNB-ID
-        if (pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBIDPresent)
-        {
-            pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.present = E2_Interface_ID_PR_global_eNB_ID;
+    // RICeventTriggerDefinition
+    // InterfaceID
+    if ((pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBIDPresent == true &&
+         pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBIDPresent == true) ||
+        (pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBIDPresent == false &&
+         pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBIDPresent == false))
+        return e2err_RICEventTriggerDefinitionIEValueFail_1;
 
-            // GlobalENB-ID
-            // PLMN-Identity
-            pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.pLMN_Identity.size =
-            pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.pLMNIdentity.contentLength;
-            pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.pLMN_Identity.buf = calloc(1,3);
-            if (pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.pLMN_Identity.buf) {
-                memcpy(pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.pLMN_Identity.buf,
-                       pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.pLMNIdentity.pLMNIdentityVal,
-                       pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.pLMNIdentity.contentLength);
-            }
-            else
-                return e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_eNB_IDpLMN_IdentityBufFail;
+    // GlobalENB-ID or GlobalGNB-ID
+    if (pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBIDPresent)
+    {
+        pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.present = E2_Interface_ID_PR_global_eNB_ID;
 
-            // Add ENB-ID
-            if (pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.bits == cMacroENBIDP_20Bits){
-                // BIT STRING, SIZE 20
-                pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.present = ENB_ID_PR_macro_eNB_ID;
-                pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.macro_eNB_ID.buf = calloc(1,3);
-                if (pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.macro_eNB_ID.buf) {
-                    pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.macro_eNB_ID.size = 3; // bytes
-                    pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.macro_eNB_ID.bits_unused = 4; // trailing unused bits
-                    memcpy(pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.macro_eNB_ID.buf,
-                           (void*)&pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.nodeID,3);
-                }
-                else
-                    return e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_eNB_IDeNB_IDmacro_eNB_IDBufFail;
-            }
-            else if (pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.bits == cHomeENBID_28Bits) {
-                // BIT STRING, SIZE 28
-                pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.present = ENB_ID_PR_home_eNB_ID;
-                pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.home_eNB_ID.buf = calloc(1,4);
-                if (pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.home_eNB_ID.buf) {
-                    pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.home_eNB_ID.size = 4; // bytes
-                    pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.home_eNB_ID.bits_unused = 4; // trailing unused bits
-                    memcpy(pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.home_eNB_ID.buf,
-                           (void*)&pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.nodeID,4);
-                }
-                else
-                    return e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_eNB_IDeNB_IDhome_eNB_IDBufFail;
-            }
-            else if (pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.bits == cShortMacroENBID_18Bits) {
-                // BIT STRING, SIZE 18
-                pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.present = ENB_ID_PR_short_Macro_eNB_ID;
-                pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.short_Macro_eNB_ID.buf = calloc(1,3);
-                if (pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.short_Macro_eNB_ID.buf) {
-                    pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.short_Macro_eNB_ID.size = 3;
-                    pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.short_Macro_eNB_ID.bits_unused = 6; // trailing unused bits
-                    memcpy(pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.short_Macro_eNB_ID.buf,
-                           (void*)&pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.nodeID,3);
-                }
-                else
-                    return e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_eNB_IDeNB_IDshort_Macro_eNB_IDBufFail;
-            }
-            else if (pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.bits == clongMacroENBIDP_21Bits) {
-                // BIT STRING, SIZE 21
-                pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.present = ENB_ID_PR_long_Macro_eNB_ID;
-                pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.long_Macro_eNB_ID.buf = calloc(1,3);
-                if (pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.long_Macro_eNB_ID.buf) {
-                    pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.long_Macro_eNB_ID.size = 3; // bytes
-                    pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.long_Macro_eNB_ID.bits_unused = 3; // trailing unused bits
-                    memcpy(pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.long_Macro_eNB_ID.buf,
-                           (void*)&pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.nodeID,3);
-                }
-                else
-                    return e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_eNB_IDeNB_IDlong_Macro_eNB_IDBufFail;
-            }
-            else
-                return e2err_RICEventTriggerDefinitionIEValueFail_2;
-
-        }
-        else if (pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBIDPresent) {
-            // GlobalGNB-ID
-            pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.present = E2_Interface_ID_PR_global_gNB_ID;
-
-            // PLMN-Identity
-            pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_gNB_ID.pLMN_Identity.size =
-              pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBID.pLMNIdentity.contentLength;
-            pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_gNB_ID.pLMN_Identity.buf =
-              calloc(1,pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBID.pLMNIdentity.contentLength);
-            if (pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_gNB_ID.pLMN_Identity.buf) {
-                memcpy(pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_gNB_ID.pLMN_Identity.buf,
-                       (void*)&pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBID.pLMNIdentity.pLMNIdentityVal,
-                        pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBID.pLMNIdentity.contentLength);
-            }
-            else
-                return e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_gNB_IDpLMN_IdentityBufFail;
-
-            // GNB-ID, BIT STRING, SIZE 22..32
-            pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_gNB_ID.gNB_ID.choice.gNB_ID.size = 4;  //32bits
-            pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_gNB_ID.gNB_ID.choice.gNB_ID.buf = calloc(1, 4);
-            if (pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_gNB_ID.gNB_ID.choice.gNB_ID.buf) {
-                memcpy(pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_gNB_ID.gNB_ID.choice.gNB_ID.buf,
-                       (void*)&pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBID,4); //32bits
-            }
-            else
-                return e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_gNB_IDgNB_IDBufFail;
+        // GlobalENB-ID
+        // PLMN-Identity
+        pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.pLMN_Identity.size =
+        pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.pLMNIdentity.contentLength;
+        pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.pLMN_Identity.buf = calloc(1,3);
+        if (pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.pLMN_Identity.buf) {
+            memcpy(pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.pLMN_Identity.buf,
+                   pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.pLMNIdentity.pLMNIdentityVal,
+                   pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.pLMNIdentity.contentLength);
         }
         else
-            return e2err_RICEventTriggerDefinitionIEValueFail_3;
+            return e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_eNB_IDpLMN_IdentityBufFail;
 
-        // InterfaceDirection
-        pE2SM_gNB_X2_eventTriggerDefinition->interfaceDirection = pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceDirection;
-
-        // InterfaceMessageType
-        // ProcedureCode
-        pE2SM_gNB_X2_eventTriggerDefinition->interfaceMessageType.procedureCode = pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceMessageType.procedureCode;
-
-        // TypeOfMessage
-        if(pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceMessageType.typeOfMessage == cE2InitiatingMessage)
-            pE2SM_gNB_X2_eventTriggerDefinition->interfaceMessageType.typeOfMessage = E2_TypeOfMessage_initiating_message;
-        else if(pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceMessageType.typeOfMessage == cE2SuccessfulOutcome)
-            pE2SM_gNB_X2_eventTriggerDefinition->interfaceMessageType.typeOfMessage = E2_TypeOfMessage_successful_outcome;
-        else if(pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceMessageType.typeOfMessage == cE2UnsuccessfulOutcome)
-            pE2SM_gNB_X2_eventTriggerDefinition->interfaceMessageType.typeOfMessage = E2_TypeOfMessage_unsuccessful_outcome;
-        else
-            return e2err_RICEventTriggerDefinitionIEValueFail_4;
-
-        // InterfaceProtocolIE-List, OPTIONAL. Not used in RIC currently
-        if (pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceProtocolIEListPresent == true) {}
-
-        // Debug print
-        if (debug)
-            asn_fprint(stdout, &asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition, pE2SM_gNB_X2_eventTriggerDefinition);
-
-        // Encode
-        size_t bufferSize = sizeof(pRICEventTriggerDefinition->octetString.data);
-        asn_enc_rval_t rval;
-        rval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition, pE2SM_gNB_X2_eventTriggerDefinition,
-                                    pRICEventTriggerDefinition->octetString.data, bufferSize);
-
-        if(rval.encoded == -1) {
-            sprintf(pLogBuffer,"Serialization of %s failed.", asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition.name);
-            return e2err_RICEventTriggerDefinitionPackFail_1;
+        // Add ENB-ID
+        if (pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.bits == cMacroENBIDP_20Bits){
+            // BIT STRING, SIZE 20
+            pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.present = ENB_ID_PR_macro_eNB_ID;
+            pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.macro_eNB_ID.buf = calloc(1,3);
+            if (pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.macro_eNB_ID.buf) {
+                pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.macro_eNB_ID.size = 3; // bytes
+                pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.macro_eNB_ID.bits_unused = 4; // trailing unused bits
+                memcpy(pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.macro_eNB_ID.buf,
+                       (void*)&pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.nodeID,3);
+            }
+            else
+                return e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_eNB_IDeNB_IDmacro_eNB_IDBufFail;
         }
-        else if(rval.encoded > bufferSize) {
-           sprintf(pLogBuffer,"Buffer of size %zu is too small for %s, need %zu",bufferSize, asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition.name, rval.encoded);
-            return e2err_RICEventTriggerDefinitionPackFail_2;
+        else if (pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.bits == cHomeENBID_28Bits) {
+            // BIT STRING, SIZE 28
+            pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.present = ENB_ID_PR_home_eNB_ID;
+            pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.home_eNB_ID.buf = calloc(1,4);
+            if (pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.home_eNB_ID.buf) {
+                pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.home_eNB_ID.size = 4; // bytes
+                pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.home_eNB_ID.bits_unused = 4; // trailing unused bits
+                memcpy(pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.home_eNB_ID.buf,
+                       (void*)&pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.nodeID,4);
+            }
+            else
+                return e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_eNB_IDeNB_IDhome_eNB_IDBufFail;
+        }
+        else if (pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.bits == cShortMacroENBID_18Bits) {
+            // BIT STRING, SIZE 18
+            pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.present = ENB_ID_PR_short_Macro_eNB_ID;
+            pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.short_Macro_eNB_ID.buf = calloc(1,3);
+            if (pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.short_Macro_eNB_ID.buf) {
+                pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.short_Macro_eNB_ID.size = 3;
+                pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.short_Macro_eNB_ID.bits_unused = 6; // trailing unused bits
+                memcpy(pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.short_Macro_eNB_ID.buf,
+                       (void*)&pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.nodeID,3);
+            }
+            else
+                return e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_eNB_IDeNB_IDshort_Macro_eNB_IDBufFail;
+        }
+        else if (pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.bits == clongMacroENBIDP_21Bits) {
+            // BIT STRING, SIZE 21
+            pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.present = ENB_ID_PR_long_Macro_eNB_ID;
+            pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.long_Macro_eNB_ID.buf = calloc(1,3);
+            if (pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.long_Macro_eNB_ID.buf) {
+                pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.long_Macro_eNB_ID.size = 3; // bytes
+                pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.long_Macro_eNB_ID.bits_unused = 3; // trailing unused bits
+                memcpy(pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_eNB_ID.eNB_ID.choice.long_Macro_eNB_ID.buf,
+                       (void*)&pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.nodeID,3);
+            }
+            else
+                return e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_eNB_IDeNB_IDlong_Macro_eNB_IDBufFail;
         }
         else
-        if (debug)
-               sprintf(pLogBuffer,"Successfully encoded %s. Buffer size %zu, encoded size %zu",asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition.name, bufferSize, rval.encoded);
-
-        ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition, pE2SM_gNB_X2_eventTriggerDefinition);
-
-        pRICEventTriggerDefinition->octetString.contentLength = rval.encoded;
-        return e2err_OK;
+            return e2err_RICEventTriggerDefinitionIEValueFail_2;
     }
-    return e2err_RICEventTriggerDefinitionAllocE2SM_gNB_X2_eventTriggerDefinitionFail;
+    else if (pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBIDPresent) {
+        // GlobalGNB-ID
+        pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.present = E2_Interface_ID_PR_global_gNB_ID;
+
+        // PLMN-Identity
+        pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_gNB_ID.pLMN_Identity.size =
+          pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBID.pLMNIdentity.contentLength;
+        pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_gNB_ID.pLMN_Identity.buf =
+          calloc(1,pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBID.pLMNIdentity.contentLength);
+        if (pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_gNB_ID.pLMN_Identity.buf) {
+            memcpy(pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_gNB_ID.pLMN_Identity.buf,
+                   (void*)&pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBID.pLMNIdentity.pLMNIdentityVal,
+                    pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBID.pLMNIdentity.contentLength);
+        }
+        else
+            return e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_gNB_IDpLMN_IdentityBufFail;
+
+        // GNB-ID, BIT STRING, SIZE 22..32
+        pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_gNB_ID.gNB_ID.choice.gNB_ID.size = 4;  //32bits
+        pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_gNB_ID.gNB_ID.choice.gNB_ID.buf = calloc(1, 4);
+        if (pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_gNB_ID.gNB_ID.choice.gNB_ID.buf) {
+            memcpy(pE2SM_gNB_X2_eventTriggerDefinition->interface_ID.choice.global_gNB_ID.gNB_ID.choice.gNB_ID.buf,
+                   (void*)&pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBID,4); //32bits
+        }
+        else
+            return e2err_RICIndicationAllocRICEventTriggerDefinitionglobal_gNB_IDgNB_IDBufFail;
+    }
+    else
+        return e2err_RICEventTriggerDefinitionIEValueFail_3;
+
+    // InterfaceDirection
+    pE2SM_gNB_X2_eventTriggerDefinition->interfaceDirection = pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceDirection;
+
+    // InterfaceMessageType
+    // ProcedureCode
+    pE2SM_gNB_X2_eventTriggerDefinition->interfaceMessageType.procedureCode = pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceMessageType.procedureCode;
+
+    // TypeOfMessage
+    if(pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceMessageType.typeOfMessage == cE2InitiatingMessage)
+        pE2SM_gNB_X2_eventTriggerDefinition->interfaceMessageType.typeOfMessage = E2_TypeOfMessage_initiating_message;
+    else if(pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceMessageType.typeOfMessage == cE2SuccessfulOutcome)
+        pE2SM_gNB_X2_eventTriggerDefinition->interfaceMessageType.typeOfMessage = E2_TypeOfMessage_successful_outcome;
+    else if(pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceMessageType.typeOfMessage == cE2UnsuccessfulOutcome)
+        pE2SM_gNB_X2_eventTriggerDefinition->interfaceMessageType.typeOfMessage = E2_TypeOfMessage_unsuccessful_outcome;
+    else
+        return e2err_RICEventTriggerDefinitionIEValueFail_4;
+
+    // InterfaceProtocolIE-List, OPTIONAL. Not used in RIC currently
+    if (pRICEventTriggerDefinition->e2SMgNBX2eventTriggerDefinition.interfaceProtocolIEListPresent == true) {}
+
+    // Debug print
+    if (debug)
+        asn_fprint(stdout, &asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition, pE2SM_gNB_X2_eventTriggerDefinition);
+
+    // Encode
+    size_t bufferSize = sizeof(pRICEventTriggerDefinition->octetString.data);
+    asn_enc_rval_t rval;
+    rval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition, pE2SM_gNB_X2_eventTriggerDefinition,
+                                pRICEventTriggerDefinition->octetString.data, bufferSize);
+
+    if(rval.encoded == -1) {
+        sprintf(pLogBuffer,"Serialization of %s failed.", asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition.name);
+        return e2err_RICEventTriggerDefinitionPackFail_1;
+    }
+    else if(rval.encoded > bufferSize) {
+       sprintf(pLogBuffer,"Buffer of size %zu is too small for %s, need %zu",bufferSize, asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition.name, rval.encoded);
+        return e2err_RICEventTriggerDefinitionPackFail_2;
+    }
+    else
+    if (debug)
+           sprintf(pLogBuffer,"Successfully encoded %s. Buffer size %zu, encoded size %zu",asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition.name, bufferSize, rval.encoded);
+
+    ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition, pE2SM_gNB_X2_eventTriggerDefinition);
+
+    pRICEventTriggerDefinition->octetString.contentLength = rval.encoded;
+    return e2err_OK;
+}
+
+//////////////////////////////////////////////////////////////////////
+uint64_t packRICEventTriggerDefinitionNRTFormat(char* pLogBuffer, RICEventTriggerDefinition_t* pRICEventTriggerDefinition) {
+
+    E2_E2SM_gNB_NRT_EventTriggerDefinition_t* pE2_E2SM_gNB_NRT_EventTriggerDefinition = calloc(1, sizeof(E2_E2SM_gNB_NRT_EventTriggerDefinition_t));
+    if(pE2_E2SM_gNB_NRT_EventTriggerDefinition == NULL)
+        return e2err_RICEventTriggerDefinitionAllocE2SM_gNB_NRT_eventTriggerDefinitionFail;
+
+    pE2_E2SM_gNB_NRT_EventTriggerDefinition->present = E2_E2SM_gNB_NRT_EventTriggerDefinition_PR_eventDefinition_Format1;
+    pE2_E2SM_gNB_NRT_EventTriggerDefinition->choice.eventDefinition_Format1.triggerNature =
+      pRICEventTriggerDefinition->e2SMgNBNRTEventTriggerDefinition.eventDefinitionFormat1.triggerNature;
+
+    // Debug print
+    if (debug)
+        asn_fprint(stdout, &asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition, pE2_E2SM_gNB_NRT_EventTriggerDefinition);
+
+    // Encode
+    size_t bufferSize = sizeof(pRICEventTriggerDefinition->octetString.data);
+    asn_enc_rval_t rval;
+    rval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition, pE2_E2SM_gNB_NRT_EventTriggerDefinition,
+                                pRICEventTriggerDefinition->octetString.data, bufferSize);
+
+    if(rval.encoded == -1) {
+        sprintf(pLogBuffer,"Serialization of %s failed.", asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition.name);
+        return e2err_RICENRTventTriggerDefinitionPackFail_1;
+    }
+    else if(rval.encoded > bufferSize) {
+       sprintf(pLogBuffer,"Buffer of size %zu is too small for %s, need %zu",bufferSize, asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition.name, rval.encoded);
+        return e2err_RICNRTEventTriggerDefinitionPackFail_2;
+    }
+    else
+    if (debug)
+           sprintf(pLogBuffer,"Successfully encoded %s. Buffer size %zu, encoded size %zu",asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition.name, bufferSize, rval.encoded);
+
+    ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition, pE2_E2SM_gNB_NRT_EventTriggerDefinition);
+
+    pRICEventTriggerDefinition->octetString.contentLength = rval.encoded;
+    return e2err_OK;
 }
 
 //////////////////////////////////////////////////////////////////////
 uint64_t packRICActionDefinition(char* pLogBuffer, RICActionDefinitionChoice_t* pRICActionDefinitionChoice) {
 
+    if (pRICActionDefinitionChoice->actionDefinitionX2Format1Present ||
+        pRICActionDefinitionChoice->actionDefinitionX2Format2Present) {
+        // E2SM-gNB-X2-actionDefinition
+        return packActionDefinitionX2Format(pLogBuffer,pRICActionDefinitionChoice);
+    }
+    else if (pRICActionDefinitionChoice->actionDefinitionNRTFormat1Present) {
+        // E2SM-gNB-NRT-actionDefinition
+        return packActionDefinitionNRTFormat(pLogBuffer,pRICActionDefinitionChoice);
+    }
+    else
+        return e2err_RICSubscriptionRequestRICActionDefinitionEmpty;
+}
+
+//////////////////////////////////////////////////////////////////////
+uint64_t packActionDefinitionX2Format(char* pLogBuffer, RICActionDefinitionChoice_t* pRICActionDefinitionChoice) {
+
     int result;
 
     // E2SM-gNB-X2-actionDefinition
     E2_E2SM_gNB_X2_ActionDefinitionChoice_t* pE2_E2SM_gNB_X2_ActionDefinitionChoice = calloc(1, sizeof(E2_E2SM_gNB_X2_ActionDefinitionChoice_t));
-    if (pE2_E2SM_gNB_X2_ActionDefinitionChoice) {
-        if (pRICActionDefinitionChoice->actionDefinitionFormat1Present) {
-            // E2SM-gNB-X2-actionDefinition
-            pE2_E2SM_gNB_X2_ActionDefinitionChoice->present = E2_E2SM_gNB_X2_ActionDefinitionChoice_PR_actionDefinition_Format1;
-            pE2_E2SM_gNB_X2_ActionDefinitionChoice->choice.actionDefinition_Format1.style_ID = pRICActionDefinitionChoice->actionDefinitionFormat1->styleID;
-            struct E2_E2SM_gNB_X2_actionDefinition__actionParameter_List* pE2_E2SM_gNB_X2_actionDefinition__actionParameter_List =
-              calloc(1, sizeof (struct E2_E2SM_gNB_X2_actionDefinition__actionParameter_List));
-            uint64_t index = 0;
-            while (index < pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterCount && index < E2_maxofRANParameters) {
-                E2_ActionParameter_Item_t* pE2_ActionParameter_Item = calloc(1, sizeof(E2_ActionParameter_Item_t));
-                if (pE2_ActionParameter_Item) {
-                    pE2_ActionParameter_Item->actionParameter_ID = pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->parameterID;
-                    if (pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueIntPresent) {
-                        pE2_ActionParameter_Item->actionParameter_Value.present = E2_ActionParameter_Value_PR_valueInt;
-                        pE2_ActionParameter_Item->actionParameter_Value.choice.valueInt =
-                        pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueInt;
-                    }
-                    else if (pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueEnumPresent) {
-                        pE2_ActionParameter_Item->actionParameter_Value.present = E2_ActionParameter_Value_PR_valueEnum;
-                        pE2_ActionParameter_Item->actionParameter_Value.choice.valueEnum =
-                        pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueIntPresent;
-                    }
-                    else if (pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueBoolPresent) {
-                        pE2_ActionParameter_Item->actionParameter_Value.present = E2_ActionParameter_Value_PR_valueBool;
-                        pE2_ActionParameter_Item->actionParameter_Value.choice.valueBool =
-                        pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueBool;
-                    }
-                    else if (pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueBitSPresent) {
-                        pE2_ActionParameter_Item->actionParameter_Value.present = E2_ActionParameter_Value_PR_valueBitS;
-                        pE2_ActionParameter_Item->actionParameter_Value.choice.valueBitS.size =
-                        pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueBitS.byteLength;
-                        pE2_ActionParameter_Item->actionParameter_Value.choice.valueBitS.bits_unused =
-                          pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueBitS.unusedBits;
-                        pE2_ActionParameter_Item->actionParameter_Value.choice.valueBitS.buf =
-                          calloc(pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueBitS.byteLength, 1);
-                        if (pE2_ActionParameter_Item->actionParameter_Value.choice.valueBitS.buf) {
-                            memcpy(pE2_ActionParameter_Item->actionParameter_Value.choice.valueBitS.buf,
-                                   pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueBitS.data,
-                                   pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueBitS.byteLength);
-                        }
-                        else
-                            return e2err_RICSubscriptionRequestAllocactionParameterValueValueBitSFail;
-                    }
-                    else if (pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueOctSPresent) {
-                        pE2_ActionParameter_Item->actionParameter_Value.present = E2_ActionParameter_Value_PR_valueOctS;
-                        pE2_ActionParameter_Item->actionParameter_Value.choice.valueOctS.size =
-                        pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueOctS.length;
-                        pE2_ActionParameter_Item->actionParameter_Value.choice.valueOctS.buf =
-                          calloc(pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueOctS.length, 1);
-                        if (pE2_ActionParameter_Item->actionParameter_Value.choice.valueOctS.buf) {
-                            memcpy(pE2_ActionParameter_Item->actionParameter_Value.choice.valueOctS.buf,
-                                   pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueOctS.data,
-                                   pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueOctS.length);
-                        }
-                        else
-                            return e2err_RICSubscriptionRequestAllocactionParameterValueValueOctSFail;
-                    }
-                    else if (pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valuePrtSPresent) {
-                        pE2_ActionParameter_Item->actionParameter_Value.present = E2_ActionParameter_Value_PR_valuePrtS;
-                        pE2_ActionParameter_Item->actionParameter_Value.choice.valueOctS.size =
-                        pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueOctS.length;
-                        pE2_ActionParameter_Item->actionParameter_Value.choice.valuePrtS.buf =
-                        calloc(pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueOctS.length ,1);
-                        if (pE2_ActionParameter_Item->actionParameter_Value.choice.valuePrtS.buf) {
-                            memcpy(pE2_ActionParameter_Item->actionParameter_Value.choice.valuePrtS.buf,
-                                   pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueOctS.data,
-                                   pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueOctS.length);
-                        }
-                        else
-                            return e2err_RICSubscriptionRequestAllocactionParameterValueValuePrtsSFail;
+    if (pE2_E2SM_gNB_X2_ActionDefinitionChoice == NULL) {
+        return e2err_RICSubscriptionRequestAllocE2_E2SM_gNB_X2_ActionDefinitionChoiceFail;
+    }
+
+    if (pRICActionDefinitionChoice->actionDefinitionX2Format1Present) {
+
+        // E2SM-gNB-X2-actionDefinition
+        pE2_E2SM_gNB_X2_ActionDefinitionChoice->present = E2_E2SM_gNB_X2_ActionDefinitionChoice_PR_actionDefinition_Format1;
+        pE2_E2SM_gNB_X2_ActionDefinitionChoice->choice.actionDefinition_Format1.style_ID = pRICActionDefinitionChoice->actionDefinitionX2Format1->styleID;
+        struct E2_E2SM_gNB_X2_actionDefinition__actionParameter_List* pE2_E2SM_gNB_X2_actionDefinition__actionParameter_List =
+          calloc(1, sizeof (struct E2_E2SM_gNB_X2_actionDefinition__actionParameter_List));
+        uint64_t index = 0;
+        while (index < pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterCount && index < E2_maxofRANParameters) {
+            E2_ActionParameter_Item_t* pE2_ActionParameter_Item = calloc(1, sizeof(E2_ActionParameter_Item_t));
+            if (pE2_ActionParameter_Item) {
+                pE2_ActionParameter_Item->actionParameter_ID = pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->parameterID;
+                if (pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valueIntPresent) {
+                    pE2_ActionParameter_Item->actionParameter_Value.present = E2_ActionParameter_Value_PR_valueInt;
+                    pE2_ActionParameter_Item->actionParameter_Value.choice.valueInt =
+                    pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valueInt;
+                }
+                else if (pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valueEnumPresent) {
+                    pE2_ActionParameter_Item->actionParameter_Value.present = E2_ActionParameter_Value_PR_valueEnum;
+                    pE2_ActionParameter_Item->actionParameter_Value.choice.valueEnum =
+                    pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valueIntPresent;
+                }
+                else if (pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valueBoolPresent) {
+                    pE2_ActionParameter_Item->actionParameter_Value.present = E2_ActionParameter_Value_PR_valueBool;
+                    pE2_ActionParameter_Item->actionParameter_Value.choice.valueBool =
+                    pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valueBool;
+                }
+                else if (pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valueBitSPresent) {
+                    pE2_ActionParameter_Item->actionParameter_Value.present = E2_ActionParameter_Value_PR_valueBitS;
+                    pE2_ActionParameter_Item->actionParameter_Value.choice.valueBitS.size =
+                    pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valueBitS.byteLength;
+                    pE2_ActionParameter_Item->actionParameter_Value.choice.valueBitS.bits_unused =
+                      pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valueBitS.unusedBits;
+                    pE2_ActionParameter_Item->actionParameter_Value.choice.valueBitS.buf =
+                      calloc(pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valueBitS.byteLength, 1);
+                    if (pE2_ActionParameter_Item->actionParameter_Value.choice.valueBitS.buf) {
+                        memcpy(pE2_ActionParameter_Item->actionParameter_Value.choice.valueBitS.buf,
+                               pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valueBitS.data,
+                               pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valueBitS.byteLength);
                     }
                     else
-                        return e2err_RICSubscriptionRequestActionParameterItemFail;
-
-                    if ((result = asn_set_add(pE2_E2SM_gNB_X2_actionDefinition__actionParameter_List, pE2_ActionParameter_Item)) != 0)
-                        return e2err_RICSubscriptionRequestAsn_set_addE2_ActionParameter_ItemFail;
+                        return e2err_RICSubscriptionRequestAllocactionParameterValueValueBitSFail;
+                }
+                else if (pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valueOctSPresent) {
+                    pE2_ActionParameter_Item->actionParameter_Value.present = E2_ActionParameter_Value_PR_valueOctS;
+                    pE2_ActionParameter_Item->actionParameter_Value.choice.valueOctS.size =
+                    pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valueOctS.length;
+                    pE2_ActionParameter_Item->actionParameter_Value.choice.valueOctS.buf =
+                      calloc(pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valueOctS.length, 1);
+                    if (pE2_ActionParameter_Item->actionParameter_Value.choice.valueOctS.buf) {
+                        memcpy(pE2_ActionParameter_Item->actionParameter_Value.choice.valueOctS.buf,
+                               pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valueOctS.data,
+                               pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valueOctS.length);
+                    }
+                    else
+                        return e2err_RICSubscriptionRequestAllocactionParameterValueValueOctSFail;
+                }
+                else if (pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valuePrtSPresent) {
+                    pE2_ActionParameter_Item->actionParameter_Value.present = E2_ActionParameter_Value_PR_valuePrtS;
+                    pE2_ActionParameter_Item->actionParameter_Value.choice.valuePrtS.size =
+                    pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valuePrtS.length;
+                    pE2_ActionParameter_Item->actionParameter_Value.choice.valuePrtS.buf =
+                    calloc(pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valuePrtS.length ,1);
+                    if (pE2_ActionParameter_Item->actionParameter_Value.choice.valuePrtS.buf) {
+                        memcpy(pE2_ActionParameter_Item->actionParameter_Value.choice.valuePrtS.buf,
+                               pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valuePrtS.data,
+                               pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valuePrtS.length);
+                    }
+                    else
+                        return e2err_RICSubscriptionRequestAllocactionParameterValueValuePrtsSFail;
                 }
                 else
-                    return e2err_RICSubscriptionRequestAllocActionDefinitionFail;
-                index++;
+                    return e2err_RICSubscriptionRequestActionParameterItemFail;
+
+                if ((result = asn_set_add(pE2_E2SM_gNB_X2_actionDefinition__actionParameter_List, pE2_ActionParameter_Item)) != 0)
+                    return e2err_RICSubscriptionRequestAsn_set_addE2_ActionParameter_ItemFail;
             }
-            pE2_E2SM_gNB_X2_ActionDefinitionChoice->choice.actionDefinition_Format1.actionParameter_List = pE2_E2SM_gNB_X2_actionDefinition__actionParameter_List;
+            else
+                return e2err_RICSubscriptionRequestAllocActionDefinitionFail;
+            index++;
         }
-        else if (pRICActionDefinitionChoice->actionDefinitionFormat2Present) {
+        pE2_E2SM_gNB_X2_ActionDefinitionChoice->choice.actionDefinition_Format1.actionParameter_List = pE2_E2SM_gNB_X2_actionDefinition__actionParameter_List;
+    }
+    else if (pRICActionDefinitionChoice->actionDefinitionX2Format2Present) {
 
-            // E2SM-gNB-X2-ActionDefinition-Format2
-            pE2_E2SM_gNB_X2_ActionDefinitionChoice->present = E2_E2SM_gNB_X2_ActionDefinitionChoice_PR_actionDefinition_Format2;
-            struct E2_E2SM_gNB_X2_ActionDefinition_Format2__ranUEgroup_List* pE2_E2SM_gNB_X2_ActionDefinition_Format2__ranUEgroup_List =
-              calloc(1, sizeof(struct E2_E2SM_gNB_X2_ActionDefinition_Format2__ranUEgroup_List));
+        // E2SM-gNB-X2-ActionDefinition-Format2
+        pE2_E2SM_gNB_X2_ActionDefinitionChoice->present = E2_E2SM_gNB_X2_ActionDefinitionChoice_PR_actionDefinition_Format2;
+        struct E2_E2SM_gNB_X2_ActionDefinition_Format2__ranUEgroup_List* pE2_E2SM_gNB_X2_ActionDefinition_Format2__ranUEgroup_List =
+          calloc(1, sizeof(struct E2_E2SM_gNB_X2_ActionDefinition_Format2__ranUEgroup_List));
 
-            uint64_t index = 0;
-            while (index < pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupCount && index < E2_maxofUEgroup) {
+        uint64_t index = 0;
+        while (index < pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupCount && index < E2_maxofUEgroup) {
 
-                E2_RANueGroup_Item_t* pE2_RANueGroup_Item = calloc(1, sizeof(E2_RANueGroup_Item_t));
-                if (pE2_RANueGroup_Item) {
+            E2_RANueGroup_Item_t* pE2_RANueGroup_Item = calloc(1, sizeof(E2_RANueGroup_Item_t));
+            if (pE2_RANueGroup_Item) {
 
-                    struct E2_RANueGroupDefinition__ranUEgroupDef_List* pE2_RANueGroupDefinition__ranUEgroupDef_List =
-                    calloc(1, sizeof (struct E2_RANueGroupDefinition__ranUEgroupDef_List));
+                struct E2_RANueGroupDefinition__ranUEgroupDef_List* pE2_RANueGroupDefinition__ranUEgroupDef_List =
+                  calloc(1, sizeof (struct E2_RANueGroupDefinition__ranUEgroupDef_List));
 
-                    pE2_RANueGroup_Item->ranUEgroupID = pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem->ranUEgroupID;
-                    uint64_t index2 = 0;
-                    while (index2 < pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem->ranUEgroupDefinition.ranUeGroupDefCount && index2 < E2_maxofRANParameters) {
-                        E2_RANueGroupDef_Item_t* pE2_RANueGroupDef_Item = calloc(1, sizeof(E2_RANueGroupDef_Item_t));
-                        if(pE2_RANueGroupDef_Item) {
-                            pE2_RANueGroupDef_Item->ranParameter_ID = pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterID;
-                            pE2_RANueGroupDef_Item->ranParameter_Test = pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterTest;
-                            if (pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueIntPresent) {
-                                pE2_RANueGroupDef_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueInt;
-                                pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueInt =
-                                  pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueInt;
-                            }
-                            else if (pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueEnum) {
-                                pE2_RANueGroupDef_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueEnum;
-                                pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueEnum =
-                                  pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueEnum;
-                            }
-                            else if (pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBoolPresent) {
-                                pE2_RANueGroupDef_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueBool;
-                                pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueBool =
-                                  pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBool;
-                            }
-                            else if (pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBitSPresent) {
-                                pE2_RANueGroupDef_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueBitS;
-                                pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueBitS.size =
-                                  pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBitS.byteLength;
-                                pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueBitS.bits_unused =
-                                  pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBitS.unusedBits;
-                                pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueBitS.buf =
-                                  calloc(pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBitS.byteLength, 1);
-                                if (pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueBitS.buf) {
-                                    memcpy(pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueBitS.buf,
-                                           pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBitS.data,
-                                           pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBitS.byteLength);
-                                  }
-                                  else
-                                    return e2err_RICSubscriptionRequestAllocactionRanParameterValueValueBitSFail;
-                            }
-                            else if (pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueOctSPresent) {
-                                pE2_RANueGroupDef_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueOctS;
-                                pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueOctS.size =
-                                  pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueOctS.length;
-                                  pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueOctS.buf =
-                                  calloc(pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueOctS.length, 1);
-                                  if (pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueOctS.buf) {
-                                      memcpy(pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueOctS.buf,
-                                             pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueOctS.data,
-                                             pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueOctS.length);
-                                  }
-                                  else
-                                    return e2err_RICSubscriptionRequestAllocactionRanParameterValueValueOctSFail;
-                            }
-                            else if (pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valuePrtSPresent) {
-                                pE2_RANueGroupDef_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valuePrtS;
-                                pE2_RANueGroupDef_Item->ranParameter_Value.choice.valuePrtS.size =
-                                  pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueOctS.length;
-                                pE2_RANueGroupDef_Item->ranParameter_Value.choice.valuePrtS.buf =
-                                  calloc(pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valuePrtS.length, 1);
-                                if (pE2_RANueGroupDef_Item->ranParameter_Value.choice.valuePrtS.buf) {
-                                     memcpy(pE2_RANueGroupDef_Item->ranParameter_Value.choice.valuePrtS.buf,
-                                           pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueOctS.data,
-                                           pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueOctS.length);
-                                  }
-                                  else
-                                    return e2err_RICSubscriptionRequestAllocactionRanParameterValueValuePrtsSFail;
-                            }
-                            else
-                                return e2err_RICSubscriptionRequestRanranUeGroupDefItemParameterValueEmptyFail;
-
-                            if ((result = asn_set_add(pE2_RANueGroupDefinition__ranUEgroupDef_List, pE2_RANueGroupDef_Item)) != 0)
-                                return e2err_RICSubscriptionRequestAsn_set_addRANueGroupDef_ItemFail;
-                            pE2_RANueGroup_Item->ranUEgroupDefinition.ranUEgroupDef_List = pE2_RANueGroupDefinition__ranUEgroupDef_List;
+                pE2_RANueGroup_Item->ranUEgroupID = pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem->ranUEgroupID;
+                uint64_t index2 = 0;
+                while (index2 < pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem->ranUEgroupDefinition.ranUeGroupDefCount && index2 < E2_maxofRANParameters) {
+                    E2_RANueGroupDef_Item_t* pE2_RANueGroupDef_Item = calloc(1, sizeof(E2_RANueGroupDef_Item_t));
+                    if(pE2_RANueGroupDef_Item) {
+                        pE2_RANueGroupDef_Item->ranParameter_ID = pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterID;
+                        pE2_RANueGroupDef_Item->ranParameter_Test = pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterTest;
+                        if (pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueIntPresent) {
+                            pE2_RANueGroupDef_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueInt;
+                            pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueInt =
+                              pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueInt;
+                        }
+                        else if (pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueEnum) {
+                            pE2_RANueGroupDef_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueEnum;
+                            pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueEnum =
+                              pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueEnum;
+                        }
+                        else if (pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBoolPresent) {
+                            pE2_RANueGroupDef_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueBool;
+                            pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueBool =
+                              pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBool;
+                        }
+                        else if (pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBitSPresent) {
+                            pE2_RANueGroupDef_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueBitS;
+                            pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueBitS.size =
+                              pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBitS.byteLength;
+                            pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueBitS.bits_unused =
+                              pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBitS.unusedBits;
+                            pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueBitS.buf =
+                              calloc(pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBitS.byteLength, 1);
+                            if (pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueBitS.buf) {
+                                memcpy(pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueBitS.buf,
+                                       pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBitS.data,
+                                       pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBitS.byteLength);
+                              }
+                              else
+                                return e2err_RICSubscriptionRequestAllocactionRanParameterValueValueBitSFail;
+                        }
+                        else if (pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueOctSPresent) {
+                            pE2_RANueGroupDef_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueOctS;
+                            pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueOctS.size =
+                              pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueOctS.length;
+                              pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueOctS.buf =
+                              calloc(pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueOctS.length, 1);
+                              if (pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueOctS.buf) {
+                                  memcpy(pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueOctS.buf,
+                                         pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueOctS.data,
+                                         pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueOctS.length);
+                              }
+                              else
+                                return e2err_RICSubscriptionRequestAllocactionRanParameterValueValueOctSFail;
+                        }
+                        else if (pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valuePrtSPresent) {
+                            pE2_RANueGroupDef_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valuePrtS;
+                            pE2_RANueGroupDef_Item->ranParameter_Value.choice.valuePrtS.size =
+                              pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valuePrtS.length;
+                            pE2_RANueGroupDef_Item->ranParameter_Value.choice.valuePrtS.buf =
+                              calloc(pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valuePrtS.length, 1);
+                            if (pE2_RANueGroupDef_Item->ranParameter_Value.choice.valuePrtS.buf) {
+                                 memcpy(pE2_RANueGroupDef_Item->ranParameter_Value.choice.valuePrtS.buf,
+                                       pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valuePrtS.data,
+                                       pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valuePrtS.length);
+                              }
+                              else
+                                return e2err_RICSubscriptionRequestAllocactionRanParameterValueValuePrtsSFail;
                         }
                         else
-                            return e2err_RICSubscriptionRequestAllocE2_RANueGroupDef_ItemFail;
-                        index2++;
+                            return e2err_RICSubscriptionRequestRanranUeGroupDefItemParameterValueEmptyFail;
+
+                        if ((result = asn_set_add(pE2_RANueGroupDefinition__ranUEgroupDef_List, pE2_RANueGroupDef_Item)) != 0)
+                            return e2err_RICSubscriptionRequestAsn_set_addRANueGroupDef_ItemFail;
+                        pE2_RANueGroup_Item->ranUEgroupDefinition.ranUEgroupDef_List = pE2_RANueGroupDefinition__ranUEgroupDef_List;
                     }
-
-                    struct E2_RANimperativePolicy__ranImperativePolicy_List* pE2_RANimperativePolicy__ranImperativePolicy_List =
-                    calloc(1, sizeof (struct E2_RANimperativePolicy__ranImperativePolicy_List));
-
-                    uint64_t index3 = 0;
-                    while (index3 < pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem->ranPolicy.ranParameterCount && index3 < E2_maxofRANParameters) {
-                        E2_RANParameter_Item_t* pE2_RANParameter_Item = calloc(1, sizeof(E2_RANParameter_Item_t));
-                        if (pE2_RANParameter_Item) {
-                            pE2_RANParameter_Item->ranParameter_ID = pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterID;
-                            if (pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueIntPresent) {
-                                pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueInt;
-                                pE2_RANParameter_Item->ranParameter_Value.choice.valueInt =
-                                  pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueInt;
-                            }
-                            else if (pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueEnum) {
-                                pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueEnum;
-                                pE2_RANParameter_Item->ranParameter_Value.choice.valueEnum =
-                                  pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueEnum;
-                            }
-                            else if (pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBoolPresent) {
-                                pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueBool;
-                                pE2_RANParameter_Item->ranParameter_Value.choice.valueBool =
-                                  pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBool;
-                            }
-                            else if (pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitSPresent) {
-                                pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueBitS;
-                                pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.size =
-                                  pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitS.byteLength;
-                                pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.bits_unused =
-                                  pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitS.unusedBits;
-                                pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.buf =
-                                  calloc(pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitS.byteLength, 1);
-                                if (pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.buf) {
-                                    memcpy(pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.buf,
-                                           pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitS.data,
-                                           pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitS.byteLength);
-                                  }
-                                  else
-                                    return e2err_RICSubscriptionRequestAllocactionRanParameterValue2ValueBitSFail;
-                            }
-                            else if (pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctSPresent) {
-                                pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueOctS;
-                                pE2_RANParameter_Item->ranParameter_Value.choice.valueOctS.size =
-                                  pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS.length;
-                                  pE2_RANParameter_Item->ranParameter_Value.choice.valueOctS.buf =
-                                  calloc(pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS.length, 1);
-                                  if (pE2_RANParameter_Item->ranParameter_Value.choice.valueOctS.buf) {
-                                      memcpy(pE2_RANParameter_Item->ranParameter_Value.choice.valueOctS.buf,
-                                             pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS.data,
-                                             pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS.length);
-                                  }
-                                  else
-                                    return e2err_RICSubscriptionRequestAllocactionRanParameterValue2ValueOctSFail;
-                            }
-                            else if (pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtSPresent) {
-                                pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valuePrtS;
-                                pE2_RANParameter_Item->ranParameter_Value.choice.valuePrtS.size =
-                                  pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS.length;
-                                pE2_RANParameter_Item->ranParameter_Value.choice.valuePrtS.buf =
-                                  calloc(pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS.length, 1);
-                                if (pE2_RANParameter_Item->ranParameter_Value.choice.valuePrtS.buf) {
-                                    memcpy(pE2_RANParameter_Item->ranParameter_Value.choice.valuePrtS.buf,
-                                           pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS.data,
-                                           pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS.length);
-                                  }
-                                  else
-                                    return e2err_RICSubscriptionRequestAllocactionRanParameterValue2ValuePrtsSFail;
-                            }
-                            else
-                                return e2err_RICSubscriptionRequestRanParameterItemRanParameterValueEmptyFail;
-
-                            if ((result = asn_set_add(pE2_RANimperativePolicy__ranImperativePolicy_List, pE2_RANParameter_Item)) != 0)
-                                return e2err_RICSubscriptionRequestAsn_set_addE2_RANParameter_ItemFail;
-                            pE2_RANueGroup_Item->ranPolicy.ranImperativePolicy_List = pE2_RANimperativePolicy__ranImperativePolicy_List;
-                        }
-                        else
-                            return e2err_RICSubscriptionRequestAllocActionDefinitionFail;
-                        index3++;
-                    }
-
-                    const int result = asn_set_add(pE2_E2SM_gNB_X2_ActionDefinition_Format2__ranUEgroup_List, pE2_RANueGroup_Item);
-                    if (result != 0)
-                       printf("asn_set_add() failed\n");
+                    else
+                        return e2err_RICSubscriptionRequestAllocE2_RANueGroupDef_ItemFail;
+                    index2++;
                 }
-                else
-                    return e2err_RICSubscriptionRequestAllocRANParameter_ItemFail;
-                index++;
+
+                struct E2_RANimperativePolicy__ranImperativePolicy_List* pE2_RANimperativePolicy__ranImperativePolicy_List =
+                  calloc(1, sizeof (struct E2_RANimperativePolicy__ranImperativePolicy_List));
+
+                uint64_t index3 = 0;
+                while (index3 < pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem->ranPolicy.ranParameterCount && index3 < E2_maxofRANParameters) {
+                    E2_RANParameter_Item_t* pE2_RANParameter_Item = calloc(1, sizeof(E2_RANParameter_Item_t));
+                    if (pE2_RANParameter_Item) {
+                        pE2_RANParameter_Item->ranParameter_ID = pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterID;
+                        if (pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueIntPresent) {
+                            pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueInt;
+                            pE2_RANParameter_Item->ranParameter_Value.choice.valueInt =
+                              pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueInt;
+                        }
+                        else if (pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueEnum) {
+                            pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueEnum;
+                            pE2_RANParameter_Item->ranParameter_Value.choice.valueEnum =
+                              pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueEnum;
+                        }
+                        else if (pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBoolPresent) {
+                            pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueBool;
+                            pE2_RANParameter_Item->ranParameter_Value.choice.valueBool =
+                              pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBool;
+                        }
+                        else if (pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitSPresent) {
+                            pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueBitS;
+                            pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.size =
+                              pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitS.byteLength;
+                            pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.bits_unused =
+                              pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitS.unusedBits;
+                            pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.buf =
+                              calloc(pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitS.byteLength, 1);
+                            if (pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.buf) {
+                                memcpy(pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.buf,
+                                       pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitS.data,
+                                       pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitS.byteLength);
+                              }
+                              else
+                                return e2err_RICSubscriptionRequestAllocactionRanParameterValue2ValueBitSFail;
+                        }
+                        else if (pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctSPresent) {
+                            pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueOctS;
+                            pE2_RANParameter_Item->ranParameter_Value.choice.valueOctS.size =
+                              pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS.length;
+                              pE2_RANParameter_Item->ranParameter_Value.choice.valueOctS.buf =
+                              calloc(pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS.length, 1);
+                              if (pE2_RANParameter_Item->ranParameter_Value.choice.valueOctS.buf) {
+                                  memcpy(pE2_RANParameter_Item->ranParameter_Value.choice.valueOctS.buf,
+                                         pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS.data,
+                                         pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS.length);
+                              }
+                              else
+                                return e2err_RICSubscriptionRequestAllocactionRanParameterValue2ValueOctSFail;
+                        }
+                        else if (pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtSPresent) {
+                            pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valuePrtS;
+                            pE2_RANParameter_Item->ranParameter_Value.choice.valuePrtS.size =
+                              pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtS.length;
+                            pE2_RANParameter_Item->ranParameter_Value.choice.valuePrtS.buf =
+                              calloc(pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtS.length, 1);
+                            if (pE2_RANParameter_Item->ranParameter_Value.choice.valuePrtS.buf) {
+                                memcpy(pE2_RANParameter_Item->ranParameter_Value.choice.valuePrtS.buf,
+                                       pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtS.data,
+                                       pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtS.length);
+                              }
+                              else
+                                return e2err_RICSubscriptionRequestAllocactionRanParameterValue2ValuePrtsSFail;
+                        }
+                        else
+                            return e2err_RICSubscriptionRequestRanParameterItemRanParameterValueEmptyFail;
+
+                        if ((result = asn_set_add(pE2_RANimperativePolicy__ranImperativePolicy_List, pE2_RANParameter_Item)) != 0)
+                            return e2err_RICSubscriptionRequestAsn_set_addE2_RANParameter_ItemFail;
+                        pE2_RANueGroup_Item->ranPolicy.ranImperativePolicy_List = pE2_RANimperativePolicy__ranImperativePolicy_List;
+                    }
+                    else
+                        return e2err_RICSubscriptionRequestAllocActionDefinitionFail;
+                    index3++;
+                }
+
+                const int result = asn_set_add(pE2_E2SM_gNB_X2_ActionDefinition_Format2__ranUEgroup_List, pE2_RANueGroup_Item);
+                if (result != 0)
+                   printf("asn_set_add() failed\n");
             }
-            pE2_E2SM_gNB_X2_ActionDefinitionChoice->choice.actionDefinition_Format2.ranUEgroup_List = pE2_E2SM_gNB_X2_ActionDefinition_Format2__ranUEgroup_List;
+            else
+                return e2err_RICSubscriptionRequestAllocRANParameter_ItemFail;
+            index++;
         }
-        else
-            return e2err_RICSubscriptionRequestRICActionDefinitionEmptyE2_E2SM_gNB_X2_actionDefinition;
-
-        // Debug print
-        if (debug)
-            asn_fprint(stdout, &asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice, pE2_E2SM_gNB_X2_ActionDefinitionChoice);
-
-        // Encode
-        size_t bufferSize = sizeof(pRICActionDefinitionChoice->octetString.data);
-        asn_enc_rval_t rval;
-        rval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice, pE2_E2SM_gNB_X2_ActionDefinitionChoice,
-                                    pRICActionDefinitionChoice->octetString.data, bufferSize);
-        if(rval.encoded == -1) {
-            sprintf(pLogBuffer,"Serialization of %s failed.", asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice.name);
-            return e2err_RICActionDefinitionChoicePackFail_1;
-        }
-        else if(rval.encoded > bufferSize) {
-           sprintf(pLogBuffer,"Buffer of size %zu is too small for %s, need %zu",bufferSize, asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice.name, rval.encoded);
-            return e2err_RICActionDefinitionChoicePackFail_2;
-        }
-        else
-        if (debug)
-               sprintf(pLogBuffer,"Successfully encoded %s. Buffer size %zu, encoded size %zu",asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice.name, bufferSize, rval.encoded);
-
-        ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice, pE2_E2SM_gNB_X2_ActionDefinitionChoice);
-
-        pRICActionDefinitionChoice->octetString.contentLength = rval.encoded;
-        return e2err_OK;
+        pE2_E2SM_gNB_X2_ActionDefinitionChoice->choice.actionDefinition_Format2.ranUEgroup_List = pE2_E2SM_gNB_X2_ActionDefinition_Format2__ranUEgroup_List;
     }
     else
-        return e2err_RICSubscriptionRequestAllocE2_E2SM_gNB_X2_ActionDefinitionChoiceFail;
+        return e2err_RICSubscriptionRequestRICActionDefinitionEmptyE2_E2SM_gNB_X2_actionDefinition;
+
+    // Debug print
+    if (debug)
+        asn_fprint(stdout, &asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice, pE2_E2SM_gNB_X2_ActionDefinitionChoice);
+
+    // Encode
+    size_t bufferSize = sizeof(pRICActionDefinitionChoice->octetString.data);
+    asn_enc_rval_t rval;
+    rval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice, pE2_E2SM_gNB_X2_ActionDefinitionChoice,
+                                pRICActionDefinitionChoice->octetString.data, bufferSize);
+    if(rval.encoded == -1) {
+        sprintf(pLogBuffer,"Serialization of %s failed.", asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice.name);
+        return e2err_RICActionDefinitionChoicePackFail_1;
+    }
+    else if(rval.encoded > bufferSize) {
+       sprintf(pLogBuffer,"Buffer of size %zu is too small for %s, need %zu",bufferSize, asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice.name, rval.encoded);
+        return e2err_RICActionDefinitionChoicePackFail_2;
+    }
+    else
+    if (debug)
+           sprintf(pLogBuffer,"Successfully encoded %s. Buffer size %zu, encoded size %zu",asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice.name, bufferSize, rval.encoded);
+
+    ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice, pE2_E2SM_gNB_X2_ActionDefinitionChoice);
+
+    pRICActionDefinitionChoice->octetString.contentLength = rval.encoded;
+    return e2err_OK;
+}
+
+//////////////////////////////////////////////////////////////////////
+uint64_t packActionDefinitionNRTFormat(char* pLogBuffer, RICActionDefinitionChoice_t* pRICActionDefinitionChoice) {
+
+    // E2SM-gNB-NRT-actionDefinition
+    E2_E2SM_gNB_NRT_ActionDefinition_t* pE2_E2SM_gNB_NRT_ActionDefinition = calloc(1, sizeof(E2_E2SM_gNB_NRT_ActionDefinition_t));
+    if (pE2_E2SM_gNB_NRT_ActionDefinition == NULL)
+        return e2err_RICSubscriptionRequestAllocE2_E2SM_gNB_NRT_ActionDefinitionFail;
+
+    if (pRICActionDefinitionChoice->actionDefinitionNRTFormat1Present) {
+
+        // E2SM-gNB-NRT-ActionDefinition-Format1
+        pE2_E2SM_gNB_NRT_ActionDefinition->present = E2_E2SM_gNB_NRT_ActionDefinition_PR_actionDefinition_Format1;
+
+        struct E2_E2SM_gNB_NRT_ActionDefinition_Format1__ranParameter_List* pE2_E2SM_gNB_NRT_ActionDefinition_Format1__ranParameter_List =
+          calloc(1, sizeof(struct E2_E2SM_gNB_NRT_ActionDefinition_Format1__ranParameter_List));
+
+        uint64_t index = 0;
+        while (index <  pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterCount && index < E2_maxofRANParameters) {
+            E2_RANParameter_Item_t* pE2_RANParameter_Item = calloc(1, sizeof(E2_RANParameter_Item_t));
+            if (pE2_RANParameter_Item) {
+                pE2_RANParameter_Item->ranParameter_ID = pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterID;
+                if (pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueIntPresent) {
+                    pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueInt;
+                    pE2_RANParameter_Item->ranParameter_Value.choice.valueInt =
+                      pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueInt;
+                }
+                else if (pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueEnum) {
+                    pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueEnum;
+                    pE2_RANParameter_Item->ranParameter_Value.choice.valueEnum =
+                      pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueEnum;
+                }
+                else if (pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueBoolPresent) {
+                    pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueBool;
+                    pE2_RANParameter_Item->ranParameter_Value.choice.valueBool =
+                      pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueBool;
+                }
+                else if (pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueBitSPresent) {
+                    pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueBitS;
+                    pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.size =
+                      pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueBitS.byteLength;
+                    pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.bits_unused =
+                      pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueBitS.unusedBits;
+                    pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.buf =
+                      calloc(pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueBitS.byteLength, 1);
+                    if (pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.buf) {
+                        memcpy(pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.buf,
+                               pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueBitS.data,
+                               pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueBitS.byteLength);
+                      }
+                      else
+                        return e2err_RICSubscriptionRequestAllocactionNRTRanParameterValue2ValueBitSFail;
+                }
+                else if (pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueOctSPresent) {
+                    pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valueOctS;
+                    pE2_RANParameter_Item->ranParameter_Value.choice.valueOctS.size =
+                      pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueOctS.length;
+                      pE2_RANParameter_Item->ranParameter_Value.choice.valueOctS.buf =
+                      calloc(pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueOctS.length, 1);
+                      if (pE2_RANParameter_Item->ranParameter_Value.choice.valueOctS.buf) {
+                          memcpy(pE2_RANParameter_Item->ranParameter_Value.choice.valueOctS.buf,
+                                 pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueOctS.data,
+                                 pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueOctS.length);
+                      }
+                      else
+                        return e2err_RICSubscriptionRequestAllocactionNRTRanParameterValue2ValueOctSFail;
+                }
+                else if (pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valuePrtSPresent) {
+                    pE2_RANParameter_Item->ranParameter_Value.present = E2_RANParameter_Value_PR_valuePrtS;
+                    pE2_RANParameter_Item->ranParameter_Value.choice.valuePrtS.size =
+                      pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valuePrtS.length;
+                    pE2_RANParameter_Item->ranParameter_Value.choice.valuePrtS.buf =
+                      calloc(pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valuePrtS.length, 1);
+                    if (pE2_RANParameter_Item->ranParameter_Value.choice.valuePrtS.buf) {
+                        memcpy(pE2_RANParameter_Item->ranParameter_Value.choice.valuePrtS.buf,
+                               pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valuePrtS.data,
+                               pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valuePrtS.length);
+                      }
+                      else
+                        return e2err_RICSubscriptionRequestAllocactionNRTRanParameterValue2ValuePrtsSFail;
+                }
+                else
+                    return e2err_RICSubscriptionRequestRanParameterItemNRTRanParameterValueEmptyFail;
+
+                int result;
+                if ((result = asn_set_add(pE2_E2SM_gNB_NRT_ActionDefinition_Format1__ranParameter_List, pE2_RANParameter_Item)) != 0)
+                    return e2err_RICSubscriptionRequestAsn_set_addE2_NRTRANParameter_ItemFail;
+                pE2_E2SM_gNB_NRT_ActionDefinition->choice.actionDefinition_Format1.ranParameter_List = pE2_E2SM_gNB_NRT_ActionDefinition_Format1__ranParameter_List;
+            }
+            else
+                return e2err_RICSubscriptionRequestAllocNRTRANParameter_ItemFail;
+            index++;
+        }
+    }
+    else
+        return e2err_RICSubscriptionRequestRICActionDefinitionEmptyE2_E2SM_gNB_NRT_actionDefinition;
+
+    // Debug print
+    if (debug)
+        asn_fprint(stdout, &asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition, pE2_E2SM_gNB_NRT_ActionDefinition);
+
+    // Encode
+    size_t bufferSize = sizeof(pRICActionDefinitionChoice->octetString.data);
+    asn_enc_rval_t rval;
+    rval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition, pE2_E2SM_gNB_NRT_ActionDefinition,
+                                pRICActionDefinitionChoice->octetString.data, bufferSize);
+    if(rval.encoded == -1) {
+        sprintf(pLogBuffer,"Serialization of %s failed.", asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition.name);
+        return e2err_RICActionDefinitionChoicePackFail_1;
+    }
+    else if(rval.encoded > bufferSize) {
+       sprintf(pLogBuffer,"Buffer of size %zu is too small for %s, need %zu",bufferSize, asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition.name, rval.encoded);
+        return e2err_RICActionDefinitionChoicePackFail_2;
+    }
+    else
+    if (debug)
+           sprintf(pLogBuffer,"Successfully encoded %s. Buffer size %zu, encoded size %zu",asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition.name, bufferSize, rval.encoded);
+
+    ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition, pE2_E2SM_gNB_NRT_ActionDefinition);
+
+    pRICActionDefinitionChoice->octetString.contentLength = rval.encoded;
+    return e2err_OK;
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -1287,6 +1484,17 @@
         pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.octetString.contentLength = pRICeventTriggerDefinition->size;
         memcpy(pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.octetString.data, pRICeventTriggerDefinition->buf, pRICeventTriggerDefinition->size);
 
+        // Workaroud to spec problem. E2AP spec does not specify what speck (gNB-X2 or gNB-NRT) should be used when decoded EventTriggerDefinition and ActionDefinition
+        // received received. Here we know that length of gNB-NRT EventTriggerDefinition octet string is always 1 at the moment.
+        if (pRICeventTriggerDefinition->size == 1) {
+            pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.E2SMgNBNRTEventTriggerDefinitionPresent = true;
+            pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.E2SMgNBX2EventTriggerDefinitionPresent = false;
+        }
+        else {
+            pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.E2SMgNBNRTEventTriggerDefinitionPresent = false;
+            pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.E2SMgNBX2EventTriggerDefinitionPresent = true;
+        }
+
         uint64_t returnCode;
         if ((returnCode = getRICEventTriggerDefinitionData(&pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition)) != e2err_OK) {
             ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, pE2AP_PDU);
@@ -1317,6 +1525,13 @@
                        pRICaction_ToBeSetup_ItemIEs->value.choice.RICaction_ToBeSetup_Item.ricActionDefinition->buf,
                        pRICaction_ToBeSetup_ItemIEs->value.choice.RICaction_ToBeSetup_Item.ricActionDefinition->size);
 
+                // Workaroud to spec problem. E2AP spec does not specify what speck (gNB-X2 or gNB-NRT) should be used when decoded EventTriggerDefinition and ActionDefinition
+                // received received. Here we know that length of gNB-NRT EventTriggerDefinition octet string is always 1 at the moment.
+                if (pRICeventTriggerDefinition->size == 1)
+                    pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1Present = true;
+                else
+                    pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1Present = false;
+
                 pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionPresent = true;
                 if ((returnCode = getRICActionDefinitionData(pDynMemHead, &pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice)) != e2err_OK) {
                     ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, pE2AP_PDU);
@@ -1355,6 +1570,17 @@
 //////////////////////////////////////////////////////////////////////
 uint64_t getRICEventTriggerDefinitionData(RICEventTriggerDefinition_t* pRICEventTriggerDefinition) {
 
+    if (pRICEventTriggerDefinition->E2SMgNBX2EventTriggerDefinitionPresent)
+        return getRICEventTriggerDefinitionDataX2Format(pRICEventTriggerDefinition);
+    else if (pRICEventTriggerDefinition->E2SMgNBNRTEventTriggerDefinitionPresent)
+        return getRICEventTriggerDefinitionDataNRTFormat(pRICEventTriggerDefinition);
+    else
+        return e2err_RICEventTriggerDefinitionEmptyDecodeDefaultFail;
+}
+
+//////////////////////////////////////////////////////////////////////
+uint64_t getRICEventTriggerDefinitionDataX2Format(RICEventTriggerDefinition_t* pRICEventTriggerDefinition) {
+
     E2_E2SM_gNB_X2_eventTriggerDefinition_t* pE2SM_gNB_X2_eventTriggerDefinition = 0;
     asn_dec_rval_t rval;
     rval = asn_decode(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition, (void **)&pE2SM_gNB_X2_eventTriggerDefinition,
@@ -1468,7 +1694,6 @@
             ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition, pE2SM_gNB_X2_eventTriggerDefinition);
             return e2err_RICEventTriggerDefinitionIEValueFail_8;
         }
-
         ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition, pE2SM_gNB_X2_eventTriggerDefinition);
         return e2err_OK;
     case RC_WMORE:
@@ -1481,7 +1706,6 @@
         if (debug)
             printf("Decode failed. Buffer size %zu, %s, consumed %zu",pRICEventTriggerDefinition->octetString.contentLength,
                    asn_DEF_E2_E2SM_gNB_X2_eventTriggerDefinition.name, rval.consumed);
-
         return e2err_RICEventTriggerDefinitionDecodeFAIL;
     default:
         return e2err_RICEventTriggerDefinitionDecodeDefaultFail;
@@ -1489,8 +1713,59 @@
 }
 
 //////////////////////////////////////////////////////////////////////
+uint64_t getRICEventTriggerDefinitionDataNRTFormat(RICEventTriggerDefinition_t* pRICEventTriggerDefinition) {
+
+    E2_E2SM_gNB_NRT_EventTriggerDefinition_t* pE2_E2SM_gNB_NRT_EventTriggerDefinition = 0;
+    asn_dec_rval_t rval;
+    rval = asn_decode(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition, (void **)&pE2_E2SM_gNB_NRT_EventTriggerDefinition,
+                      pRICEventTriggerDefinition->octetString.data, pRICEventTriggerDefinition->octetString.contentLength);
+    switch(rval.code) {
+    case RC_OK:
+        // Debug print
+        if (debug) {
+            printf("Successfully decoded E2SM_gNB_X2_eventTriggerDefinition");
+            asn_fprint(stdout, &asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition, pE2_E2SM_gNB_NRT_EventTriggerDefinition);
+        }
+
+        // NRT-TriggerNature
+        if (pE2_E2SM_gNB_NRT_EventTriggerDefinition->present == E2_E2SM_gNB_NRT_EventTriggerDefinition_PR_eventDefinition_Format1) {
+            pRICEventTriggerDefinition->E2SMgNBNRTEventTriggerDefinitionPresent = true;
+            pRICEventTriggerDefinition->e2SMgNBNRTEventTriggerDefinition.eventDefinitionFormat1.triggerNature =
+              pE2_E2SM_gNB_NRT_EventTriggerDefinition->choice.eventDefinition_Format1.triggerNature;
+        }
+        ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition, pE2_E2SM_gNB_NRT_EventTriggerDefinition);
+        return e2err_OK;
+    case RC_WMORE:
+        if (debug)
+            printf("Decode failed. More data needed. Buffer size %zu, %s, consumed %zu",pRICEventTriggerDefinition->octetString.contentLength,
+                   asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition.name, rval.consumed);
+
+        return e2err_RICNRTEventTriggerDefinitionDecodeWMOREFail;
+    case RC_FAIL:
+        if (debug)
+            printf("Decode failed. Buffer size %zu, %s, consumed %zu",pRICEventTriggerDefinition->octetString.contentLength,
+                   asn_DEF_E2_E2SM_gNB_NRT_EventTriggerDefinition.name, rval.consumed);
+        return e2err_RICNRTEventTriggerDefinitionDecodeFAIL;
+    default:
+        return e2err_RICNRTEventTriggerDefinitionDecodeDefaultFail;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////
 uint64_t getRICActionDefinitionData(mem_track_hdr_t *pDynMemHead, RICActionDefinitionChoice_t* pRICActionDefinitionChoice) {
 
+    if (pRICActionDefinitionChoice->actionDefinitionNRTFormat1Present)
+        return getRICActionDefinitionDataNRTFormat(pDynMemHead, pRICActionDefinitionChoice);
+//    if (pRICActionDefinitionChoice->actionDefinitionX2Format1Present || pRICActionDefinitionChoice->actionDefinitionX2Format2Present)
+    else
+        return getRICActionDefinitionDataX2Format(pDynMemHead, pRICActionDefinitionChoice);
+//    else
+//        return e2err_RICActionDefinitionChoiceEmptyFAIL;
+}
+
+//////////////////////////////////////////////////////////////////////
+uint64_t getRICActionDefinitionDataX2Format(mem_track_hdr_t* pDynMemHead, RICActionDefinitionChoice_t* pRICActionDefinitionChoice) {
+
     E2_E2SM_gNB_X2_ActionDefinitionChoice_t* pE2_E2SM_gNB_X2_ActionDefinitionChoice = 0;
     asn_dec_rval_t rval;
     rval = asn_decode(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice, (void **)&pE2_E2SM_gNB_X2_ActionDefinitionChoice,
@@ -1508,49 +1783,50 @@
 
             // E2SM-gNB-X2-actionDefinition
             uint64_t status;
-            if ((status = allocActionDefinitionFormat1(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionFormat1)) != e2err_OK)
+            if ((status = allocActionDefinitionX2Format1(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionX2Format1)) != e2err_OK)
                 return status;
 
-            pRICActionDefinitionChoice->actionDefinitionFormat1Present = true;
-            pRICActionDefinitionChoice->actionDefinitionFormat2Present = false;
-            pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterCount = 0;
-            pRICActionDefinitionChoice->actionDefinitionFormat1->styleID = pE2_E2SM_gNB_X2_ActionDefinitionChoice->choice.actionDefinition_Format1.style_ID;
+            pRICActionDefinitionChoice->actionDefinitionX2Format1Present = true;
+            pRICActionDefinitionChoice->actionDefinitionX2Format2Present = false;
+            pRICActionDefinitionChoice->actionDefinitionNRTFormat1Present = false;
+            pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterCount = 0;
+            pRICActionDefinitionChoice->actionDefinitionX2Format1->styleID = pE2_E2SM_gNB_X2_ActionDefinitionChoice->choice.actionDefinition_Format1.style_ID;
             uint64_t index = 0;
             while (index < pE2_E2SM_gNB_X2_ActionDefinitionChoice->choice.actionDefinition_Format1.actionParameter_List->list.count) {
                 E2_ActionParameter_Item_t* pE2_ActionParameter_Item = pE2_E2SM_gNB_X2_ActionDefinitionChoice->choice.actionDefinition_Format1.actionParameter_List->list.array[index];
                 if (pE2_ActionParameter_Item) {
-                    pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->parameterID = pE2_ActionParameter_Item->actionParameter_ID;
+                    pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->parameterID = pE2_ActionParameter_Item->actionParameter_ID;
                     if (pE2_ActionParameter_Item->actionParameter_Value.present == E2_ActionParameter_Value_PR_valueInt) {
-                        pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueIntPresent = true;
-                        pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueInt =
+                        pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valueIntPresent = true;
+                        pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valueInt =
                           pE2_ActionParameter_Item->actionParameter_Value.choice.valueInt;
                     }
                     else if (pE2_ActionParameter_Item->actionParameter_Value.present == E2_ActionParameter_Value_PR_valueEnum) {
-                        pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueEnumPresent = true;
-                        pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueIntPresent =
+                        pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valueEnumPresent = true;
+                        pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valueIntPresent =
                           pE2_ActionParameter_Item->actionParameter_Value.choice.valueEnum;
                     }
                     else if (pE2_ActionParameter_Item->actionParameter_Value.present == E2_ActionParameter_Value_PR_valueBool) {
-                        pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueBoolPresent = true;
-                        pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueBool =
+                        pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valueBoolPresent = true;
+                        pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valueBool =
                           pE2_ActionParameter_Item->actionParameter_Value.choice.valueBool;
                     }
                     else if (pE2_ActionParameter_Item->actionParameter_Value.present == E2_ActionParameter_Value_PR_valueBitS) {
-                        pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueBitSPresent = true;
-                        addBitString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueBitS,
+                        pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valueBitSPresent = true;
+                        addBitString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valueBitS,
                                      pE2_ActionParameter_Item->actionParameter_Value.choice.valueBitS.size,
                                      pE2_ActionParameter_Item->actionParameter_Value.choice.valueBitS.buf,
                                      pE2_ActionParameter_Item->actionParameter_Value.choice.valueBitS.bits_unused);
                     }
                     else if (pE2_ActionParameter_Item->actionParameter_Value.present == E2_ActionParameter_Value_PR_valueOctS) {
-                        pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueOctSPresent = true;
-                        addOctetString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valueOctS,
+                        pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valueOctSPresent = true;
+                        addOctetString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valueOctS,
                                      pE2_ActionParameter_Item->actionParameter_Value.choice.valueOctS.size,
                                      pE2_ActionParameter_Item->actionParameter_Value.choice.valueOctS.buf);
                     }
                     else if (pE2_ActionParameter_Item->actionParameter_Value.present == E2_ActionParameter_Value_PR_valuePrtS) {
-                        pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valuePrtSPresent = true;
-                        addOctetString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterItem->actionParameterValue.valuePrtS,
+                        pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valuePrtSPresent = true;
+                        addOctetString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterItem->actionParameterValue.valuePrtS,
                                      pE2_ActionParameter_Item->actionParameter_Value.choice.valuePrtS.size,
                                      pE2_ActionParameter_Item->actionParameter_Value.choice.valuePrtS.buf);
                     }
@@ -1561,64 +1837,65 @@
                 }
                 index++;
             }
-            pRICActionDefinitionChoice->actionDefinitionFormat1->actionParameterCount = index;
+            pRICActionDefinitionChoice->actionDefinitionX2Format1->actionParameterCount = index;
         }
         else if (pE2_E2SM_gNB_X2_ActionDefinitionChoice->present == E2_E2SM_gNB_X2_ActionDefinitionChoice_PR_actionDefinition_Format2) {
 
             // E2SM-gNB-X2-ActionDefinition-Format2
             uint64_t status;
-            if ((status = allocActionDefinitionFormat2(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionFormat2)) != e2err_OK)
+            if ((status = allocActionDefinitionX2Format2(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionX2Format2)) != e2err_OK)
                 return status;
 
-            pRICActionDefinitionChoice->actionDefinitionFormat2Present = true;
-            pRICActionDefinitionChoice->actionDefinitionFormat1Present = false;
-            pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupCount = 0;
-            pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem->ranUEgroupDefinition.ranUeGroupDefCount = 0;
-            pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem->ranPolicy.ranParameterCount = 0;
+            pRICActionDefinitionChoice->actionDefinitionX2Format2Present = true;
+            pRICActionDefinitionChoice->actionDefinitionX2Format1Present = false;
+            pRICActionDefinitionChoice->actionDefinitionNRTFormat1Present = false;
+            pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupCount = 0;
+            pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem->ranUEgroupDefinition.ranUeGroupDefCount = 0;
+            pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem->ranPolicy.ranParameterCount = 0;
             E2_E2SM_gNB_X2_ActionDefinition_Format2_t* pE2SM_gNB_X2_actionDefinition = &pE2_E2SM_gNB_X2_ActionDefinitionChoice->choice.actionDefinition_Format2;
             if(pE2SM_gNB_X2_actionDefinition) {
                 uint64_t index = 0;
                 while (index < pE2SM_gNB_X2_actionDefinition->ranUEgroup_List->list.count) {
                     E2_RANueGroup_Item_t* pE2_RANueGroup_Item = pE2SM_gNB_X2_actionDefinition->ranUEgroup_List->list.array[index];
                     if (pE2_RANueGroup_Item) {
-                        pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem->ranUEgroupID = pE2_RANueGroup_Item->ranUEgroupID;
+                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem->ranUEgroupID = pE2_RANueGroup_Item->ranUEgroupID;
                         uint64_t index2 = 0;
                         while (index2 < pE2_RANueGroup_Item->ranUEgroupDefinition.ranUEgroupDef_List->list.count) {
                             E2_RANueGroupDef_Item_t* pE2_RANueGroupDef_Item = pE2_RANueGroup_Item->ranUEgroupDefinition.ranUEgroupDef_List->list.array[index2];
                             if(pE2_RANueGroupDef_Item) {
-                                pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterID = pE2_RANueGroupDef_Item->ranParameter_ID;
-                                pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterTest = pE2_RANueGroupDef_Item->ranParameter_Test;
+                                pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterID = pE2_RANueGroupDef_Item->ranParameter_ID;
+                                pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterTest = pE2_RANueGroupDef_Item->ranParameter_Test;
                                 if (pE2_RANueGroupDef_Item->ranParameter_Value.present == E2_RANParameter_Value_PR_valueInt) {
-                                    pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueIntPresent = true;
-                                    pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueInt =
+                                    pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueIntPresent = true;
+                                    pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueInt =
                                       pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueInt;
                                 }
                                 else if (pE2_RANueGroupDef_Item->ranParameter_Value.present == E2_RANParameter_Value_PR_valueEnum) {
-                                    pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueEnum = true;
-                                    pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueEnum =
+                                    pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueEnum = true;
+                                    pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueEnum =
                                       pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueEnum;
                                 }
                                 else if (pE2_RANueGroupDef_Item->ranParameter_Value.present == E2_RANParameter_Value_PR_valueBool) {
-                                    pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBoolPresent = true;
-                                    pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBool =
+                                    pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBoolPresent = true;
+                                    pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBool =
                                       pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueBool;
                                 }
                                 else if (pE2_RANueGroupDef_Item->ranParameter_Value.present == E2_RANParameter_Value_PR_valueBitS) {
-                                    pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBitSPresent = true;
-                                    addBitString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBitS,
+                                    pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBitSPresent = true;
+                                    addBitString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueBitS,
                                                  pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueBitS.size,
                                                  pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueBitS.buf,
                                                  pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueBitS.bits_unused);
                                 }
                                 else if (pE2_RANueGroupDef_Item->ranParameter_Value.present == E2_RANParameter_Value_PR_valueOctS) {
-                                    pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueOctSPresent = true;
-                                    addOctetString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueOctS,
+                                    pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueOctSPresent = true;
+                                    addOctetString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valueOctS,
                                                  pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueOctS.size,
                                                  pE2_RANueGroupDef_Item->ranParameter_Value.choice.valueOctS.buf);
                                 }
                                 else if (pE2_RANueGroupDef_Item->ranParameter_Value.present == E2_RANParameter_Value_PR_valuePrtS) {
-                                    pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valuePrtSPresent = true;
-                                    addOctetString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valuePrtS,
+                                    pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valuePrtSPresent = true;
+                                    addOctetString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranUEgroupDefinition.ranUeGroupDefItem[index2].ranParameterValue.valuePrtS,
                                                  pE2_RANueGroupDef_Item->ranParameter_Value.choice.valuePrtS.size,
                                                  pE2_RANueGroupDef_Item->ranParameter_Value.choice.valuePrtS.buf);
                                 }
@@ -1633,44 +1910,44 @@
                             }
                             index2++;
                         }
-                        pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem->ranUEgroupDefinition.ranUeGroupDefCount = index2;
+                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem->ranUEgroupDefinition.ranUeGroupDefCount = index2;
 
                         uint64_t index3 = 0;
                         while (index3 < pE2_RANueGroup_Item->ranPolicy.ranImperativePolicy_List->list.count) {
                             E2_RANParameter_Item_t* pE2_RANParameter_Item = pE2_RANueGroup_Item->ranPolicy.ranImperativePolicy_List->list.array[index3];
                             if (pE2_RANParameter_Item) {
-                                pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterID = pE2_RANParameter_Item->ranParameter_ID;
+                                pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterID = pE2_RANParameter_Item->ranParameter_ID;
                                 if (pE2_RANParameter_Item->ranParameter_Value.present == E2_RANParameter_Value_PR_valueInt) {
-                                    pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueIntPresent = true;
-                                    pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueInt =
+                                    pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueIntPresent = true;
+                                    pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueInt =
                                       pE2_RANParameter_Item->ranParameter_Value.choice.valueInt;
                                 }
                                 else if (pE2_RANParameter_Item->ranParameter_Value.present == E2_RANParameter_Value_PR_valueEnum) {
-                                    pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueEnum = true;
-                                    pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueEnum =
+                                    pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueEnum = true;
+                                    pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueEnum =
                                       pE2_RANParameter_Item->ranParameter_Value.choice.valueEnum;
                                 }
                                 else if (pE2_RANParameter_Item->ranParameter_Value.present == E2_RANParameter_Value_PR_valueBool) {
-                                    pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBoolPresent = true;
-                                    pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBool =
+                                    pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBoolPresent = true;
+                                    pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBool =
                                       pE2_RANParameter_Item->ranParameter_Value.choice.valueBool;
                                 }
                                 else if (pE2_RANParameter_Item->ranParameter_Value.present == E2_RANParameter_Value_PR_valueBitS) {
-                                    pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitSPresent = true;
-                                    addBitString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitS,
+                                    pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitSPresent = true;
+                                    addBitString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitS,
                                                  pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.size,
                                                  pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.buf,
                                                  pE2_RANParameter_Item->ranParameter_Value.choice.valueBitS.bits_unused);
                                 }
                                 else if (pE2_RANParameter_Item->ranParameter_Value.present == E2_RANParameter_Value_PR_valueOctS) {
-                                    pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctSPresent = true;
-                                    addOctetString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS,
+                                    pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctSPresent = true;
+                                    addOctetString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS,
                                                  pE2_RANParameter_Item->ranParameter_Value.choice.valueOctS.size,
                                                  pE2_RANParameter_Item->ranParameter_Value.choice.valueOctS.buf);
                                 }
                                 else if (pE2_RANParameter_Item->ranParameter_Value.present == E2_RANParameter_Value_PR_valuePrtS) {
-                                    pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtSPresent = true;
-                                    addOctetString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtS,
+                                    pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtSPresent = true;
+                                    addOctetString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem[index].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtS,
                                                  pE2_RANParameter_Item->ranParameter_Value.choice.valuePrtS.size,
                                                  pE2_RANParameter_Item->ranParameter_Value.choice.valuePrtS.buf);
                                 }
@@ -1685,7 +1962,7 @@
                             }
                             index3++;
                         }
-                        pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupItem->ranPolicy.ranParameterCount = index3;
+                        pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupItem->ranPolicy.ranParameterCount = index3;
                     }
                     else {
                         ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice, pE2_E2SM_gNB_X2_ActionDefinitionChoice);
@@ -1693,7 +1970,7 @@
                     }
                     index++;
                 }
-                pRICActionDefinitionChoice->actionDefinitionFormat2->ranUeGroupCount = index;
+                pRICActionDefinitionChoice->actionDefinitionX2Format2->ranUeGroupCount = index;
             }
         }
         ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_X2_ActionDefinitionChoice, pE2_E2SM_gNB_X2_ActionDefinitionChoice);
@@ -1716,6 +1993,104 @@
 }
 
 //////////////////////////////////////////////////////////////////////
+uint64_t getRICActionDefinitionDataNRTFormat(mem_track_hdr_t* pDynMemHead, RICActionDefinitionChoice_t* pRICActionDefinitionChoice) {
+
+    E2_E2SM_gNB_NRT_ActionDefinition_t* pE2_E2SM_gNB_NRT_ActionDefinition = 0;
+    asn_dec_rval_t rval;
+    rval = asn_decode(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition, (void **)&pE2_E2SM_gNB_NRT_ActionDefinition,
+                      pRICActionDefinitionChoice->octetString.data, pRICActionDefinitionChoice->octetString.contentLength);
+    switch(rval.code) {
+    case RC_OK:
+        // Debug print
+        if (debug) {
+            printf("Successfully decoded E2SM_gNB_NRT_ActionDefinition");
+            asn_fprint(stdout, &asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition, pE2_E2SM_gNB_NRT_ActionDefinition);
+        }
+
+        // ActionDefinitionChoice
+        if (pE2_E2SM_gNB_NRT_ActionDefinition->present == E2_E2SM_gNB_NRT_ActionDefinition_PR_actionDefinition_Format1) {
+
+            // E2SM-gNB-NRT-actionDefinition
+            uint64_t status;
+            if ((status = allocActionDefinitionNRTFormat1(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionNRTFormat1)) != e2err_OK)
+                return status;
+
+            pRICActionDefinitionChoice->actionDefinitionNRTFormat1Present = true;
+            pRICActionDefinitionChoice->actionDefinitionX2Format1Present = false;
+            pRICActionDefinitionChoice->actionDefinitionX2Format2Present = false;
+            pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterCount = 0;
+            uint64_t index = 0;
+            while (index < pE2_E2SM_gNB_NRT_ActionDefinition->choice.actionDefinition_Format1.ranParameter_List->list.count) {
+                E2_RANparameter_Item_t* pE2_RANparameter_Item = pE2_E2SM_gNB_NRT_ActionDefinition->choice.actionDefinition_Format1.ranParameter_List->list.array[index];
+                if (pE2_RANparameter_Item) {
+                    pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterID = pE2_RANparameter_Item->ranParameter_ID;
+
+                    if (pE2_RANparameter_Item->ranParameter_Value.present == E2_RANparameter_Value_PR_valueInt) {
+                        pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueIntPresent = true;
+                        pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueInt =
+                          pE2_RANparameter_Item->ranParameter_Value.choice.valueInt;
+                    }
+                    else if (pE2_RANparameter_Item->ranParameter_Value.present == E2_RANparameter_Value_PR_valueEnum) {
+                        pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueEnumPresent = true;
+                        pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueEnum =
+                          pE2_RANparameter_Item->ranParameter_Value.choice.valueEnum;
+                    }
+                    else if (pE2_RANparameter_Item->ranParameter_Value.present == E2_RANparameter_Value_PR_valueBool) {
+                        pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueBoolPresent = true;
+                        pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueBool =
+                          pE2_RANparameter_Item->ranParameter_Value.choice.valueBool;
+                    }
+                    else if (pE2_RANparameter_Item->ranParameter_Value.present == E2_RANparameter_Value_PR_valueBitS) {
+                        pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueBitSPresent = true;
+                        addBitString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueBitS,
+                                     pE2_RANparameter_Item->ranParameter_Value.choice.valueBitS.size,
+                                     pE2_RANparameter_Item->ranParameter_Value.choice.valueBitS.buf,
+                                     pE2_RANparameter_Item->ranParameter_Value.choice.valueBitS.bits_unused);
+                    }
+                    else if (pE2_RANparameter_Item->ranParameter_Value.present == E2_RANparameter_Value_PR_valueOctS) {
+                        pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueOctSPresent = true;
+                        addOctetString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valueOctS,
+                                     pE2_RANparameter_Item->ranParameter_Value.choice.valueOctS.size,
+                                     pE2_RANparameter_Item->ranParameter_Value.choice.valueOctS.buf);
+                    }
+                    else if (pE2_RANparameter_Item->ranParameter_Value.present == E2_RANparameter_Value_PR_valuePrtS) {
+                        pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valuePrtSPresent = true;
+                        addOctetString(pDynMemHead, &pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterList[index].ranParameterValue.valuePrtS,
+                                     pE2_RANparameter_Item->ranParameter_Value.choice.valuePrtS.size,
+                                     pE2_RANparameter_Item->ranParameter_Value.choice.valuePrtS.buf);
+                    }
+                    else {
+                        ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition, pE2_E2SM_gNB_NRT_ActionDefinition);
+                        return e2err_RICSubscriptionRequestNRTRanParameterItemRanParameterValueEmptyFail;
+                    }
+                }
+                else {
+                    ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition, pE2_E2SM_gNB_NRT_ActionDefinition);
+                    return e2err_RICSubscriptionRequestNRTAllocActionDefinitionFail;
+                }
+                index++;
+            }
+            pRICActionDefinitionChoice->actionDefinitionNRTFormat1->ranParameterCount = index;
+        }
+        ASN_STRUCT_FREE(asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition, pE2_E2SM_gNB_NRT_ActionDefinition);
+        return e2err_OK;
+    case RC_WMORE:
+        if (debug)
+            printf("Decode failed. More data needed. Buffer size %zu, %s, consumed %zu",pRICActionDefinitionChoice->octetString.contentLength,
+                   asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition.name, rval.consumed);
+
+        return e2err_RICNRTActionDefinitionChoiceWMOREFail;
+    case RC_FAIL:
+        if (debug)
+            printf("Decode failed. Buffer size %zu, %s, consumed %zu",pRICActionDefinitionChoice->octetString.contentLength,
+                   asn_DEF_E2_E2SM_gNB_NRT_ActionDefinition.name, rval.consumed);
+
+        return e2err_RICNRTActionDefinitionChoiceDecodeFAIL;
+    default:
+        return e2err_RICNRTActionDefinitionChoiceDecodeDefaultFail;
+    }
+}
+//////////////////////////////////////////////////////////////////////
 uint64_t getRICSubscriptionResponseData(e2ap_pdu_ptr_t* pE2AP_PDU_pointer, RICSubscriptionResponse_t* pRICSubscriptionResponse) {
 
     E2AP_PDU_t* pE2AP_PDU = (E2AP_PDU_t*)pE2AP_PDU_pointer;
@@ -1819,7 +2194,6 @@
         pRICSubscriptionResponse->ricActionNotAdmittedListPresent = false;
         pRICSubscriptionResponse->ricActionNotAdmittedList.contentLength = 0;
     }
-
     ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, pE2AP_PDU);
     return e2err_OK;
 }
@@ -1905,7 +2279,6 @@
         ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, pE2AP_PDU);
         return e2err_RICsubscriptionFailureRICaction_NotAdmitted_ListMissing;
     }
-
     ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, pE2AP_PDU);
     return e2err_OK;
 }
@@ -1940,7 +2313,6 @@
         ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, pE2AP_PDU);
         return e2err_RICsubscriptionDeleteRequestRANfunctionIDMissing;
     }
-
     ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, pE2AP_PDU);
     return e2err_OK;
 }
@@ -1975,7 +2347,6 @@
         ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, pE2AP_PDU);
         return e2err_RICsubscriptionDeleteResponseRANfunctionIDMissing;
     }
-
     ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, pE2AP_PDU);
     return e2err_OK;
 }
@@ -2052,48 +2423,57 @@
 }
 
 //////////////////////////////////////////////////////////////////////
-uint64_t allocActionDefinitionFormat1(mem_track_hdr_t* pDynMemHead, E2SMgNBX2actionDefinition_t** pActionDefinition) {
+uint64_t allocActionDefinitionX2Format1(mem_track_hdr_t* pDynMemHead, E2SMgNBX2actionDefinition_t** pActionDefinition) {
     *pActionDefinition = mem_track_alloc(pDynMemHead, sizeof(E2SMgNBX2actionDefinition_t));
-    if(pActionDefinition)
+    if(*pActionDefinition)
         return e2err_OK;
     else
-        return e2err_RICSubscriptionRequestAllocactionDefinitionFormat2Fail;
+        return e2err_RICSubscriptionRequestAllocactionDefinitionX2Format1Fail;
 }
 
 //////////////////////////////////////////////////////////////////////
-uint64_t allocActionDefinitionFormat2(mem_track_hdr_t* pDynMemHead, E2SMgNBX2ActionDefinitionFormat2_t** pActionDefinition) {
+uint64_t allocActionDefinitionX2Format2(mem_track_hdr_t* pDynMemHead, E2SMgNBX2ActionDefinitionFormat2_t** pActionDefinition) {
     *pActionDefinition = mem_track_alloc(pDynMemHead, sizeof(E2SMgNBX2ActionDefinitionFormat2_t));
-    if(pActionDefinition)
+    if(*pActionDefinition)
         return e2err_OK;
     else
-        return e2err_RICSubscriptionRequestAllocactionDefinitionFormat2Fail;
+        return e2err_RICSubscriptionRequestAllocactionDefinitionX2Format2Fail;
 }
 
 //////////////////////////////////////////////////////////////////////
-DynOctetString_t* addOctetString(mem_track_hdr_t* pDynMemHead, DynOctetString_t* pOctetString, uint64_t bufferSize, void* pData)
+uint64_t allocActionDefinitionNRTFormat1(mem_track_hdr_t* pDynMemHead, E2SMgNBNRTActionDefinitionFormat1_t** pActionDefinition) {
+    *pActionDefinition = mem_track_alloc(pDynMemHead, sizeof(E2SMgNBNRTActionDefinitionFormat1_t));
+    if(*pActionDefinition)
+        return e2err_OK;
+    else
+        return e2err_RICSubscriptionRequestAllocactionDefinitionNRTFormat1Fail;
+}
+
+//////////////////////////////////////////////////////////////////////
+bool addOctetString(mem_track_hdr_t* pDynMemHead, DynOctetString_t* pOctetString, uint64_t bufferSize, void* pData)
 {
     pOctetString->data = mem_track_alloc(pDynMemHead, bufferSize);
     if (pOctetString->data) {
         pOctetString->length = bufferSize;
         memcpy(pOctetString->data,pData,bufferSize);
-        return pOctetString;
+        return true;
     }
     else
-        return 0;
+        return false;
 }
 
 //////////////////////////////////////////////////////////////////////
-DynBitString_t* addBitString(mem_track_hdr_t* pDynMemHead, DynBitString_t* pBitString, uint64_t bufferSize, void* pData, uint8_t unusedBits)
+bool addBitString(mem_track_hdr_t* pDynMemHead, DynBitString_t* pBitString, uint64_t bufferSize, void* pData, uint8_t unusedBits)
 {
     pBitString->data = mem_track_alloc(pDynMemHead, bufferSize);
     if (pBitString->data) {
         pBitString->byteLength = bufferSize;
-        pBitString->unusedBits = unusedBits; /* Unused trailing bits in the last octet (0..7) */
+        pBitString->unusedBits = unusedBits; // Unused trailing bits in the last octet (0..7)
         memcpy(pBitString->data,pData,bufferSize);
-        return pBitString;
+        return true;
     }
     else
-        return 0;
+        return false;
 }
 
 //////////////////////////////////////////////////////////////////////
diff --git a/e2ap/libe2ap_wrapper/E2AP_if.h b/e2ap/libe2ap_wrapper/E2AP_if.h
index f629dd1..2ccea5b 100644
--- a/e2ap/libe2ap_wrapper/E2AP_if.h
+++ b/e2ap/libe2ap_wrapper/E2AP_if.h
@@ -162,7 +162,7 @@
 
 typedef struct {
     uint8_t ranUeGroupCount;
-    RANueGroupItem_t ranUeGroupItem[15];  // OPTIONAL. 1..15 (maxofUEgroup)
+    RANueGroupItem_t ranUeGroupItem[15]; // OPTIONAL. 1..15 (maxofUEgroup)
 } E2SMgNBX2ActionDefinitionFormat2_t;
 
 enum RICSubsequentActionType_t {
@@ -171,14 +171,20 @@
 };
 
 typedef struct {
-    OctetString_t octetString;   // This element is E2AP spec format, the other elements below are for E2SM-gNB-X2 format
-    // CHOICE. Only one value can be present
-    bool actionDefinitionFormat1Present;
-	E2SMgNBX2actionDefinition_t* actionDefinitionFormat1;
-	bool actionDefinitionFormat2Present;
-	E2SMgNBX2ActionDefinitionFormat2_t* actionDefinitionFormat2;
-} RICActionDefinitionChoice_t;
+    uint8_t ranParameterCount;
+	RANParameterItem_t ranParameterList[255];	// OPTIONAL. 1..255 (maxofRANParameters)
+} E2SMgNBNRTActionDefinitionFormat1_t;
 
+typedef struct {
+    OctetString_t octetString;   // This element is E2AP spec format
+    // CHOICE. Only one value can be present
+    bool actionDefinitionX2Format1Present;
+	E2SMgNBX2actionDefinition_t* actionDefinitionX2Format1; // This element is E2SM-gNB-X2 format
+	bool actionDefinitionX2Format2Present;
+	E2SMgNBX2ActionDefinitionFormat2_t* actionDefinitionX2Format2; // This element is E2SM-gNB-X2 format
+	bool actionDefinitionNRTFormat1Present;
+    E2SMgNBNRTActionDefinitionFormat1_t* actionDefinitionNRTFormat1; // This element is E2SM-gNB-NRT format
+} RICActionDefinitionChoice_t;
 
 enum RICTimeToWait_t {
 	RICTimeToWait_zero,
@@ -312,12 +318,26 @@
     InterfaceProtocolIEList_t interfaceProtocolIEList;  // OPTIONAL. Not used in RIC currently
 } E2SMgNBX2eventTriggerDefinition_t;
 
+enum NRTTriggerNature_t {
+    NRTTriggerNature_t_now,
+    NRTTriggerNature_t_onchange
+};
+
+typedef struct {
+	uint8_t triggerNature;  // This is type of enum NRTTriggerNature_t
+} E2SMgNBNRTEventTriggerDefinitionFormat1_t;
+
+typedef struct {
+    E2SMgNBNRTEventTriggerDefinitionFormat1_t eventDefinitionFormat1;
+} E2SMgNBNRTEventTriggerDefinition_t;
+
 typedef struct {
     OctetString_t octetString;   // This element is E2AP spec format
-
-    // CHOICE. Only one value can be present. Note only one choice specified so far
+    // CHOICE. Only one value can be present.
     bool E2SMgNBX2EventTriggerDefinitionPresent;
-    E2SMgNBX2eventTriggerDefinition_t e2SMgNBX2eventTriggerDefinition;  // This element is E2SM-gNB-X2 eventTriggerDefinition-Format1
+    E2SMgNBX2eventTriggerDefinition_t e2SMgNBX2eventTriggerDefinition;  // This element is E2SM-gNB-X2 spec format
+    bool E2SMgNBNRTEventTriggerDefinitionPresent;
+    E2SMgNBNRTEventTriggerDefinition_t e2SMgNBNRTEventTriggerDefinition; // This element is E2SM-gNB-NRT spec format
 } RICEventTriggerDefinition_t;
 
 typedef struct {
@@ -404,46 +424,56 @@
     e2err_RICSubscriptionRequestAllocRANfunctionIDFail,
     e2err_RICSubscriptionRequestAllocRICeventTriggerDefinitionBufFail,
     e2err_RICSubscriptionRequestAllocRICaction_ToBeSetup_ItemIEsFail,
-
     e2err_RICSubscriptionRequestAllocactionParameterValueValueBitSFail,
     e2err_RICSubscriptionRequestAllocactionParameterValueValueOctSFail,
     e2err_RICSubscriptionRequestAllocactionParameterValueValuePrtsSFail,
-
     e2err_RICSubscriptionRequestAllocactionRanParameterValueValueBitSFail,
     e2err_RICSubscriptionRequestAllocactionRanParameterValueValueOctSFail,
     e2err_RICSubscriptionRequestAllocactionRanParameterValueValuePrtsSFail,
-
     e2err_RICSubscriptionRequestAllocactionRanParameterValue2ValueBitSFail,
     e2err_RICSubscriptionRequestAllocactionRanParameterValue2ValueOctSFail,
     e2err_RICSubscriptionRequestAllocactionRanParameterValue2ValuePrtsSFail,
-
-    e2err_RICSubscriptionRequestAllocactionDefinitionFormat1Fail,
-    e2err_RICSubscriptionRequestAllocactionDefinitionFormat2Fail,
-
+    e2err_RICSubscriptionRequestAllocactionDefinitionX2Format1Fail,
+    e2err_RICSubscriptionRequestAllocactionDefinitionX2Format2Fail,
+    e2err_RICSubscriptionRequestAllocactionDefinitionNRTFormat1Fail,
     e2err_RICSubscriptionRequestAllocRICactionDefinitionBufFail,
     e2err_RICSubscriptionRequestAllocRICactionDefinitionFail,
+    e2err_RICSubscriptionRequestRICActionDefinitionEmpty,
     e2err_RICSubscriptionRequestRICActionDefinitionEmptyE2_E2SM_gNB_X2_actionDefinition,
+    e2err_RICSubscriptionRequestRICActionDefinitionEmptyE2_E2SM_gNB_NRT_actionDefinition,
     e2err_RICSubscriptionRequestActionParameterItemFail,
     e2err_RICActionDefinitionChoicePackFail_1,
     e2err_RICActionDefinitionChoicePackFail_2,
-
     e2err_RICSubscriptionRequestAllocE2_RANueGroupDef_ItemFail,
     e2err_RICSubscriptionRequestAllocRANParameter_ItemFail,
     e2err_RICSubscriptionRequestRanranUeGroupDefItemParameterValueEmptyFail,
     e2err_RICSubscriptionRequestRanParameterItemRanParameterValueEmptyFail,
-
     e2err_RICSubscriptionRequestAllocActionDefinitionFail,
-
+    e2err_RICSubscriptionRequestAllocNRTRANParameter_ItemFail,
+    e2err_RICSubscriptionRequestAllocactionNRTRanParameterValue2ValueBitSFail,
+    e2err_RICSubscriptionRequestAllocactionNRTRanParameterValue2ValueOctSFail,
+    e2err_RICSubscriptionRequestAllocactionNRTRanParameterValue2ValuePrtsSFail,
+    e2err_RICSubscriptionRequestRanParameterItemNRTRanParameterValueEmptyFail,
     e2err_RICSubscriptionRequestAsn_set_addE2_ActionParameter_ItemFail,
     e2err_RICSubscriptionRequestAsn_set_addRANueGroupDef_ItemFail,
     e2err_RICSubscriptionRequestAsn_set_addE2_RANParameter_ItemFail,
-
-
+    e2err_RICSubscriptionRequestAsn_set_addE2_NRTRANParameter_ItemFail,
     e2err_RICActionDefinitionChoiceWMOREFail,
     e2err_RICActionDefinitionChoiceDecodeFAIL,
     e2err_RICActionDefinitionChoiceDecodeDefaultFail,
+    e2err_RICNRTActionDefinitionChoiceWMOREFail,
+    e2err_RICNRTActionDefinitionChoiceDecodeFAIL,
+    e2err_RICNRTActionDefinitionChoiceDecodeDefaultFail,
+    e2err_RICActionDefinitionChoiceEmptyFAIL,
+    e2err_RICNRTEventTriggerDefinitionDecodeWMOREFail,
+    e2err_RICNRTEventTriggerDefinitionDecodeFAIL,
+    e2err_RICNRTEventTriggerDefinitionDecodeDefaultFail,
+    e2err_RICEventTriggerDefinitionEmptyDecodeDefaultFail,
     e2err_RICSubscriptionRequestAllocE2_E2SM_gNB_X2_ActionDefinitionChoiceFail,
-
+    e2err_RICSubscriptionRequestAllocE2_E2SM_gNB_NRT_ActionDefinitionFormat1Fail,
+    e2err_RICSubscriptionRequestNRTRanParameterItemRanParameterValueEmptyFail,
+    e2err_RICSubscriptionRequestNRTAllocActionDefinitionFail,
+    e2err_RICSubscriptionRequestAllocE2_E2SM_gNB_NRT_ActionDefinitionFail,
     e2err_RICSubscriptionRequestAllocRICsubsequentActionFail,
     e2err_RICSubscriptionRequestAllocRICsubscriptionRequest_IEsFail,
     e2err_RICSubscriptionRequestEncodeFail,
@@ -461,7 +491,11 @@
     e2err_RICEventTriggerDefinitionIEValueFail_4,
     e2err_RICEventTriggerDefinitionPackFail_1,
     e2err_RICEventTriggerDefinitionPackFail_2,
+    e2err_RICENRTventTriggerDefinitionPackFail_1,
+    e2err_RICNRTEventTriggerDefinitionPackFail_2,
     e2err_RICEventTriggerDefinitionAllocE2SM_gNB_X2_eventTriggerDefinitionFail,
+    e2err_RICEventTriggerDefinitionAllocE2SM_gNB_NRT_eventTriggerDefinitionFail,
+    e2err_RICEventTriggerDefinitionAllocEventTriggerDefinitionEmptyFail,
     e2err_RICSubscriptionResponseAllocRICrequestIDFail,
     e2err_RICSubscriptionResponseAllocRANfunctionIDFail,
     e2err_RICSubscriptionResponseAllocRICaction_Admitted_ItemIEsFail,
@@ -523,45 +557,56 @@
     "e2err_RICSubscriptionRequestAllocRANfunctionIDFail",
     "e2err_RICSubscriptionRequestAllocRICeventTriggerDefinitionBufFail",
     "e2err_RICSubscriptionRequestAllocRICaction_ToBeSetup_ItemIEsFail",
-
     "e2err_RICSubscriptionRequestAllocactionParameterValueValueBitSFail",
     "e2err_RICSubscriptionRequestAllocactionParameterValueValueOctSFail",
     "e2err_RICSubscriptionRequestAllocactionParameterValueValuePrtsSFail",
-
     "e2err_RICSubscriptionRequestAllocactionRanParameterValueValueBitSFail",
     "e2err_RICSubscriptionRequestAllocactionRanParameterValueValueOctSFail",
     "e2err_RICSubscriptionRequestAllocactionRanParameterValueValuePrtsSFail",
-
     "e2err_RICSubscriptionRequestAllocactionRanParameterValue2ValueBitSFail",
     "e2err_RICSubscriptionRequestAllocactionRanParameterValue2ValueOctSFail",
     "e2err_RICSubscriptionRequestAllocactionRanParameterValue2ValuePrtsSFail",
-
-    "e2err_RICSubscriptionRequestAllocactionDefinitionFormat1Fail",
-    "e2err_RICSubscriptionRequestAllocactionDefinitionFormat2Fail",
-
+    "e2err_RICSubscriptionRequestAllocactionDefinitionX2Format1Fail",
+    "e2err_RICSubscriptionRequestAllocactionDefinitionX2Format2Fail",
+    "e2err_RICSubscriptionRequestAllocactionDefinitionNRTFormat1Fail",
     "e2err_RICSubscriptionRequestAllocRICactionDefinitionBufFail",
     "e2err_RICSubscriptionRequestAllocRICactionDefinitionFail",
+    "e2err_RICSubscriptionRequestRICActionDefinitionEmpty",
     "e2err_RICSubscriptionRequestRICActionDefinitionEmptyE2_E2SM_gNB_X2_actionDefinition",
+    "e2err_RICSubscriptionRequestRICActionDefinitionEmptyE2_E2SM_gNB_NRT_actionDefinition",
     "e2err_RICSubscriptionRequestActionParameterItemFail",
     "e2err_RICActionDefinitionChoicePackFail_1",
     "e2err_RICActionDefinitionChoicePackFail_2",
-
     "e2err_RICSubscriptionRequestAllocE2_RANueGroupDef_ItemFail",
     "e2err_RICSubscriptionRequestAllocRANParameter_ItemFail",
     "e2err_RICSubscriptionRequestRanranUeGroupDefItemParameterValueEmptyFail",
     "e2err_RICSubscriptionRequestRanParameterItemRanParameterValueEmptyFail",
-
     "e2err_RICSubscriptionRequestAllocActionDefinitionFail",
-
+    "e2err_RICSubscriptionRequestAllocNRTRANParameter_ItemFail",
+    "e2err_RICSubscriptionRequestAllocactionNRTRanParameterValue2ValueBitSFail",
+    "e2err_RICSubscriptionRequestAllocactionNRTRanParameterValue2ValueOctSFail",
+    "e2err_RICSubscriptionRequestAllocactionNRTRanParameterValue2ValuePrtsSFail",
+    "e2err_RICSubscriptionRequestRanParameterItemNRTRanParameterValueEmptyFail",
     "e2err_RICSubscriptionRequestAsn_set_addE2_ActionParameter_ItemFail",
     "e2err_RICSubscriptionRequestAsn_set_addRANueGroupDef_ItemFail",
     "e2err_RICSubscriptionRequestAsn_set_addE2_RANParameter_ItemFail",
-
+    "e2err_RICSubscriptionRequestAsn_set_addE2_NRTRANParameter_ItemFail",
     "e2err_RICActionDefinitionChoiceWMOREFail",
     "e2err_RICActionDefinitionChoiceDecodeFAIL",
     "e2err_RICActionDefinitionChoiceDecodeDefaultFail",
+    "e2err_RICNRTActionDefinitionChoiceWMOREFail",
+    "e2err_RICNRTActionDefinitionChoiceDecodeFAIL",
+    "e2err_RICNRTActionDefinitionChoiceDecodeDefaultFail",
+    "e2err_RICActionDefinitionChoiceEmptyFAIL",
+    "e2err_RICNRTEventTriggerDefinitionDecodeWMOREFail",
+    "e2err_RICNRTEventTriggerDefinitionDecodeFAIL",
+    "e2err_RICNRTEventTriggerDefinitionDecodeDefaultFail",
+    "e2err_RICEventTriggerDefinitionEmptyDecodeDefaultFail",
     "e2err_RICSubscriptionRequestAllocE2_E2SM_gNB_X2_ActionDefinitionChoiceFail",
-
+    "e2err_RICSubscriptionRequestAllocE2_E2SM_gNB_NRT_ActionDefinitionFormat1Fail",
+    "e2err_RICSubscriptionRequestNRTRanParameterItemRanParameterValueEmptyFail",
+    "e2err_RICSubscriptionRequestNRTAllocActionDefinitionFail",
+    "e2err_RICSubscriptionRequestAllocE2_E2SM_gNB_NRT_ActionDefinitionFail",
     "e2err_RICSubscriptionRequestAllocRICsubsequentActionFail",
     "e2err_RICSubscriptionRequestAllocRICsubscriptionRequest_IEsFail",
     "e2err_RICSubscriptionRequestEncodeFail",
@@ -579,7 +624,11 @@
     "e2err_RICEventTriggerDefinitionIEValueFail_4",
     "e2err_RICEventTriggerDefinitionPackFail_1",
     "e2err_RICEventTriggerDefinitionPackFail_2",
+    "e2err_RICENRTventTriggerDefinitionPackFail_1",
+    "e2err_RICNRTEventTriggerDefinitionPackFail_2",
     "e2err_RICEventTriggerDefinitionAllocE2SM_gNB_X2_eventTriggerDefinitionFail",
+    "e2err_RICEventTriggerDefinitionAllocE2SM_gNB_NRT_eventTriggerDefinitionFail",
+    "e2err_RICEventTriggerDefinitionAllocEventTriggerDefinitionEmptyFail",
     "e2err_RICSubscriptionResponseAllocRICrequestIDFail",
     "e2err_RICSubscriptionResponseAllocRANfunctionIDFail",
     "e2err_RICSubscriptionResponseAllocRICaction_Admitted_ItemIEsFail",
@@ -712,6 +761,10 @@
 uint64_t packRICSubscriptionRequest(size_t*, byte*, char*,RICSubscriptionRequest_t*);
 uint64_t packRICEventTriggerDefinition(char*,RICEventTriggerDefinition_t*);
 uint64_t packRICActionDefinition(char*, RICActionDefinitionChoice_t*);
+uint64_t packRICEventTriggerDefinitionX2Format(char* pLogBuffer, RICEventTriggerDefinition_t*);
+uint64_t packRICEventTriggerDefinitionNRTFormat(char* pLogBuffer, RICEventTriggerDefinition_t*);
+uint64_t packActionDefinitionX2Format(char*, RICActionDefinitionChoice_t*);
+uint64_t packActionDefinitionNRTFormat(char*, RICActionDefinitionChoice_t*);
 uint64_t packRICSubscriptionResponse(size_t*, byte*, char*,RICSubscriptionResponse_t*);
 uint64_t packRICSubscriptionFailure(size_t*, byte*, char*,RICSubscriptionFailure_t*);
 uint64_t packRICSubscriptionDeleteRequest(size_t*, byte*, char*,RICSubscriptionDeleteRequest_t*);
@@ -721,7 +774,11 @@
 e2ap_pdu_ptr_t* unpackE2AP_pdu(const size_t, const byte*, char*, E2MessageInfo_t*);
 uint64_t getRICSubscriptionRequestData(mem_track_hdr_t *, e2ap_pdu_ptr_t*, RICSubscriptionRequest_t*);
 uint64_t getRICEventTriggerDefinitionData(RICEventTriggerDefinition_t*);
+uint64_t getRICEventTriggerDefinitionDataX2Format(RICEventTriggerDefinition_t*);
+uint64_t getRICEventTriggerDefinitionDataNRTFormat(RICEventTriggerDefinition_t*);
 uint64_t getRICActionDefinitionData(mem_track_hdr_t *, RICActionDefinitionChoice_t*);
+uint64_t getRICActionDefinitionDataX2Format(mem_track_hdr_t*, RICActionDefinitionChoice_t*);
+uint64_t getRICActionDefinitionDataNRTFormat(mem_track_hdr_t*, RICActionDefinitionChoice_t*);
 uint64_t getRICSubscriptionResponseData(e2ap_pdu_ptr_t*, RICSubscriptionResponse_t*);
 uint64_t getRICSubscriptionFailureData(e2ap_pdu_ptr_t*, RICSubscriptionFailure_t*);
 uint64_t getRICSubscriptionDeleteRequestData(e2ap_pdu_ptr_t*, RICSubscriptionDeleteRequest_t*);
@@ -729,15 +786,16 @@
 uint64_t getRICSubscriptionDeleteFailureData(e2ap_pdu_ptr_t*, RICSubscriptionDeleteFailure_t*);
 
 void* allocDynMem(mem_track_hdr_t*, size_t);
-DynOctetString_t* addOctetString(mem_track_hdr_t *, DynOctetString_t*, uint64_t, void*);
-DynBitString_t* addBitString(mem_track_hdr_t *, DynBitString_t*, uint64_t, void*, uint8_t);
+bool addOctetString(mem_track_hdr_t *, DynOctetString_t*, uint64_t, void*);
+bool addBitString(mem_track_hdr_t *, DynBitString_t*, uint64_t, void*, uint8_t);
 
-uint64_t allocActionDefinitionFormat1(mem_track_hdr_t*, E2SMgNBX2actionDefinition_t**);
-uint64_t allocActionDefinitionFormat2(mem_track_hdr_t*, E2SMgNBX2ActionDefinitionFormat2_t**);
+uint64_t allocActionDefinitionX2Format1(mem_track_hdr_t*, E2SMgNBX2actionDefinition_t**);
+uint64_t allocActionDefinitionX2Format2(mem_track_hdr_t*, E2SMgNBX2ActionDefinitionFormat2_t**);
+uint64_t allocActionDefinitionNRTFormat1(mem_track_hdr_t*, E2SMgNBNRTActionDefinitionFormat1_t**);
+
 uint64_t allocateOctetStringBuffer(DynOctetString_t*, uint64_t);
 uint64_t allocateBitStringBuffer(mem_track_hdr_t *, DynBitString_t*, uint64_t);
 
-
 #if DEBUG
 bool TestRICSubscriptionRequest();
 bool TestRICSubscriptionResponse();
diff --git a/e2ap/libe2ap_wrapper/E2AP_tests.c b/e2ap/libe2ap_wrapper/E2AP_tests.c
index dd4928c..bf31ab6 100644
--- a/e2ap/libe2ap_wrapper/E2AP_tests.c
+++ b/e2ap/libe2ap_wrapper/E2AP_tests.c
@@ -47,6 +47,8 @@
     ricSubscriptionRequest.ranFunctionID = 33;
 
     ricSubscriptionRequest.ricSubscriptionDetails.ricEventTriggerDefinition.octetString.contentLength = 0;
+    ricSubscriptionRequest.ricSubscriptionDetails.ricEventTriggerDefinition.E2SMgNBX2EventTriggerDefinitionPresent = false;
+    ricSubscriptionRequest.ricSubscriptionDetails.ricEventTriggerDefinition.E2SMgNBNRTEventTriggerDefinitionPresent = true;
 
     ricSubscriptionRequest.ricSubscriptionDetails.ricEventTriggerDefinition.e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBIDPresent = true;
     ricSubscriptionRequest.ricSubscriptionDetails.ricEventTriggerDefinition.e2SMgNBX2eventTriggerDefinition.interfaceID.globalGNBIDPresent = false;
@@ -86,66 +88,81 @@
 
         char data[3] = {'A','B','C'};
 
-        ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1Present = true;  // Choice
-        ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2Present = false;
-        if (ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1Present) {
+        ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1Present = false;  // Choice
+        ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2Present = false;
+        ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1Present = true;
 
-            // Format 1
-            if (allocActionDefinitionFormat1(&dynMemHead,&ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1) != e2err_OK)
+        if (ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1Present) {
+            // X2 Format 1
+            if (allocActionDefinitionX2Format1(&dynMemHead,&ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1) != e2err_OK)
                 return false;
-            ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterCount = 1;
+            ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterCount = 1;
 
             uint64_t index2 = 0;
-            while (index2 < ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterCount) {
+            while (index2 < ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterCount) {
 
-                ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->styleID = 255;
-                ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem->parameterID = 1;  // index
-                ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueIntPresent = false;
-                ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueInt = 111;
+                ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->styleID = 255;
+                ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem->parameterID = 1;  // index
+                ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueIntPresent = false;
+                ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueInt = 111;
 
-                ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueOctSPresent = true;
-                if (addOctetString(&dynMemHead,&ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueOctS,sizeof(data),data) == NULL) {
+                ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueOctSPresent = true;
+                if (addOctetString(&dynMemHead,&ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueOctS,sizeof(data),data) == NULL) {
                     printf("addOctetString failure\n");
                     return false;
                 }
                 index2++;
             }
-        } else if (ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2Present) {
-            // Format 2
-            if (allocActionDefinitionFormat2(&dynMemHead,&ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2) != e2err_OK)
+        }
+        else if (ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2Present) {
+            // X2 Format 2
+            if (allocActionDefinitionX2Format2(&dynMemHead,&ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2))
                 return false;
 
-            ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupCount = 1;
+            ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupCount = 1;
 
             uint64_t index3 = 0;
-            while (index3 < ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupCount) {
-
-
-                ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index3].ranUEgroupID = 0;
-                ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index3].ranUEgroupDefinition.ranUeGroupDefCount = 1;
+            while (index3 < ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupCount) {
+                ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index3].ranUEgroupID = 0;
+                ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index3].ranUEgroupDefinition.ranUeGroupDefCount = 1;
                 uint64_t index4 = 0;
-                while (index4 < ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index3].ranUEgroupDefinition.ranUeGroupDefCount) {
-                    ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index3].ranUEgroupDefinition.ranUeGroupDefItem[0].ranParameterID = 0;
-                    ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index3].ranUEgroupDefinition.ranUeGroupDefItem[0].ranParameterTest = RANParameterTest_equal;
-                    ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index3].ranUEgroupDefinition.ranUeGroupDefItem[0].ranParameterValue.valueIntPresent = false;
-                    ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index3].ranUEgroupDefinition.ranUeGroupDefItem[0].ranParameterValue.valueInt = 1;
+                while (index4 < ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index3].ranUEgroupDefinition.ranUeGroupDefCount) {
+                    ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index3].ranUEgroupDefinition.ranUeGroupDefItem[index4].ranParameterID = 0;
+                    ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index3].ranUEgroupDefinition.ranUeGroupDefItem[index4].ranParameterTest = RANParameterTest_equal;
+                    ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index3].ranUEgroupDefinition.ranUeGroupDefItem[index4].ranParameterValue.valueIntPresent = false;
+                    ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index3].ranUEgroupDefinition.ranUeGroupDefItem[index4].ranParameterValue.valueInt = 1;
 
-                    ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index3].ranUEgroupDefinition.ranUeGroupDefItem[0].ranParameterValue.valueOctSPresent = true;
-                    addOctetString(&dynMemHead,&ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[0].ranUEgroupDefinition.ranUeGroupDefItem[0].ranParameterValue.valueOctS,sizeof(data),data);
+                    ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index3].ranUEgroupDefinition.ranUeGroupDefItem[index4].ranParameterValue.valueOctSPresent = true;
+                    addOctetString(&dynMemHead,&ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index4].ranUEgroupDefinition.ranUeGroupDefItem[0].ranParameterValue.valueOctS,sizeof(data),data);
                     index4++;
                 }
 
-                ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index3].ranPolicy.ranParameterCount = 1;
+                ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index3].ranPolicy.ranParameterCount = 1;
                 uint64_t index5 = 0;
-                while (index5 < ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index3].ranPolicy.ranParameterCount) {
-                    ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index3].ranPolicy.ranParameterItem[0].ranParameterID = 0;
-                    ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index3].ranPolicy.ranParameterItem[0].ranParameterValue.valueIntPresent = true;
-                    ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index3].ranPolicy.ranParameterItem[0].ranParameterValue.valueInt = 2;
+                while (index5 < ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index3].ranPolicy.ranParameterCount) {
+                    ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index3].ranPolicy.ranParameterItem[index5].ranParameterID = 0;
+                    ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index3].ranPolicy.ranParameterItem[index5].ranParameterValue.valueIntPresent = true;
+                    ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index3].ranPolicy.ranParameterItem[index5].ranParameterValue.valueInt = 2;
                     index5++;
                 }
                 index3++;
             }
         }
+        else if (ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1Present) {
+            // NRT Format 1
+            if (allocActionDefinitionNRTFormat1(&dynMemHead,&ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1) != e2err_OK)
+                return false;
+
+            ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterCount = 1;
+
+            uint64_t index2 = 0;
+            while (index2 < ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterCount) {
+                ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterID = 0;
+                ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueIntPresent = true;
+                ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueInt = 2;
+                index2++;
+            }
+        }
         // ricSubsequentActionPresent, OPTIONAL
         ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricSubsequentActionPresent = true;
         ricSubscriptionRequest.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricSubsequentAction.ricSubsequentActionType = RICSubsequentActionType_Continue;
@@ -475,17 +492,29 @@
     printf("pRICSubscriptionRequest->ricRequestID.ricRequestorID = %u\n", pRICSubscriptionRequest->ricRequestID.ricRequestorID);
     printf("pRICSubscriptionRequest->ricRequestID.ricInstanceID = %u\n", pRICSubscriptionRequest->ricRequestID.ricInstanceID);
     printf("pRICSubscriptionRequest->ranFunctionID = %u\n",pRICSubscriptionRequest->ranFunctionID);
+    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.E2SMgNBX2EventTriggerDefinitionPresent = %i\n",
+        pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.E2SMgNBX2EventTriggerDefinitionPresent);
+    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.E2SMgNBNRTEventTriggerDefinitionPresent = %i\n",
+        pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.E2SMgNBNRTEventTriggerDefinitionPresent);
+    if (pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.E2SMgNBX2EventTriggerDefinitionPresent) {
+        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeIDbits = %u\n",
+             (unsigned)pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.bits);
+        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.nodeID = %u\n",
+            (unsigned)pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.nodeID);
+        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.e2SMgNBX2eventTriggerDefinition.interfaceDirection = %u\n",
+             (unsigned)pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.e2SMgNBX2eventTriggerDefinition.interfaceDirection);
+        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.e2SMgNBX2eventTriggerDefinition.interfaceMessageType.procedureCode = %u\n",
+             (unsigned)pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.e2SMgNBX2eventTriggerDefinition.interfaceMessageType.procedureCode);
+        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.e2SMgNBX2eventTriggerDefinition.interfaceMessageType.typeOfMessage = %u\n",
+             (unsigned)pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.e2SMgNBX2eventTriggerDefinition.interfaceMessageType.typeOfMessage);
+    }
+    else if (pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.E2SMgNBNRTEventTriggerDefinitionPresent) {
+        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.e2SMgNBNRTEventTriggerDefinition.eventDefinitionFormat1.triggerNature = %i\n",
+            pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.e2SMgNBNRTEventTriggerDefinition.eventDefinitionFormat1.triggerNature);
+    }
+    else
+        printf("Error. Empty pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition");
 
-    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeIDbits = %u\n",
-         (unsigned)pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.bits);
-    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.nodeID = %u\n",
-        (unsigned)pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.e2SMgNBX2eventTriggerDefinition.interfaceID.globalENBID.nodeID.nodeID);
-    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.e2SMgNBX2eventTriggerDefinition.interfaceDirection = %u\n",
-         (unsigned)pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.e2SMgNBX2eventTriggerDefinition.interfaceDirection);
-    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.e2SMgNBX2eventTriggerDefinition.interfaceMessageType.procedureCode = %u\n",
-         (unsigned)pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.e2SMgNBX2eventTriggerDefinition.interfaceMessageType.procedureCode);
-    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.e2SMgNBX2eventTriggerDefinition.interfaceMessageType.typeOfMessage = %u\n",
-         (unsigned)pRICSubscriptionRequest->ricSubscriptionDetails.ricEventTriggerDefinition.e2SMgNBX2eventTriggerDefinition.interfaceMessageType.typeOfMessage);
     printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.contentLength = %u\n",
          (unsigned)pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.contentLength);
 
@@ -493,204 +522,203 @@
     while (index < pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.contentLength) {
         printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionID = %li\n",
              pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionID);
-        printf("pRICSubscriptionRequest->ricSubscription.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionType = %li\n",
+        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionType = %li\n",
              pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionType);
         printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionPresent = %i\n",
              pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionPresent);
         if(pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionPresent)
         {
-
-            if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1Present) {
+            if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1Present) {
 
                 // Format 1
-                printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1Present = %i\n",
-                    pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1Present);
-                printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->styleID = %li\n",
-                    pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->styleID);
-                printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterCount = %i\n",
-                    pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterCount);
-                printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index]ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem->parameterID = %i\n",
-                     pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem->parameterID);
+                printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1Present = %i\n",
+                    pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1Present);
+                printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->styleID = %li\n",
+                    pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->styleID);
+                printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterCount = %i\n",
+                    pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterCount);
+                printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index]ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem->parameterID = %i\n",
+                     pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem->parameterID);
 
                 uint64_t index2 = 0;
-                while (index2 < pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterCount) {
-                    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueIntPresent = %i\n",
-                      pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueIntPresent);
-                    if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueIntPresent) {
-                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueInt = %li\n",
-                          pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueInt);
+                while (index2 < pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterCount) {
+                    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueIntPresent = %i\n",
+                      pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueIntPresent);
+                    if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueIntPresent) {
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueInt = %li\n",
+                          pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueInt);
                     }
-                    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueEnumPresent = %i\n",
-                      pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueEnumPresent);
-                    if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueEnumPresent) {
-                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueEnum = %li\n",
-                          pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueEnum);
+                    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueEnumPresent = %i\n",
+                      pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueEnumPresent);
+                    if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueEnumPresent) {
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueEnum = %li\n",
+                          pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueEnum);
                     }
-                    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueBoolPresent = %i\n",
-                      pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueBoolPresent);
-                    if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueBoolPresent) {
-                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueBool = %i\n",
-                          pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueBool);
+                    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueBoolPresent = %i\n",
+                      pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueBoolPresent);
+                    if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueBoolPresent) {
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueBool = %i\n",
+                          pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueBool);
                     }
-                    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueBitSPresent = %i\n",
-                      pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueBitSPresent);
-                    if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueBitSPresent) {
-                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueBitS.byteLength = %li\n",
-                          pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueBitS.byteLength);
-                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueBitS.data = ");
-                        printDataBuffer(pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueBitS.byteLength,
-                                        pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueBitS.data);
+                    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueBitSPresent = %i\n",
+                      pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueBitSPresent);
+                    if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueBitSPresent) {
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueBitS.byteLength = %li\n",
+                          pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueBitS.byteLength);
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueBitS.data = ");
+                        printDataBuffer(pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueBitS.byteLength,
+                                        pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueBitS.data);
                         printf("\n");
                     }
-                    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueOctSPresent = %i\n",
-                      pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueOctSPresent);
-                    if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueOctSPresent) {
-                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueOctS.length = %li\n",
-                          pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueOctS.length);
-                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueOctS.data = ");
-                          printDataBuffer(pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueOctS.length,
-                                          pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueOctS.data);
+                    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueOctSPresent = %i\n",
+                      pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueOctSPresent);
+                    if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueOctSPresent) {
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueOctS.length = %li\n",
+                          pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueOctS.length);
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueOctS.data = ");
+                          printDataBuffer(pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueOctS.length,
+                                          pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueOctS.data);
                         printf("\n");
                     }
-                    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valuePrtSPresent = %i\n",
-                      pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valuePrtSPresent);
-                    if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valuePrtSPresent) {
-                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueOctS.length = %li\n",
-                          pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valueOctS.length);
-                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valuePrtS.data = ");
-                        printDataBuffer(pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valuePrtS.length,
-                                        pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1->actionParameterItem[index2].actionParameterValue.valuePrtS.data);
+                    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valuePrtSPresent = %i\n",
+                      pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valuePrtSPresent);
+                    if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valuePrtSPresent) {
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueOctS.length = %li\n",
+                          pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valueOctS.length);
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valuePrtS.data = ");
+                        printDataBuffer(pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valuePrtS.length,
+                                        pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1->actionParameterItem[index2].actionParameterValue.valuePrtS.data);
                         printf("\n");
                     }
                     index2++;
                 }
             }
-            else if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2Present) {
-                printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2Present = %i\n",
-                  pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2Present);
+            else if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2Present) {
+                printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2Present = %i\n",
+                  pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2Present);
 
                 // Format 2
-                printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupCount = %i\n",
-                    pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupCount);
+                printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupCount = %i\n",
+                    pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupCount);
 
                 uint64_t index2 = 0;
-                while (index2 < pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupCount) {
-                    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupID = %li\n",
-                        pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupID);
-                    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefCount = %i\n",
-                        pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefCount);
+                while (index2 < pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupCount) {
+                    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupID = %li\n",
+                        pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupID);
+                    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefCount = %i\n",
+                        pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefCount);
 
                     uint64_t index3 = 0;
-                    while (index3 < pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefCount) {
+                    while (index3 < pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefCount) {
 
-                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterID = %i\n",
-                            pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterID);
-                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterTest = %i\n",
-                            pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterTest);
-                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueIntPresent = %i\n",
-                            pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueIntPresent);
-                        if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueIntPresent) {
-                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueInt = %li\n",
-                                pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueInt);
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterID = %i\n",
+                            pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterID);
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterTest = %i\n",
+                            pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterTest);
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueIntPresent = %i\n",
+                            pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueIntPresent);
+                        if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueIntPresent) {
+                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueInt = %li\n",
+                                pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueInt);
                         }
-                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueEnumPresent = %i\n",
-                               pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueEnumPresent);
-                        if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueEnumPresent) {
-                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueEnum = %li\n",
-                                pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueEnum);
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueEnumPresent = %i\n",
+                               pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueEnumPresent);
+                        if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueEnumPresent) {
+                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueEnum = %li\n",
+                                pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueEnum);
                         }
-                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueBoolPresent = %i\n",
-                               pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueBoolPresent);
-                        if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueBoolPresent) {
-                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueBool = %i\n",
-                                pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueBool);
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueBoolPresent = %i\n",
+                               pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueBoolPresent);
+                        if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueBoolPresent) {
+                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueBool = %i\n",
+                                pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueBool);
                         }
-                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueBitSPresent = %i\n",
-                            pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueBitSPresent);
-                        if ( pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueBitSPresent) {
-                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue,valueBitS.byteLength = %li\n",
-                                   pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueBitS.byteLength);
-                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueBitS.data = ");
-                            printDataBuffer(pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueBitS.byteLength,
-                                            pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueBitS.data);
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueBitSPresent = %i\n",
+                            pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueBitSPresent);
+                        if ( pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueBitSPresent) {
+                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue,valueBitS.byteLength = %li\n",
+                                   pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueBitS.byteLength);
+                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueBitS.data = ");
+                            printDataBuffer(pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueBitS.byteLength,
+                                            pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueBitS.data);
                             printf("\n");
                         }
-                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueOctSPresent = %i\n",
-                            pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueOctSPresent);
-                        if(pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueOctSPresent) {
-                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue,valueOctS.length = %li\n",
-                                   pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueOctS.length);
-                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueOctS.data = ");
-                            printDataBuffer(pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueOctS.length,
-                                            pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueOctS.data);
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueOctSPresent = %i\n",
+                            pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueOctSPresent);
+                        if(pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueOctSPresent) {
+                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue,valueOctS.length = %li\n",
+                                   pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueOctS.length);
+                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueOctS.data = ");
+                            printDataBuffer(pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueOctS.length,
+                                            pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valueOctS.data);
                             printf("\n");
                         }
-                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valuePrtSPresent = %i\n",
-                            pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valuePrtSPresent);
-                        if(pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valuePrtSPresent) {
-                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue,valuePrtS.length = %li\n",
-                                   pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valuePrtS.length);
-                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valuePrtS.data = ");
-                            printDataBuffer(pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valuePrtS.length,
-                                            pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valuePrtS.data);
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valuePrtSPresent = %i\n",
+                            pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valuePrtSPresent);
+                        if(pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valuePrtSPresent) {
+                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue,valuePrtS.length = %li\n",
+                                   pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valuePrtS.length);
+                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valuePrtS.data = ");
+                            printDataBuffer(pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valuePrtS.length,
+                                            pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranUEgroupDefinition.ranUeGroupDefItem[index3].ranParameterValue.valuePrtS.data);
                             printf("\n");
                         }
                         index3++;
                     }
 
-                    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterCount %i\n",
-                      pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterCount);
+                    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterCount %i\n",
+                      pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterCount);
 
                     index3 = 0;
-                    while (index3 < pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterCount) {
-                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterID = %i\n",
-                            pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterID);
-                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueIntPresent = %i\n",
-                               pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueIntPresent);
-                        if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueIntPresent) {
-                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueInt = %li\n",
-                                   pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueInt);
+                    while (index3 < pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterCount) {
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterID = %i\n",
+                            pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterID);
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueIntPresent = %i\n",
+                               pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueIntPresent);
+                        if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueIntPresent) {
+                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueInt = %li\n",
+                                   pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueInt);
                         }
-                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueEnumPresent = %i\n",
-                               pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueEnumPresent);
-                        if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueEnumPresent) {
-                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueEnum = %li\n",
-                                   pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueEnum);
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueEnumPresent = %i\n",
+                               pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueEnumPresent);
+                        if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueEnumPresent) {
+                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueEnum = %li\n",
+                                   pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueEnum);
                         }
-                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBoolPresent = %i\n",
-                               pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBoolPresent);
-                        if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBoolPresent) {
-                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBool = %i\n",
-                                   pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBool);
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBoolPresent = %i\n",
+                               pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBoolPresent);
+                        if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBoolPresent) {
+                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBool = %i\n",
+                                   pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBool);
                         }
-                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitSPresent = %i\n",
-                               pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitSPresent);
-                        if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitSPresent) {
-                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitS.byteLength, = %li\n",
-                                   pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitS.byteLength);
-                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitS.data = ");
-                            printDataBuffer(pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitS.byteLength,
-                                            pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitS.data);
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitSPresent = %i\n",
+                               pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitSPresent);
+                        if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitSPresent) {
+                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitS.byteLength, = %li\n",
+                                   pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitS.byteLength);
+                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitS.data = ");
+                            printDataBuffer(pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitS.byteLength,
+                                            pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueBitS.data);
                             printf("\n");
                         }
-                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctSPresent = %i\n",
-                               pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctSPresent);
-                        if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctSPresent) {
-                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS.length = %li\n",
-                                   pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS.length);
-                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS.data = ");
-                            printDataBuffer(pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS.length,
-                                            pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS.data);
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctSPresent = %i\n",
+                               pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctSPresent);
+                        if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctSPresent) {
+                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS.length = %li\n",
+                                   pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS.length);
+                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS.data = ");
+                            printDataBuffer(pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS.length,
+                                            pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valueOctS.data);
                             printf("\n");
                         }
-                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtSPresent = %i\n",
-                               pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtSPresent);
-                        if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtSPresent) {
-                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtS.length = %li\n",
-                                   pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtS.length);
-                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtS.data = ");
-                            printDataBuffer(pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtS.length,
-                                            pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtS.data);
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtSPresent = %i\n",
+                               pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtSPresent);
+                        if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtSPresent) {
+                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtS.length = %li\n",
+                                   pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtS.length);
+                            printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtS.data = ");
+                            printDataBuffer(pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtS.length,
+                                            pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2->ranUeGroupItem[index2].ranPolicy.ranParameterItem[index3].ranParameterValue.valuePrtS.data);
                             printf("\n");
                         }
                         index3++;
@@ -698,7 +726,72 @@
                     index2++;
                 }
             }
+            else if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1Present) {
+
+                // Format 1
+                printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1Present = %i\n",
+                  pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1Present);
+
+                uint64_t index2 = 0;
+                while (index2 < pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterCount) {
+                    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterID = %i\n",
+                        pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterID);
+
+                    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueIntPresent = %i\n",
+                           pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueIntPresent);
+                    if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueIntPresent) {
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueInt = %li\n",
+                               pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueInt);
+                    }
+                    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueEnumPresent = %i\n",
+                           pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueEnumPresent);
+                    if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueEnumPresent) {
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueEnum = %li\n",
+                               pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueEnum);
+                    }
+                    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueBoolPresent = %i\n",
+                           pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueBoolPresent);
+                    if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueBoolPresent) {
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueBool = %i\n",
+                               pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueBool);
+                    }
+                    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2]ranParameterValue.valueBitSPresent = %i\n",
+                           pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueBitSPresent);
+                    if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueBitSPresent) {
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueBitS.byteLength, = %li\n",
+                               pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueBitS.byteLength);
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueBitS.data = ");
+                        printDataBuffer(pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueBitS.byteLength,
+                                        pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueBitS.data);
+                        printf("\n");
+                    }
+                    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueOctSPresent = %i\n",
+                           pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueOctSPresent);
+                    if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueOctSPresent) {
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueOctS.length = %li\n",
+                               pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueOctS.length);
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueOctS.data = ");
+                        printDataBuffer(pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueOctS.length,
+                                        pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valueOctS.data);
+                        printf("\n");
+                    }
+                    printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2]ranParameterValue.valuePrtSPresent = %i\n",
+                           pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valuePrtSPresent);
+                    if (pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valuePrtSPresent) {
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valuePrtS.length = %li\n",
+                               pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valuePrtS.length);
+                        printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valuePrtS.data = ");
+                        printDataBuffer(pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valuePrtS.length,
+                                        pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1->ranParameterList[index2].ranParameterValue.valuePrtS.data);
+                        printf("\n");
+                    }
+                    index2++;
+                }
+            }
+            else
+                printf("Error. Missing pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice");
         }
+
         printf("pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricSubsequentActionPresent = %i\n",
           pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricSubsequentActionPresent);
         if(pRICSubscriptionRequest->ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricSubsequentActionPresent)
diff --git a/e2ap/pkg/e2ap/e2ap_tests/msg.go b/e2ap/pkg/e2ap/e2ap_tests/msg.go
index 45a997a..f342321 100644
--- a/e2ap/pkg/e2ap/e2ap_tests/msg.go
+++ b/e2ap/pkg/e2ap/e2ap_tests/msg.go
@@ -100,12 +100,47 @@
 //-----------------------------------------------------------------------------
 
 func RunTests(t *testing.T, e2aptestctxt *E2ApTests) {
-	t.Run(e2aptestctxt.Name(), func(t *testing.T) { e2aptestctxt.E2ApTestMsgSubscriptionRequest(t) })
+
+	subMsgContent := &SubscriptionTestMsgContent{}
+	subMsgContent.NBNRTEventTriggerDefinitionPresent = true
+	subMsgContent.ActionDefinitionNRTFormat1Present = true
+	subMsgContent.RANParameterValueEnumPresent = true
+	t.Run(e2aptestctxt.Name(), func(t *testing.T) { e2aptestctxt.E2ApTestMsgSubscriptionRequest(t, subMsgContent) })
+
+	subMsgContent2 := &SubscriptionTestMsgContent{}
+	subMsgContent2.NBX2EventTriggerDefinitionPresent = true
+	subMsgContent2.ActionDefinitionX2Format1Present = true
+	subMsgContent2.ActionParameterValueBoolPresent = true
+	subMsgContent2.RANParameterValueBoolPresent = true
+	t.Run(e2aptestctxt.Name(), func(t *testing.T) { e2aptestctxt.E2ApTestMsgSubscriptionRequest(t, subMsgContent2) })
+
+	subMsgContent3 := &SubscriptionTestMsgContent{}
+	subMsgContent3.NBX2EventTriggerDefinitionPresent = true
+	subMsgContent3.ActionDefinitionX2Format2Present = true
+	subMsgContent3.ActionParameterValueBitSPresent = true
+	subMsgContent3.RANParameterValueBitSPresent = true
+	t.Run(e2aptestctxt.Name(), func(t *testing.T) { e2aptestctxt.E2ApTestMsgSubscriptionRequest(t, subMsgContent3) })
+
+	subMsgContent4 := &SubscriptionTestMsgContent{}
+	subMsgContent4.NBX2EventTriggerDefinitionPresent = true
+	subMsgContent4.ActionDefinitionX2Format2Present = true
+	subMsgContent4.ActionParameterValueOctSPresent = true
+	subMsgContent4.RANParameterValueOctSPresent = true
+	t.Run(e2aptestctxt.Name(), func(t *testing.T) { e2aptestctxt.E2ApTestMsgSubscriptionRequest(t, subMsgContent4) })
+
+	subMsgContent5 := &SubscriptionTestMsgContent{}
+	subMsgContent5.NBX2EventTriggerDefinitionPresent = true
+	subMsgContent5.ActionDefinitionX2Format2Present = true
+	subMsgContent5.ActionParameterValuePrtSPresent = true
+	subMsgContent5.RANParameterValuePrtSPresent = true
+	t.Run(e2aptestctxt.Name(), func(t *testing.T) { e2aptestctxt.E2ApTestMsgSubscriptionRequest(t, subMsgContent5) })
+
 	t.Run(e2aptestctxt.Name(), func(t *testing.T) { e2aptestctxt.E2ApTestMsgSubscriptionResponse(t) })
 	t.Run(e2aptestctxt.Name(), func(t *testing.T) { e2aptestctxt.E2ApTestMsgSubscriptionFailure(t) })
 	t.Run(e2aptestctxt.Name(), func(t *testing.T) { e2aptestctxt.E2ApTestMsgSubscriptionDeleteRequest(t) })
 	t.Run(e2aptestctxt.Name(), func(t *testing.T) { e2aptestctxt.E2ApTestMsgSubscriptionDeleteResponse(t) })
 	t.Run(e2aptestctxt.Name(), func(t *testing.T) { e2aptestctxt.E2ApTestMsgSubscriptionDeleteFailure(t) })
+
 	/*
 		t.Run(e2aptestctxt.Name(), func(t *testing.T) { e2aptestctxt.E2ApTestMsgSubscriptionRequestBuffers(t) })
 		t.Run(e2aptestctxt.Name(), func(t *testing.T) { e2aptestctxt.E2ApTestMsgSubscriptionResponseBuffers(t) })
@@ -114,4 +149,5 @@
 		t.Run(e2aptestctxt.Name(), func(t *testing.T) { e2aptestctxt.E2ApTestMsgSubscriptionDeleteResponseBuffers(t) })
 		t.Run(e2aptestctxt.Name(), func(t *testing.T) { e2aptestctxt.E2ApTestMsgSubscriptionDeleteFailureBuffers(t) })
 	*/
+
 }
diff --git a/e2ap/pkg/e2ap/e2ap_tests/msg_e2ap_subscription.go b/e2ap/pkg/e2ap/e2ap_tests/msg_e2ap_subscription.go
index 8f2e835..6d1a1b4 100644
--- a/e2ap/pkg/e2ap/e2ap_tests/msg_e2ap_subscription.go
+++ b/e2ap/pkg/e2ap/e2ap_tests/msg_e2ap_subscription.go
@@ -53,102 +53,213 @@
 	testCtxt.testValueEquality(t, "msg", areqenc, areqdec)
 	testCtxt.testValueEquality(t, "EventTriggerDefinition", &areqenc.EventTriggerDefinition, &areqdec.EventTriggerDefinition)
 }
-
-func (testCtxt *E2ApTests) E2ApTestMsgSubscriptionRequest(t *testing.T) {
+func (testCtxt *E2ApTests) E2ApTestMsgSubscriptionRequest(t *testing.T, msgContent *SubscriptionTestMsgContent) {
 
 	areqenc := e2ap.E2APSubscriptionRequest{}
 	areqenc.RequestId.Id = 1
 	areqenc.RequestId.InstanceId = 22
 	areqenc.FunctionId = 33
-	//Bits 20, 28(works), 18, 21 (asn1 problems)
-	areqenc.EventTriggerDefinition.InterfaceDirection = e2ap.E2AP_InterfaceDirectionIncoming
-	areqenc.EventTriggerDefinition.ProcedureCode = 35
-	areqenc.EventTriggerDefinition.TypeOfMessage = e2ap.E2AP_InitiatingMessage
+
+	areqenc.EventTriggerDefinition.NBX2EventTriggerDefinitionPresent = msgContent.NBX2EventTriggerDefinitionPresent
+	areqenc.EventTriggerDefinition.NBNRTEventTriggerDefinitionPresent = msgContent.NBNRTEventTriggerDefinitionPresent
+
+	if areqenc.EventTriggerDefinition.NBX2EventTriggerDefinitionPresent {
+		//Bits 20, 28(works), 18, 21 (asn1 problems)
+		//		if msgContent.
+		areqenc.EventTriggerDefinition.X2EventTriggerDefinition.InterfaceId.GlobalEnbId.Present = true
+		areqenc.EventTriggerDefinition.X2EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.StringPut("310150")
+		areqenc.EventTriggerDefinition.X2EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Bits = e2ap.E2AP_ENBIDHomeBits28
+		areqenc.EventTriggerDefinition.X2EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Id = 202251
+		testCtxt.SetDesc("SubsReq-28bit")
+
+		//areqenc.EventTriggerDefinition.X2EventTriggerDefinition.InterfaceId.GlobalEnbId.Present = true
+		//areqenc.EventTriggerDefinition.X2EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.StringPut("310150")
+		//areqenc.EventTriggerDefinition.X2EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Bits = e2ap.E2AP_ENBIDShortMacroits18
+		//areqenc.EventTriggerDefinition.X2EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Id = 55
+		//testCtxt.SetDesc("SubsReq-18bit")
+
+		//areqenc.EventTriggerDefinition.X2EventTriggerDefinition.InterfaceId.GlobalEnbId.Present = true
+		//areqenc.EventTriggerDefinition.X2EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.StringPut("310150")
+		//areqenc.EventTriggerDefinition.X2EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Bits = e2ap.E2AP_ENBIDMacroPBits20
+		//areqenc.EventTriggerDefinition.X2EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Id = 55
+		//testCtxt.SetDesc("SubsReq-20bit")
+
+		//areqenc.EventTriggerDefinition.X2EventTriggerDefinition.InterfaceId.GlobalEnbId.Present = true
+		//areqenc.EventTriggerDefinition.X2EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.StringPut("310150")
+		//areqenc.EventTriggerDefinition.X2EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Bits = e2ap.E2AP_ENBIDlongMacroBits21
+		//areqenc.EventTriggerDefinition.X2EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Id = 55
+		//testCtxt.SetDesc("SubsReq-21bit")
+
+		areqenc.EventTriggerDefinition.X2EventTriggerDefinition.InterfaceDirection = e2ap.E2AP_InterfaceDirectionIncoming
+		areqenc.EventTriggerDefinition.X2EventTriggerDefinition.ProcedureCode = 35
+		areqenc.EventTriggerDefinition.X2EventTriggerDefinition.TypeOfMessage = e2ap.E2AP_InitiatingMessage
+	} else if areqenc.EventTriggerDefinition.NBNRTEventTriggerDefinitionPresent == true {
+		areqenc.EventTriggerDefinition.NBNRTEventTriggerDefinition.TriggerNature = e2ap.NRTTriggerNature_now
+	}
+
 	for index := 0; index < 1; /*16*/ index++ {
 		item := e2ap.ActionToBeSetupItem{}
 		item.ActionId = uint64(index)
 		item.ActionType = e2ap.E2AP_ActionTypeInsert
 
 		item.RicActionDefinitionPresent = true
-		item.ActionDefinitionChoice.ActionDefinitionFormat1Present = true
-		item.ActionDefinitionChoice.ActionDefinitionFormat2Present = false
+		item.ActionDefinitionChoice.ActionDefinitionX2Format1Present = msgContent.ActionDefinitionX2Format1Present
+		item.ActionDefinitionChoice.ActionDefinitionX2Format2Present = msgContent.ActionDefinitionX2Format2Present
+		item.ActionDefinitionChoice.ActionDefinitionNRTFormat1Present = msgContent.ActionDefinitionNRTFormat1Present
 
-		if item.RicActionDefinitionPresent == true &&
-			item.ActionDefinitionChoice.ActionDefinitionFormat1Present == true {
-			item.ActionDefinitionChoice.ActionDefinitionFormat1.StyleID = 99
-			// 1..255
-			for index2 := 0; index2 < 1; index2++ {
-				actionParameterItem := e2ap.ActionParameterItem{}
-				actionParameterItem.ParameterID = 11
-				actionParameterItem.ActionParameterValue.ValueIntPresent = true
-				actionParameterItem.ActionParameterValue.ValueInt = 100
-				item.ActionDefinitionChoice.ActionDefinitionFormat1.ActionParameterItems =
-					append(item.ActionDefinitionChoice.ActionDefinitionFormat1.ActionParameterItems, actionParameterItem)
-			}
-		} else if item.RicActionDefinitionPresent == true &&
-			item.ActionDefinitionChoice.ActionDefinitionFormat2Present == true {
-			// 1..15
-			for index2 := 0; index2 < 1; index2++ {
-				ranUEgroupItem := e2ap.RANueGroupItem{}
+		if item.RicActionDefinitionPresent {
+			if item.ActionDefinitionChoice.ActionDefinitionX2Format1Present {
+				item.ActionDefinitionChoice.ActionDefinitionX2Format1.StyleID = 99
 				// 1..255
-				for index3 := 0; index3 < 1; index3++ {
-					ranUEGroupDefItem := e2ap.RANueGroupDefItem{}
-					ranUEGroupDefItem.RanParameterID = 22
-					ranUEGroupDefItem.RanParameterTest = e2ap.RANParameterTest_equal
-					ranUEGroupDefItem.RanParameterValue.ValueIntPresent = true
-					ranUEGroupDefItem.RanParameterValue.ValueInt = 100
-					ranUEgroupItem.RanUEgroupDefinition.RanUEGroupDefItems =
-						append(ranUEgroupItem.RanUEgroupDefinition.RanUEGroupDefItems, ranUEGroupDefItem)
+				for index2 := 0; index2 < 1; index2++ {
+					actionParameterItem := e2ap.ActionParameterItem{}
+					actionParameterItem.ParameterID = 11
+					if msgContent.ActionParameterValueIntPresent {
+						actionParameterItem.ActionParameterValue.ValueIntPresent = true
+						actionParameterItem.ActionParameterValue.ValueInt = 100
+					} else if msgContent.ActionParameterValueEnumPresent {
+						actionParameterItem.ActionParameterValue.ValueEnumPresent = true
+						actionParameterItem.ActionParameterValue.ValueEnum = 100
+					} else if msgContent.ActionParameterValueBoolPresent {
+						actionParameterItem.ActionParameterValue.ValueBoolPresent = true
+						actionParameterItem.ActionParameterValue.ValueBool = true
+					} else if msgContent.ActionParameterValueBitSPresent {
+						actionParameterItem.ActionParameterValue.ValueBitSPresent = true
+						actionParameterItem.ActionParameterValue.ValueBitS.UnusedBits = 0
+						actionParameterItem.ActionParameterValue.ValueBitS.Length = 3
+						actionParameterItem.ActionParameterValue.ValueBitS.Data =
+							append(actionParameterItem.ActionParameterValue.ValueBitS.Data, 1, 2, 3)
+					} else if msgContent.ActionParameterValueOctSPresent {
+						actionParameterItem.ActionParameterValue.ValueOctSPresent = true
+						actionParameterItem.ActionParameterValue.ValueOctS.Length = 3
+						actionParameterItem.ActionParameterValue.ValueOctS.Data =
+							append(actionParameterItem.ActionParameterValue.ValueOctS.Data, 1, 2, 3)
+					} else if msgContent.ActionParameterValuePrtSPresent {
+						actionParameterItem.ActionParameterValue.ValuePrtSPresent = true
+						actionParameterItem.ActionParameterValue.ValuePrtS.Length = 3
+						actionParameterItem.ActionParameterValue.ValuePrtS.Data =
+							append(actionParameterItem.ActionParameterValue.ValuePrtS.Data, 1, 2, 3)
+					}
+					item.ActionDefinitionChoice.ActionDefinitionX2Format1.ActionParameterItems =
+						append(item.ActionDefinitionChoice.ActionDefinitionX2Format1.ActionParameterItems, actionParameterItem)
 				}
+			} else if item.ActionDefinitionChoice.ActionDefinitionX2Format2Present {
+				// 1..15
+				for index2 := 0; index2 < 1; index2++ {
+					ranUEgroupItem := e2ap.RANueGroupItem{}
+					// 1..255
+					for index3 := 0; index3 < 1; index3++ {
+						ranUEGroupDefItem := e2ap.RANueGroupDefItem{}
+						ranUEGroupDefItem.RanParameterID = 22
+						ranUEGroupDefItem.RanParameterTest = e2ap.RANParameterTest_equal
+						if msgContent.RANParameterValueIntPresent {
+							ranUEGroupDefItem.RanParameterValue.ValueIntPresent = true
+							ranUEGroupDefItem.RanParameterValue.ValueInt = 100
+						} else if msgContent.RANParameterValueEnumPresent {
+							ranUEGroupDefItem.RanParameterValue.ValueEnumPresent = true
+							ranUEGroupDefItem.RanParameterValue.ValueEnum = 100
+						} else if msgContent.RANParameterValueBoolPresent {
+							ranUEGroupDefItem.RanParameterValue.ValueBoolPresent = true
+							ranUEGroupDefItem.RanParameterValue.ValueBool = true
+						} else if msgContent.RANParameterValueBitSPresent {
+							ranUEGroupDefItem.RanParameterValue.ValueBitSPresent = true
+							ranUEGroupDefItem.RanParameterValue.ValueBitS.UnusedBits = 0
+							ranUEGroupDefItem.RanParameterValue.ValueBitS.Length = 3
+							ranUEGroupDefItem.RanParameterValue.ValueBitS.Data =
+								append(ranUEGroupDefItem.RanParameterValue.ValueBitS.Data, 1, 2, 3)
+						} else if msgContent.RANParameterValueOctSPresent {
+							ranUEGroupDefItem.RanParameterValue.ValueOctSPresent = true
+							ranUEGroupDefItem.RanParameterValue.ValueOctS.Length = 3
+							ranUEGroupDefItem.RanParameterValue.ValueOctS.Data =
+								append(ranUEGroupDefItem.RanParameterValue.ValueOctS.Data, 1, 2, 3)
+						} else if msgContent.RANParameterValuePrtSPresent {
+							ranUEGroupDefItem.RanParameterValue.ValuePrtSPresent = true
+							ranUEGroupDefItem.RanParameterValue.ValuePrtS.Length = 3
+							ranUEGroupDefItem.RanParameterValue.ValuePrtS.Data =
+								append(ranUEGroupDefItem.RanParameterValue.ValuePrtS.Data, 1, 2, 3)
+						}
+						ranUEgroupItem.RanUEgroupDefinition.RanUEGroupDefItems =
+							append(ranUEgroupItem.RanUEgroupDefinition.RanUEGroupDefItems, ranUEGroupDefItem)
+					}
+					// 1..255
+					for index4 := 0; index4 < 1; index4++ {
+						ranParameterItem := e2ap.RANParameterItem{}
+						ranParameterItem.RanParameterID = 33
+						if msgContent.RANParameterValueIntPresent {
+							ranParameterItem.RanParameterValue.ValueIntPresent = true
+							ranParameterItem.RanParameterValue.ValueInt = 100
+						} else if msgContent.RANParameterValueEnumPresent {
+							ranParameterItem.RanParameterValue.ValueEnumPresent = true
+							ranParameterItem.RanParameterValue.ValueEnum = 100
+						} else if msgContent.RANParameterValueBoolPresent {
+							ranParameterItem.RanParameterValue.ValueBoolPresent = true
+							ranParameterItem.RanParameterValue.ValueBool = true
+						} else if msgContent.RANParameterValueBitSPresent {
+							ranParameterItem.RanParameterValue.ValueBitSPresent = true
+							ranParameterItem.RanParameterValue.ValueBitS.UnusedBits = 0
+							ranParameterItem.RanParameterValue.ValueBitS.Length = 3
+							ranParameterItem.RanParameterValue.ValueBitS.Data =
+								append(ranParameterItem.RanParameterValue.ValueBitS.Data, 1, 2, 3)
+						} else if msgContent.RANParameterValueOctSPresent {
+							ranParameterItem.RanParameterValue.ValueOctSPresent = true
+							ranParameterItem.RanParameterValue.ValueOctS.Length = 3
+							ranParameterItem.RanParameterValue.ValueOctS.Data =
+								append(ranParameterItem.RanParameterValue.ValueOctS.Data, 1, 2, 3)
+						} else if msgContent.RANParameterValuePrtSPresent {
+							ranParameterItem.RanParameterValue.ValuePrtSPresent = true
+							ranParameterItem.RanParameterValue.ValuePrtS.Length = 3
+							ranParameterItem.RanParameterValue.ValuePrtS.Data =
+								append(ranParameterItem.RanParameterValue.ValuePrtS.Data, 1, 2, 3)
+						}
+						ranUEgroupItem.RanPolicy.RanParameterItems =
+							append(ranUEgroupItem.RanPolicy.RanParameterItems, ranParameterItem)
+					}
+					ranUEgroupItem.RanUEgroupID = 2
+					item.ActionDefinitionChoice.ActionDefinitionX2Format2.RanUEgroupItems =
+						append(item.ActionDefinitionChoice.ActionDefinitionX2Format2.RanUEgroupItems, ranUEgroupItem)
+				}
+			} else if item.ActionDefinitionChoice.ActionDefinitionNRTFormat1Present {
 				// 1..255
-				for index4 := 0; index4 < 1; index4++ {
+				for index2 := 0; index2 < 1; index2++ {
 					ranParameterItem := e2ap.RANParameterItem{}
 					ranParameterItem.RanParameterID = 33
-					ranParameterItem.RanParameterValue.ValueIntPresent = true
-					ranParameterItem.RanParameterValue.ValueInt = 100
-					ranUEgroupItem.RanPolicy.RanParameterItems =
-						append(ranUEgroupItem.RanPolicy.RanParameterItems, ranParameterItem)
+					if msgContent.RANParameterValueIntPresent {
+						ranParameterItem.RanParameterValue.ValueIntPresent = true
+						ranParameterItem.RanParameterValue.ValueInt = 100
+					} else if msgContent.RANParameterValueEnumPresent {
+						ranParameterItem.RanParameterValue.ValueEnumPresent = true
+						ranParameterItem.RanParameterValue.ValueEnum = 100
+					} else if msgContent.RANParameterValueBoolPresent {
+						ranParameterItem.RanParameterValue.ValueBoolPresent = true
+						ranParameterItem.RanParameterValue.ValueBool = true
+					} else if msgContent.RANParameterValueBitSPresent {
+						ranParameterItem.RanParameterValue.ValueBitSPresent = true
+						ranParameterItem.RanParameterValue.ValueBitS.UnusedBits = 0
+						ranParameterItem.RanParameterValue.ValueBitS.Length = 3
+						ranParameterItem.RanParameterValue.ValueBitS.Data =
+							append(ranParameterItem.RanParameterValue.ValueBitS.Data, 1, 2, 3)
+					} else if msgContent.RANParameterValueOctSPresent {
+						ranParameterItem.RanParameterValue.ValueOctSPresent = true
+						ranParameterItem.RanParameterValue.ValueOctS.Length = 3
+						ranParameterItem.RanParameterValue.ValueOctS.Data =
+							append(ranParameterItem.RanParameterValue.ValueOctS.Data, 1, 2, 3)
+					} else if msgContent.RANParameterValuePrtSPresent {
+						ranParameterItem.RanParameterValue.ValuePrtSPresent = true
+						ranParameterItem.RanParameterValue.ValuePrtS.Length = 3
+						ranParameterItem.RanParameterValue.ValuePrtS.Data =
+							append(ranParameterItem.RanParameterValue.ValuePrtS.Data, 1, 2, 3)
+					}
+					item.ActionDefinitionChoice.ActionDefinitionNRTFormat1.RanParameterList =
+						append(item.ActionDefinitionChoice.ActionDefinitionNRTFormat1.RanParameterList, ranParameterItem)
 				}
-				ranUEgroupItem.RanUEgroupID = 2
-				item.ActionDefinitionChoice.ActionDefinitionFormat2.RanUEgroupItems =
-					append(item.ActionDefinitionChoice.ActionDefinitionFormat2.RanUEgroupItems, ranUEgroupItem)
 			}
 		}
-
 		item.SubsequentAction.Present = true
 		item.SubsequentAction.Type = e2ap.E2AP_SubSeqActionTypeContinue
 		item.SubsequentAction.TimetoWait = e2ap.E2AP_TimeToWaitW100ms
 		areqenc.ActionSetups = append(areqenc.ActionSetups, item)
 	}
-
-	areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.Present = true
-	areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.StringPut("310150")
-	areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Bits = e2ap.E2AP_ENBIDHomeBits28
-	areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Id = 202251
-	testCtxt.SetDesc("SubsReq-28bit")
 	testCtxt.E2ApTestMsgSubscriptionRequestWithData(t, &areqenc)
-
-	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.Present = true
-	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.StringPut("310150")
-	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Bits = e2ap.E2AP_ENBIDShortMacroits18
-	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Id = 55
-	//testCtxt.SetDesc("SubsReq-18bit")
-	//testCtxt.E2ApTestMsgSubscriptionRequestWithData(t,&areqenc)
-
-	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.Present = true
-	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.StringPut("310150")
-	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Bits = e2ap.E2AP_ENBIDMacroPBits20
-	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Id = 55
-	//testCtxt.SetDesc("SubsReq-20bit")
-	//testCtxt.E2ApTestMsgSubscriptionRequestWithData(t,&areqenc)
-
-	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.Present = true
-	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.StringPut("310150")
-	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Bits = e2ap.E2AP_ENBIDlongMacroBits21
-	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Id = 55
-	//testCtxt.SetDesc("SubsReq-21bit")
-	//testCtxt.E2ApTestMsgSubscriptionRequestWithData(t,&areqenc)
-
 }
 
 func (testCtxt *E2ApTests) E2ApTestMsgSubscriptionResponse(t *testing.T) {
diff --git a/e2ap/pkg/e2ap/e2ap_tests/msg_e2ap_types.go b/e2ap/pkg/e2ap/e2ap_tests/msg_e2ap_types.go
new file mode 100644
index 0000000..3101b3c
--- /dev/null
+++ b/e2ap/pkg/e2ap/e2ap_tests/msg_e2ap_types.go
@@ -0,0 +1,43 @@
+/*
+==================================================================================
+Copyright (c) 2019 AT&T Intellectual Property.
+Copyright (c) 2019 Nokia
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+	 http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+==================================================================================
+*/
+
+package e2ap_tests
+
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+type SubscriptionTestMsgContent struct {
+	NBX2EventTriggerDefinitionPresent  bool
+	NBNRTEventTriggerDefinitionPresent bool
+	ActionDefinitionX2Format1Present   bool
+	ActionDefinitionX2Format2Present   bool
+	ActionDefinitionNRTFormat1Present  bool
+	ActionParameterValueIntPresent     bool
+	ActionParameterValueEnumPresent    bool
+	ActionParameterValueBoolPresent    bool
+	ActionParameterValueBitSPresent    bool
+	ActionParameterValueOctSPresent    bool
+	ActionParameterValuePrtSPresent    bool
+	RANParameterValueIntPresent        bool
+	RANParameterValueEnumPresent       bool
+	RANParameterValueBoolPresent       bool
+	RANParameterValueBitSPresent       bool
+	RANParameterValueOctSPresent       bool
+	RANParameterValuePrtSPresent       bool
+}
diff --git a/e2ap/pkg/e2ap/msg_e2ap.go b/e2ap/pkg/e2ap/msg_e2ap.go
index 61ba1e9..fa99778 100644
--- a/e2ap/pkg/e2ap/msg_e2ap.go
+++ b/e2ap/pkg/e2ap/msg_e2ap.go
@@ -246,12 +246,34 @@
 //
 //-----------------------------------------------------------------------------
 type EventTriggerDefinition struct {
+	NBX2EventTriggerDefinitionPresent bool
+	X2EventTriggerDefinition
+	NBNRTEventTriggerDefinitionPresent bool
+	NBNRTEventTriggerDefinition
+}
+
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+type X2EventTriggerDefinition struct {
 	InterfaceId
 	InterfaceDirection uint32
 	ProcedureCode      uint32
 	TypeOfMessage      uint64
 }
 
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+type NBNRTEventTriggerDefinition struct {
+	TriggerNature uint8
+}
+
+const ( // enum NRTTriggerNature
+	NRTTriggerNature_now = iota
+	NRTTriggerNature_onchange
+)
+
 /*
 //-----------------------------------------------------------------------------
 //
@@ -262,10 +284,19 @@
 */
 
 type ActionDefinitionChoice struct {
-	ActionDefinitionFormat1Present bool
-	ActionDefinitionFormat1        E2SMgNBX2actionDefinition
-	ActionDefinitionFormat2Present bool
-	ActionDefinitionFormat2        ActionDefinitionFormat2
+	ActionDefinitionX2Format1Present  bool
+	ActionDefinitionX2Format1         E2SMgNBX2actionDefinition
+	ActionDefinitionX2Format2Present  bool
+	ActionDefinitionX2Format2         ActionDefinitionFormat2
+	ActionDefinitionNRTFormat1Present bool
+	ActionDefinitionNRTFormat1        E2SMgNBNRTActionDefinitionFormat1
+}
+
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+type E2SMgNBNRTActionDefinitionFormat1 struct {
+	RanParameterList []RANParameterItem // 1..255
 }
 
 //-----------------------------------------------------------------------------
diff --git a/e2ap/pkg/e2ap_wrapper/packer_e2ap.go b/e2ap/pkg/e2ap_wrapper/packer_e2ap.go
index 323a579..43a5f18 100644
--- a/e2ap/pkg/e2ap_wrapper/packer_e2ap.go
+++ b/e2ap/pkg/e2ap_wrapper/packer_e2ap.go
@@ -19,7 +19,7 @@
 
 package e2ap_wrapper
 
-// #cgo LDFLAGS: -le2ap_wrapper -le2ap -lgnbx2 -lstdc++
+// #cgo LDFLAGS: -le2ap_wrapper -le2ap -lgnbx2 -lgnbnrt -lstdc++
 // #include <stdlib.h>
 // #include <c_types.h>
 // #include <E2AP_if.h>
@@ -134,7 +134,7 @@
 	e2Item.entry.ricActionType = (C.uint64_t)(id.ActionType)
 	if id.RicActionDefinitionPresent {
 		e2Item.entry.ricActionDefinitionPresent = true
-		if err := (&e2apActionDefinitionChoice{entry: &e2Item.entry.ricActionDefinitionChoice}).set(dynMemHead, &id.ActionDefinitionChoice); err != nil {
+		if err := (&e2apEntryActionDefinitionChoice{entry: &e2Item.entry.ricActionDefinitionChoice}).set(dynMemHead, &id.ActionDefinitionChoice); err != nil {
 			return err
 		}
 	}
@@ -152,7 +152,7 @@
 	id.ActionType = (uint64)(e2Item.entry.ricActionType)
 	if e2Item.entry.ricActionDefinitionPresent {
 		id.RicActionDefinitionPresent = true
-		if err := (&e2apActionDefinitionChoice{entry: &e2Item.entry.ricActionDefinitionChoice}).get(&id.ActionDefinitionChoice); err != nil {
+		if err := (&e2apEntryActionDefinitionChoice{entry: &e2Item.entry.ricActionDefinitionChoice}).get(&id.ActionDefinitionChoice); err != nil {
 			return err
 		}
 	}
@@ -167,49 +167,64 @@
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
-type e2apActionDefinitionChoice struct {
+type e2apEntryActionDefinitionChoice struct {
 	entry *C.RICActionDefinitionChoice_t
 }
 
-func (e2Item *e2apActionDefinitionChoice) set(dynMemHead *C.mem_track_hdr_t, id *e2ap.ActionDefinitionChoice) error {
+func (e2Item *e2apEntryActionDefinitionChoice) set(dynMemHead *C.mem_track_hdr_t, id *e2ap.ActionDefinitionChoice) error {
 
-	if id.ActionDefinitionFormat1Present {
-		e2Item.entry.actionDefinitionFormat1Present = true
-		errorNro := C.allocActionDefinitionFormat1(dynMemHead, &e2Item.entry.actionDefinitionFormat1)
+	if id.ActionDefinitionX2Format1Present {
+		e2Item.entry.actionDefinitionX2Format1Present = true
+		errorNro := C.allocActionDefinitionX2Format1(dynMemHead, &e2Item.entry.actionDefinitionX2Format1)
 		if errorNro != C.e2err_OK {
 			return fmt.Errorf("e2err(%s)", C.GoString(C.getE2ErrorString(errorNro)))
 		}
-		if err := (&e2apE2SMgNBX2actionDefinition{entry: e2Item.entry.actionDefinitionFormat1}).set(dynMemHead, &id.ActionDefinitionFormat1); err != nil {
+		if err := (&e2apEntryE2SMgNBX2actionDefinition{entry: e2Item.entry.actionDefinitionX2Format1}).set(dynMemHead, &id.ActionDefinitionX2Format1); err != nil {
 			return err
 		}
 
-	} else if id.ActionDefinitionFormat2Present {
-		e2Item.entry.actionDefinitionFormat2Present = true
-		errorNro := C.allocActionDefinitionFormat2(dynMemHead, &e2Item.entry.actionDefinitionFormat2)
+	} else if id.ActionDefinitionX2Format2Present {
+		e2Item.entry.actionDefinitionX2Format2Present = true
+		errorNro := C.allocActionDefinitionX2Format2(dynMemHead, &e2Item.entry.actionDefinitionX2Format2)
 		if errorNro != C.e2err_OK {
 			return fmt.Errorf("e2err(%s)", C.GoString(C.getE2ErrorString(errorNro)))
 		}
-		if err := (&e2apActionDefinitionFormat2{entry: e2Item.entry.actionDefinitionFormat2}).set(dynMemHead, &id.ActionDefinitionFormat2); err != nil {
+		if err := (&e2apEntryActionDefinitionFormat2{entry: e2Item.entry.actionDefinitionX2Format2}).set(dynMemHead, &id.ActionDefinitionX2Format2); err != nil {
+			return err
+		}
+	} else if id.ActionDefinitionNRTFormat1Present {
+		e2Item.entry.actionDefinitionNRTFormat1Present = true
+		errorNro := C.allocActionDefinitionNRTFormat1(dynMemHead, &e2Item.entry.actionDefinitionNRTFormat1)
+		if errorNro != C.e2err_OK {
+			return fmt.Errorf("e2err(%s)", C.GoString(C.getE2ErrorString(errorNro)))
+		}
+		if err := (&e2apEntryE2SMgNBNRTactionDefinitionFormat1{entry: e2Item.entry.actionDefinitionNRTFormat1}).set(dynMemHead, &id.ActionDefinitionNRTFormat1); err != nil {
 			return err
 		}
 	} else {
-		return fmt.Errorf("Missing mandatory ActionDefinition element")
+		return fmt.Errorf("Set() Missing mandatory ActionDefinition element")
 	}
 	return nil
 }
 
-func (e2Item *e2apActionDefinitionChoice) get(id *e2ap.ActionDefinitionChoice) error {
-	if e2Item.entry.actionDefinitionFormat1Present {
-		id.ActionDefinitionFormat1Present = true
-		if err := (&e2apE2SMgNBX2actionDefinition{entry: e2Item.entry.actionDefinitionFormat1}).get(&id.ActionDefinitionFormat1); err != nil {
+func (e2Item *e2apEntryActionDefinitionChoice) get(id *e2ap.ActionDefinitionChoice) error {
+	if e2Item.entry.actionDefinitionX2Format1Present {
+		id.ActionDefinitionX2Format1Present = true
+		if err := (&e2apEntryE2SMgNBX2actionDefinition{entry: e2Item.entry.actionDefinitionX2Format1}).get(&id.ActionDefinitionX2Format1); err != nil {
 			return err
 		}
-
-	} else if e2Item.entry.actionDefinitionFormat2Present {
-		id.ActionDefinitionFormat2Present = true
-		if err := (&e2apActionDefinitionFormat2{entry: e2Item.entry.actionDefinitionFormat2}).get(&id.ActionDefinitionFormat2); err != nil {
+	} else if e2Item.entry.actionDefinitionX2Format2Present {
+		id.ActionDefinitionX2Format2Present = true
+		if err := (&e2apEntryActionDefinitionFormat2{entry: e2Item.entry.actionDefinitionX2Format2}).get(&id.ActionDefinitionX2Format2); err != nil {
 			return err
 		}
+	} else if e2Item.entry.actionDefinitionNRTFormat1Present {
+		id.ActionDefinitionNRTFormat1Present = true
+		if err := (&e2apEntryE2SMgNBNRTactionDefinitionFormat1{entry: e2Item.entry.actionDefinitionNRTFormat1}).get(&id.ActionDefinitionNRTFormat1); err != nil {
+			return err
+		}
+	} else {
+		return fmt.Errorf("Get() Missing mandatory ActionDefinition element")
 	}
 	return nil
 }
@@ -217,17 +232,17 @@
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
-type e2apE2SMgNBX2actionDefinition struct {
+type e2apEntryE2SMgNBX2actionDefinition struct {
 	entry *C.E2SMgNBX2actionDefinition_t
 }
 
-func (e2Item *e2apE2SMgNBX2actionDefinition) set(dynMemHead *C.mem_track_hdr_t, id *e2ap.E2SMgNBX2actionDefinition) error {
+func (e2Item *e2apEntryE2SMgNBX2actionDefinition) set(dynMemHead *C.mem_track_hdr_t, id *e2ap.E2SMgNBX2actionDefinition) error {
 
 	e2Item.entry.styleID = (C.uint64_t)(id.StyleID)
 	// 1..255
 	e2Item.entry.actionParameterCount = 0
 	for i := 0; i < len(id.ActionParameterItems); i++ {
-		if err := (&e2apActionParameterItem{entry: &e2Item.entry.actionParameterItem[i]}).set(dynMemHead, &id.ActionParameterItems[i]); err != nil {
+		if err := (&e2apEntryActionParameterItem{entry: &e2Item.entry.actionParameterItem[i]}).set(dynMemHead, &id.ActionParameterItems[i]); err != nil {
 			return err
 		}
 		e2Item.entry.actionParameterCount++
@@ -235,7 +250,7 @@
 	return nil
 }
 
-func (e2Item *e2apE2SMgNBX2actionDefinition) get(id *e2ap.E2SMgNBX2actionDefinition) error {
+func (e2Item *e2apEntryE2SMgNBX2actionDefinition) get(id *e2ap.E2SMgNBX2actionDefinition) error {
 
 	id.StyleID = (uint64)(e2Item.entry.styleID)
 
@@ -243,7 +258,7 @@
 	length := (int)(e2Item.entry.actionParameterCount)
 	id.ActionParameterItems = make([]e2ap.ActionParameterItem, length)
 	for i := 0; i < length; i++ {
-		if err := (&e2apActionParameterItem{entry: &e2Item.entry.actionParameterItem[i]}).get(&id.ActionParameterItems[i]); err != nil {
+		if err := (&e2apEntryActionParameterItem{entry: &e2Item.entry.actionParameterItem[i]}).get(&id.ActionParameterItems[i]); err != nil {
 			return err
 		}
 	}
@@ -253,196 +268,15 @@
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
-type e2apActionParameterItem struct {
-	entry *C.ActionParameterItem_t
+type e2apEntryE2SMgNBNRTactionDefinitionFormat1 struct {
+	entry *C.E2SMgNBNRTActionDefinitionFormat1_t
 }
 
-func (e2Item *e2apActionParameterItem) set(dynMemHead *C.mem_track_hdr_t, id *e2ap.ActionParameterItem) error {
-
-	e2Item.entry.parameterID = (C.uint32_t)(id.ParameterID)
-	if err := (&e2apActionParameterValue{entry: &e2Item.entry.actionParameterValue}).set(dynMemHead, &id.ActionParameterValue); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (e2Item *e2apActionParameterItem) get(id *e2ap.ActionParameterItem) error {
-
-	id.ParameterID = (uint32)(e2Item.entry.parameterID)
-	if err := (&e2apActionParameterValue{entry: &e2Item.entry.actionParameterValue}).get(&id.ActionParameterValue); err != nil {
-		return err
-	}
-	return nil
-}
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type e2apActionParameterValue struct {
-	entry *C.ActionParameterValue_t
-}
-
-func (e2Item *e2apActionParameterValue) set(dynMemHead *C.mem_track_hdr_t, id *e2ap.ActionParameterValue) error {
-
-	if id.ValueIntPresent {
-		e2Item.entry.valueInt = (C.int64_t)(id.ValueInt)
-		e2Item.entry.valueIntPresent = true
-	} else if id.ValueEnumPresent {
-		e2Item.entry.valueEnum = (C.int64_t)(id.ValueEnum)
-		e2Item.entry.valueEnumPresent = true
-	} else if id.ValueBoolPresent {
-		e2Item.entry.valueBool = (C.bool)(id.ValueBool)
-		e2Item.entry.valueBoolPresent = true
-	} else if id.ValueBitSPresent {
-		if C.addBitString(dynMemHead, &e2Item.entry.valueBitS, (C.uint64_t)(id.ValueBitS.Length), unsafe.Pointer(&id.ValueBitS.Data[0]), (C.uint8_t)(id.ValueBitS.UnusedBits)) == nil {
-			return fmt.Errorf("Alloc valueBitS fail)")
-		}
-		e2Item.entry.valueBitSPresent = true
-	} else if id.ValueOctSPresent {
-		if C.addOctetString(dynMemHead, &e2Item.entry.valueOctS, (C.uint64_t)(id.ValueOctS.Length), unsafe.Pointer(&id.ValueOctS.Data[0])) == nil {
-			return fmt.Errorf("Alloc valueOctS fail)")
-		}
-		e2Item.entry.valueOctSPresent = true
-	} else if id.ValuePrtSPresent {
-		if C.addOctetString(dynMemHead, &e2Item.entry.valuePrtS, (C.uint64_t)(id.ValuePrtS.Length), unsafe.Pointer(&id.ValuePrtS.Data[0])) == nil {
-			return fmt.Errorf("Alloc valuePrtS fail)")
-		}
-		e2Item.entry.valuePrtSPresent = true
-	}
-	return nil
-}
-
-func (e2Item *e2apActionParameterValue) get(id *e2ap.ActionParameterValue) error {
-
-	if e2Item.entry.valueIntPresent {
-		id.ValueInt = (int64)(e2Item.entry.valueInt)
-		id.ValueIntPresent = true
-	} else if e2Item.entry.valueEnumPresent {
-		id.ValueEnum = (int64)(e2Item.entry.valueEnum)
-		id.ValueEnumPresent = true
-	} else if e2Item.entry.valueBoolPresent {
-		id.ValueBool = (bool)(e2Item.entry.valueBool)
-		id.ValueBoolPresent = true
-	} else if e2Item.entry.valueBitSPresent {
-		id.ValueBitSPresent = true
-		id.ValueBitS.Length = (uint64)(e2Item.entry.valueBitS.byteLength)
-		id.ValueBitS.UnusedBits = (uint8)(e2Item.entry.valueBitS.unusedBits)
-		C.memcpy(unsafe.Pointer(&id.ValueBitS.Data), unsafe.Pointer(&e2Item.entry.valueBitS.data), C.size_t(e2Item.entry.valueBitS.byteLength))
-	} else if e2Item.entry.valueOctSPresent {
-		id.ValueOctSPresent = true
-		id.ValueOctS.Length = (uint64)(e2Item.entry.valueOctS.length)
-		C.memcpy(unsafe.Pointer(&id.ValueBitS.Data), unsafe.Pointer(&e2Item.entry.valueOctS.data), C.size_t(e2Item.entry.valueOctS.length))
-	} else if e2Item.entry.valuePrtSPresent {
-		id.ValuePrtSPresent = true
-		id.ValuePrtS.Length = (uint64)(e2Item.entry.valuePrtS.length)
-		C.memcpy(unsafe.Pointer(&id.ValueBitS.Data), unsafe.Pointer(&e2Item.entry.valuePrtS.data), C.size_t(e2Item.entry.valuePrtS.length))
-	}
-	return nil
-}
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type e2apActionDefinitionFormat2 struct {
-	entry *C.E2SMgNBX2ActionDefinitionFormat2_t
-}
-
-func (e2Item *e2apActionDefinitionFormat2) set(dynMemHead *C.mem_track_hdr_t, id *e2ap.ActionDefinitionFormat2) error {
-	// 1..15
-	e2Item.entry.ranUeGroupCount = 0
-	for i := 0; i < len(id.RanUEgroupItems); i++ {
-		if err := (&e2apRANueGroupItem{entry: &e2Item.entry.ranUeGroupItem[i]}).set(dynMemHead, &id.RanUEgroupItems[i]); err != nil {
-			return err
-		}
-		e2Item.entry.ranUeGroupCount++
-	}
-	return nil
-}
-
-func (e2Item *e2apActionDefinitionFormat2) get(id *e2ap.ActionDefinitionFormat2) error {
-	// 1..15
-	length := (int)(e2Item.entry.ranUeGroupCount)
-	id.RanUEgroupItems = make([]e2ap.RANueGroupItem, length)
-	for i := 0; i < length; i++ {
-		if err := (&e2apRANueGroupItem{entry: &e2Item.entry.ranUeGroupItem[i]}).get(&id.RanUEgroupItems[i]); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type e2apRANueGroupItem struct {
-	entry *C.RANueGroupItem_t
-}
-
-func (e2Item *e2apRANueGroupItem) set(dynMemHead *C.mem_track_hdr_t, id *e2ap.RANueGroupItem) error {
-	e2Item.entry.ranUEgroupID = (C.int64_t)(id.RanUEgroupID)
-	if err := (&e2apRANueGroupDefinition{entry: &e2Item.entry.ranUEgroupDefinition}).set(dynMemHead, &id.RanUEgroupDefinition); err != nil {
-		return err
-	}
-	if err := (&e2apRANimperativePolicy{entry: &e2Item.entry.ranPolicy}).set(dynMemHead, &id.RanPolicy); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (e2Item *e2apRANueGroupItem) get(id *e2ap.RANueGroupItem) error {
-	id.RanUEgroupID = (int64)(e2Item.entry.ranUEgroupID)
-	if err := (&e2apRANueGroupDefinition{entry: &e2Item.entry.ranUEgroupDefinition}).get(&id.RanUEgroupDefinition); err != nil {
-		return err
-	}
-	if err := (&e2apRANimperativePolicy{entry: &e2Item.entry.ranPolicy}).get(&id.RanPolicy); err != nil {
-		return err
-	}
-	return nil
-}
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type e2apRANueGroupDefinition struct {
-	entry *C.RANueGroupDefinition_t
-}
-
-func (e2Item *e2apRANueGroupDefinition) set(dynMemHead *C.mem_track_hdr_t, id *e2ap.RANueGroupDefinition) error {
-	// 1..255
-	e2Item.entry.ranUeGroupDefCount = 0
-	for i := 0; i < len(id.RanUEGroupDefItems); i++ {
-		if err := (&e2apRANueGroupDefItem{entry: &e2Item.entry.ranUeGroupDefItem[i]}).set(dynMemHead, &id.RanUEGroupDefItems[i]); err != nil {
-			return err
-		}
-		e2Item.entry.ranUeGroupDefCount++
-	}
-	return nil
-}
-
-func (e2Item *e2apRANueGroupDefinition) get(id *e2ap.RANueGroupDefinition) error {
-	// 1..255
-	length := (int)(e2Item.entry.ranUeGroupDefCount)
-	id.RanUEGroupDefItems = make([]e2ap.RANueGroupDefItem, length)
-	for i := 0; i < length; i++ {
-		if err := (&e2apRANueGroupDefItem{entry: &e2Item.entry.ranUeGroupDefItem[i]}).get(&id.RanUEGroupDefItems[i]); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type e2apRANimperativePolicy struct {
-	entry *C.RANimperativePolicy_t
-}
-
-func (e2Item *e2apRANimperativePolicy) set(dynMemHead *C.mem_track_hdr_t, id *e2ap.RANimperativePolicy) error {
+func (e2Item *e2apEntryE2SMgNBNRTactionDefinitionFormat1) set(dynMemHead *C.mem_track_hdr_t, id *e2ap.E2SMgNBNRTActionDefinitionFormat1) error {
 	// 1..255
 	e2Item.entry.ranParameterCount = 0
-	for i := 0; i < len(id.RanParameterItems); i++ {
-		if err := (&e2apRANParameterItem{entry: &e2Item.entry.ranParameterItem[i]}).set(dynMemHead, &id.RanParameterItems[i]); err != nil {
+	for i := 0; i < len(id.RanParameterList); i++ {
+		if err := (&e2apEntryRANParameterItem{entry: &e2Item.entry.ranParameterList[i]}).set(dynMemHead, &id.RanParameterList[i]); err != nil {
 			return err
 		}
 		e2Item.entry.ranParameterCount++
@@ -450,12 +284,12 @@
 	return nil
 }
 
-func (e2Item *e2apRANimperativePolicy) get(id *e2ap.RANimperativePolicy) error {
+func (e2Item *e2apEntryE2SMgNBNRTactionDefinitionFormat1) get(id *e2ap.E2SMgNBNRTActionDefinitionFormat1) error {
 	// 1..255
 	length := (int)(e2Item.entry.ranParameterCount)
-	id.RanParameterItems = make([]e2ap.RANParameterItem, length)
+	id.RanParameterList = make([]e2ap.RANParameterItem, length)
 	for i := 0; i < length; i++ {
-		if err := (&e2apRANParameterItem{entry: &e2Item.entry.ranParameterItem[i]}).get(&id.RanParameterItems[i]); err != nil {
+		if err := (&e2apEntryRANParameterItem{entry: &e2Item.entry.ranParameterList[i]}).get(&id.RanParameterList[i]); err != nil {
 			return err
 		}
 	}
@@ -465,25 +299,23 @@
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
-type e2apRANueGroupDefItem struct {
-	entry *C.RANueGroupDefItem_t
+type e2apEntryActionParameterItem struct {
+	entry *C.ActionParameterItem_t
 }
 
-func (e2Item *e2apRANueGroupDefItem) set(dynMemHead *C.mem_track_hdr_t, id *e2ap.RANueGroupDefItem) error {
+func (e2Item *e2apEntryActionParameterItem) set(dynMemHead *C.mem_track_hdr_t, id *e2ap.ActionParameterItem) error {
 
-	e2Item.entry.ranParameterID = (C.uint32_t)(id.RanParameterID)
-	e2Item.entry.ranParameterTest = (C.uint8_t)(id.RanParameterTest)
-	if err := (&e2apRANParameterValue{entry: &e2Item.entry.ranParameterValue}).set(dynMemHead, &id.RanParameterValue); err != nil {
+	e2Item.entry.parameterID = (C.uint32_t)(id.ParameterID)
+	if err := (&e2apEntryActionParameterValue{entry: &e2Item.entry.actionParameterValue}).set(dynMemHead, &id.ActionParameterValue); err != nil {
 		return err
 	}
 	return nil
 }
 
-func (e2Item *e2apRANueGroupDefItem) get(id *e2ap.RANueGroupDefItem) error {
+func (e2Item *e2apEntryActionParameterItem) get(id *e2ap.ActionParameterItem) error {
 
-	id.RanParameterID = (uint32)(e2Item.entry.ranParameterID)
-	id.RanParameterTest = (uint8)(e2Item.entry.ranParameterTest)
-	if err := (&e2apRANParameterValue{entry: &e2Item.entry.ranParameterValue}).get(&id.RanParameterValue); err != nil {
+	id.ParameterID = (uint32)(e2Item.entry.parameterID)
+	if err := (&e2apEntryActionParameterValue{entry: &e2Item.entry.actionParameterValue}).get(&id.ActionParameterValue); err != nil {
 		return err
 	}
 	return nil
@@ -492,36 +324,11 @@
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
-type e2apRANParameterItem struct {
-	entry *C.RANParameterItem_t
+type e2apEntryActionParameterValue struct {
+	entry *C.ActionParameterValue_t
 }
 
-func (e2Item *e2apRANParameterItem) set(dynMemHead *C.mem_track_hdr_t, id *e2ap.RANParameterItem) error {
-
-	e2Item.entry.ranParameterID = (C.uint32_t)(id.RanParameterID)
-	if err := (&e2apRANParameterValue{entry: &e2Item.entry.ranParameterValue}).set(dynMemHead, &id.RanParameterValue); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (e2Item *e2apRANParameterItem) get(id *e2ap.RANParameterItem) error {
-
-	id.RanParameterID = (uint8)(e2Item.entry.ranParameterID)
-	if err := (&e2apRANParameterValue{entry: &e2Item.entry.ranParameterValue}).get(&id.RanParameterValue); err != nil {
-		return err
-	}
-	return nil
-}
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-type e2apRANParameterValue struct {
-	entry *C.RANParameterValue_t
-}
-
-func (e2Item *e2apRANParameterValue) set(dynMemHead *C.mem_track_hdr_t, id *e2ap.RANParameterValue) error {
+func (e2Item *e2apEntryActionParameterValue) set(dynMemHead *C.mem_track_hdr_t, id *e2ap.ActionParameterValue) error {
 
 	if id.ValueIntPresent {
 		e2Item.entry.valueInt = (C.int64_t)(id.ValueInt)
@@ -533,25 +340,25 @@
 		e2Item.entry.valueBool = (C.bool)(id.ValueBool)
 		e2Item.entry.valueBoolPresent = true
 	} else if id.ValueBitSPresent {
-		if C.addBitString(dynMemHead, &e2Item.entry.valueBitS, (C.uint64_t)(id.ValueBitS.Length), unsafe.Pointer(&id.ValueBitS.Data[0]), (C.uint8_t)(id.ValueBitS.UnusedBits)) == nil {
-			return fmt.Errorf("Alloc valueBitS fail)")
+		if C.addBitString(dynMemHead, &e2Item.entry.valueBitS, (C.uint64_t)(id.ValueBitS.Length), unsafe.Pointer(&id.ValueBitS.Data[0]), (C.uint8_t)(id.ValueBitS.UnusedBits)) == false {
+			return fmt.Errorf("Alloc valueBitS fail")
 		}
 		e2Item.entry.valueBitSPresent = true
 	} else if id.ValueOctSPresent {
-		if C.addOctetString(dynMemHead, &e2Item.entry.valueOctS, (C.uint64_t)(id.ValueOctS.Length), unsafe.Pointer(&id.ValueOctS.Data[0])) == nil {
-			return fmt.Errorf("Alloc valueOctS fail)")
+		if C.addOctetString(dynMemHead, &e2Item.entry.valueOctS, (C.uint64_t)(id.ValueOctS.Length), unsafe.Pointer(&id.ValueOctS.Data[0])) == false {
+			return fmt.Errorf("Alloc valueOctS fail")
 		}
 		e2Item.entry.valueOctSPresent = true
 	} else if id.ValuePrtSPresent {
-		if C.addOctetString(dynMemHead, &e2Item.entry.valuePrtS, (C.uint64_t)(id.ValuePrtS.Length), unsafe.Pointer(&id.ValuePrtS.Data[0])) == nil {
-			return fmt.Errorf("Alloc valuePrtS fail)")
+		if C.addOctetString(dynMemHead, &e2Item.entry.valuePrtS, (C.uint64_t)(id.ValuePrtS.Length), unsafe.Pointer(&id.ValuePrtS.Data[0])) == false {
+			return fmt.Errorf("Alloc valuePrtS fail")
 		}
 		e2Item.entry.valuePrtSPresent = true
 	}
 	return nil
 }
 
-func (e2Item *e2apRANParameterValue) get(id *e2ap.RANParameterValue) error {
+func (e2Item *e2apEntryActionParameterValue) get(id *e2ap.ActionParameterValue) error {
 
 	if e2Item.entry.valueIntPresent {
 		id.ValueInt = (int64)(e2Item.entry.valueInt)
@@ -566,15 +373,261 @@
 		id.ValueBitSPresent = true
 		id.ValueBitS.Length = (uint64)(e2Item.entry.valueBitS.byteLength)
 		id.ValueBitS.UnusedBits = (uint8)(e2Item.entry.valueBitS.unusedBits)
-		C.memcpy(unsafe.Pointer(&id.ValueBitS.Data), unsafe.Pointer(&e2Item.entry.valueBitS.data), C.size_t(e2Item.entry.valueBitS.byteLength))
+		id.ValueBitS.Data = make([]uint8, id.ValueBitS.Length)
+		C.memcpy(unsafe.Pointer(&id.ValueBitS.Data[0]), unsafe.Pointer(e2Item.entry.valueBitS.data), C.size_t(e2Item.entry.valueBitS.byteLength))
 	} else if e2Item.entry.valueOctSPresent {
 		id.ValueOctSPresent = true
 		id.ValueOctS.Length = (uint64)(e2Item.entry.valueOctS.length)
-		C.memcpy(unsafe.Pointer(&id.ValueBitS.Data), unsafe.Pointer(&e2Item.entry.valueOctS.data), C.size_t(e2Item.entry.valueOctS.length))
+		id.ValueOctS.Data = make([]uint8, id.ValueOctS.Length)
+		C.memcpy(unsafe.Pointer(&id.ValueOctS.Data[0]), unsafe.Pointer(e2Item.entry.valueOctS.data), C.size_t(e2Item.entry.valueOctS.length))
 	} else if e2Item.entry.valuePrtSPresent {
 		id.ValuePrtSPresent = true
 		id.ValuePrtS.Length = (uint64)(e2Item.entry.valuePrtS.length)
-		C.memcpy(unsafe.Pointer(&id.ValueBitS.Data), unsafe.Pointer(&e2Item.entry.valuePrtS.data), C.size_t(e2Item.entry.valuePrtS.length))
+		id.ValuePrtS.Data = make([]uint8, id.ValuePrtS.Length)
+		C.memcpy(unsafe.Pointer(&id.ValuePrtS.Data[0]), unsafe.Pointer(e2Item.entry.valuePrtS.data), C.size_t(e2Item.entry.valuePrtS.length))
+	}
+	return nil
+}
+
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+type e2apEntryActionDefinitionFormat2 struct {
+	entry *C.E2SMgNBX2ActionDefinitionFormat2_t
+}
+
+func (e2Item *e2apEntryActionDefinitionFormat2) set(dynMemHead *C.mem_track_hdr_t, id *e2ap.ActionDefinitionFormat2) error {
+	// 1..15
+	e2Item.entry.ranUeGroupCount = 0
+	for i := 0; i < len(id.RanUEgroupItems); i++ {
+		if err := (&e2apEntryRANueGroupItem{entry: &e2Item.entry.ranUeGroupItem[i]}).set(dynMemHead, &id.RanUEgroupItems[i]); err != nil {
+			return err
+		}
+		e2Item.entry.ranUeGroupCount++
+	}
+	return nil
+}
+
+func (e2Item *e2apEntryActionDefinitionFormat2) get(id *e2ap.ActionDefinitionFormat2) error {
+	// 1..15
+	length := (int)(e2Item.entry.ranUeGroupCount)
+	id.RanUEgroupItems = make([]e2ap.RANueGroupItem, length)
+	for i := 0; i < length; i++ {
+		if err := (&e2apEntryRANueGroupItem{entry: &e2Item.entry.ranUeGroupItem[i]}).get(&id.RanUEgroupItems[i]); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+type e2apEntryRANueGroupItem struct {
+	entry *C.RANueGroupItem_t
+}
+
+func (e2Item *e2apEntryRANueGroupItem) set(dynMemHead *C.mem_track_hdr_t, id *e2ap.RANueGroupItem) error {
+	e2Item.entry.ranUEgroupID = (C.int64_t)(id.RanUEgroupID)
+	if err := (&e2apEntryRANueGroupDefinition{entry: &e2Item.entry.ranUEgroupDefinition}).set(dynMemHead, &id.RanUEgroupDefinition); err != nil {
+		return err
+	}
+	if err := (&e2apEntryRANimperativePolicy{entry: &e2Item.entry.ranPolicy}).set(dynMemHead, &id.RanPolicy); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (e2Item *e2apEntryRANueGroupItem) get(id *e2ap.RANueGroupItem) error {
+	id.RanUEgroupID = (int64)(e2Item.entry.ranUEgroupID)
+	if err := (&e2apEntryRANueGroupDefinition{entry: &e2Item.entry.ranUEgroupDefinition}).get(&id.RanUEgroupDefinition); err != nil {
+		return err
+	}
+	if err := (&e2apEntryRANimperativePolicy{entry: &e2Item.entry.ranPolicy}).get(&id.RanPolicy); err != nil {
+		return err
+	}
+	return nil
+}
+
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+type e2apEntryRANueGroupDefinition struct {
+	entry *C.RANueGroupDefinition_t
+}
+
+func (e2Item *e2apEntryRANueGroupDefinition) set(dynMemHead *C.mem_track_hdr_t, id *e2ap.RANueGroupDefinition) error {
+	// 1..255
+	e2Item.entry.ranUeGroupDefCount = 0
+	for i := 0; i < len(id.RanUEGroupDefItems); i++ {
+		if err := (&e2apEntryRANueGroupDefItem{entry: &e2Item.entry.ranUeGroupDefItem[i]}).set(dynMemHead, &id.RanUEGroupDefItems[i]); err != nil {
+			return err
+		}
+		e2Item.entry.ranUeGroupDefCount++
+	}
+	return nil
+}
+
+func (e2Item *e2apEntryRANueGroupDefinition) get(id *e2ap.RANueGroupDefinition) error {
+	// 1..255
+	length := (int)(e2Item.entry.ranUeGroupDefCount)
+	id.RanUEGroupDefItems = make([]e2ap.RANueGroupDefItem, length)
+	for i := 0; i < length; i++ {
+		if err := (&e2apEntryRANueGroupDefItem{entry: &e2Item.entry.ranUeGroupDefItem[i]}).get(&id.RanUEGroupDefItems[i]); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+type e2apEntryRANimperativePolicy struct {
+	entry *C.RANimperativePolicy_t
+}
+
+func (e2Item *e2apEntryRANimperativePolicy) set(dynMemHead *C.mem_track_hdr_t, id *e2ap.RANimperativePolicy) error {
+	// 1..255
+	e2Item.entry.ranParameterCount = 0
+	for i := 0; i < len(id.RanParameterItems); i++ {
+		if err := (&e2apEntryRANParameterItem{entry: &e2Item.entry.ranParameterItem[i]}).set(dynMemHead, &id.RanParameterItems[i]); err != nil {
+			return err
+		}
+		e2Item.entry.ranParameterCount++
+	}
+	return nil
+}
+
+func (e2Item *e2apEntryRANimperativePolicy) get(id *e2ap.RANimperativePolicy) error {
+	// 1..255
+	length := (int)(e2Item.entry.ranParameterCount)
+	id.RanParameterItems = make([]e2ap.RANParameterItem, length)
+	for i := 0; i < length; i++ {
+		if err := (&e2apEntryRANParameterItem{entry: &e2Item.entry.ranParameterItem[i]}).get(&id.RanParameterItems[i]); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+type e2apEntryRANueGroupDefItem struct {
+	entry *C.RANueGroupDefItem_t
+}
+
+func (e2Item *e2apEntryRANueGroupDefItem) set(dynMemHead *C.mem_track_hdr_t, id *e2ap.RANueGroupDefItem) error {
+
+	e2Item.entry.ranParameterID = (C.uint32_t)(id.RanParameterID)
+	e2Item.entry.ranParameterTest = (C.uint8_t)(id.RanParameterTest)
+	if err := (&e2apEntryRANParameterValue{entry: &e2Item.entry.ranParameterValue}).set(dynMemHead, &id.RanParameterValue); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (e2Item *e2apEntryRANueGroupDefItem) get(id *e2ap.RANueGroupDefItem) error {
+
+	id.RanParameterID = (uint32)(e2Item.entry.ranParameterID)
+	id.RanParameterTest = (uint8)(e2Item.entry.ranParameterTest)
+	if err := (&e2apEntryRANParameterValue{entry: &e2Item.entry.ranParameterValue}).get(&id.RanParameterValue); err != nil {
+		return err
+	}
+	return nil
+}
+
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+type e2apEntryRANParameterItem struct {
+	entry *C.RANParameterItem_t
+}
+
+func (e2Item *e2apEntryRANParameterItem) set(dynMemHead *C.mem_track_hdr_t, id *e2ap.RANParameterItem) error {
+
+	e2Item.entry.ranParameterID = (C.uint32_t)(id.RanParameterID)
+	if err := (&e2apEntryRANParameterValue{entry: &e2Item.entry.ranParameterValue}).set(dynMemHead, &id.RanParameterValue); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (e2Item *e2apEntryRANParameterItem) get(id *e2ap.RANParameterItem) error {
+
+	id.RanParameterID = (uint8)(e2Item.entry.ranParameterID)
+	if err := (&e2apEntryRANParameterValue{entry: &e2Item.entry.ranParameterValue}).get(&id.RanParameterValue); err != nil {
+		return err
+	}
+	return nil
+}
+
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+type e2apEntryRANParameterValue struct {
+	entry *C.RANParameterValue_t
+}
+
+func (e2Item *e2apEntryRANParameterValue) set(dynMemHead *C.mem_track_hdr_t, id *e2ap.RANParameterValue) error {
+
+	if id.ValueIntPresent {
+		e2Item.entry.valueInt = (C.int64_t)(id.ValueInt)
+		e2Item.entry.valueIntPresent = true
+	} else if id.ValueEnumPresent {
+		e2Item.entry.valueEnum = (C.int64_t)(id.ValueEnum)
+		e2Item.entry.valueEnumPresent = true
+	} else if id.ValueBoolPresent {
+		e2Item.entry.valueBool = (C.bool)(id.ValueBool)
+		e2Item.entry.valueBoolPresent = true
+	} else if id.ValueBitSPresent {
+		if C.addBitString(dynMemHead, &e2Item.entry.valueBitS, (C.uint64_t)(id.ValueBitS.Length), unsafe.Pointer(&id.ValueBitS.Data[0]), (C.uint8_t)(id.ValueBitS.UnusedBits)) == false {
+			return fmt.Errorf("Alloc valueBitS fail")
+		}
+		e2Item.entry.valueBitSPresent = true
+	} else if id.ValueOctSPresent {
+		if C.addOctetString(dynMemHead, &e2Item.entry.valueOctS, (C.uint64_t)(id.ValueOctS.Length), unsafe.Pointer(&id.ValueOctS.Data[0])) == false {
+			return fmt.Errorf("Alloc valueOctS fail")
+		}
+		e2Item.entry.valueOctSPresent = true
+	} else if id.ValuePrtSPresent {
+		if C.addOctetString(dynMemHead, &e2Item.entry.valuePrtS, (C.uint64_t)(id.ValuePrtS.Length), unsafe.Pointer(&id.ValuePrtS.Data[0])) == false {
+			return fmt.Errorf("Alloc valuePrtS fail")
+		}
+		e2Item.entry.valuePrtSPresent = true
+	}
+	return nil
+}
+
+func (e2Item *e2apEntryRANParameterValue) get(id *e2ap.RANParameterValue) error {
+
+	fmt.Printf("RANParameterValue e2Item.entry.valuePrtSPresent = %v\n", e2Item.entry.valuePrtSPresent)
+	if e2Item.entry.valueIntPresent {
+		id.ValueInt = (int64)(e2Item.entry.valueInt)
+		id.ValueIntPresent = true
+	} else if e2Item.entry.valueEnumPresent {
+		id.ValueEnum = (int64)(e2Item.entry.valueEnum)
+		id.ValueEnumPresent = true
+	} else if e2Item.entry.valueBoolPresent {
+		id.ValueBool = (bool)(e2Item.entry.valueBool)
+		id.ValueBoolPresent = true
+	} else if e2Item.entry.valueBitSPresent {
+		id.ValueBitSPresent = true
+		id.ValueBitS.Length = (uint64)(e2Item.entry.valueBitS.byteLength)
+		id.ValueBitS.UnusedBits = (uint8)(e2Item.entry.valueBitS.unusedBits)
+		id.ValueBitS.Data = make([]uint8, id.ValueBitS.Length)
+		C.memcpy(unsafe.Pointer(&id.ValueBitS.Data[0]), unsafe.Pointer(e2Item.entry.valueBitS.data), C.size_t(e2Item.entry.valueBitS.byteLength))
+	} else if e2Item.entry.valueOctSPresent {
+		id.ValueOctSPresent = true
+		id.ValueOctS.Length = (uint64)(e2Item.entry.valueOctS.length)
+		id.ValueOctS.Data = make([]uint8, id.ValueOctS.Length)
+		C.memcpy(unsafe.Pointer(&id.ValueOctS.Data[0]), unsafe.Pointer(e2Item.entry.valueOctS.data), C.size_t(e2Item.entry.valueOctS.length))
+	} else if e2Item.entry.valuePrtSPresent {
+		id.ValuePrtSPresent = true
+		id.ValuePrtS.Length = (uint64)(e2Item.entry.valuePrtS.length)
+		id.ValuePrtS.Data = make([]uint8, id.ValuePrtS.Length)
+		C.memcpy(unsafe.Pointer(&id.ValuePrtS.Data[0]), unsafe.Pointer(e2Item.entry.valuePrtS.data), C.size_t(e2Item.entry.valuePrtS.length))
 	}
 	return nil
 }
@@ -725,17 +778,65 @@
 }
 
 func (evtTrig *e2apEntryEventTrigger) set(id *e2ap.EventTriggerDefinition) error {
-	evtTrig.entry.e2SMgNBX2eventTriggerDefinition.interfaceDirection = (C.uint8_t)(id.InterfaceDirection)
-	evtTrig.entry.e2SMgNBX2eventTriggerDefinition.interfaceMessageType.procedureCode = (C.uint8_t)(id.ProcedureCode)
-	evtTrig.entry.e2SMgNBX2eventTriggerDefinition.interfaceMessageType.typeOfMessage = (C.uint8_t)(id.TypeOfMessage)
-	return (&e2apEntryInterfaceId{entry: &evtTrig.entry.e2SMgNBX2eventTriggerDefinition.interfaceID}).set(&id.InterfaceId)
+	if id.NBX2EventTriggerDefinitionPresent {
+		evtTrig.entry.E2SMgNBX2EventTriggerDefinitionPresent = true
+		return (&e2apEntryX2EventTrigger{entry: &evtTrig.entry.e2SMgNBX2eventTriggerDefinition}).set(&id.X2EventTriggerDefinition)
+
+	} else if id.NBNRTEventTriggerDefinitionPresent {
+		evtTrig.entry.E2SMgNBNRTEventTriggerDefinitionPresent = true
+		return (&e2apEntryNRTEventTrigger{entry: &evtTrig.entry.e2SMgNBNRTEventTriggerDefinition}).set(&id.NBNRTEventTriggerDefinition)
+	}
+	return fmt.Errorf("Set() empty EventTriggerDefinition")
 }
 
 func (evtTrig *e2apEntryEventTrigger) get(id *e2ap.EventTriggerDefinition) error {
-	id.InterfaceDirection = (uint32)(evtTrig.entry.e2SMgNBX2eventTriggerDefinition.interfaceDirection)
-	id.ProcedureCode = (uint32)(evtTrig.entry.e2SMgNBX2eventTriggerDefinition.interfaceMessageType.procedureCode)
-	id.TypeOfMessage = (uint64)(evtTrig.entry.e2SMgNBX2eventTriggerDefinition.interfaceMessageType.typeOfMessage)
-	return (&e2apEntryInterfaceId{entry: &evtTrig.entry.e2SMgNBX2eventTriggerDefinition.interfaceID}).get(&id.InterfaceId)
+	if evtTrig.entry.E2SMgNBX2EventTriggerDefinitionPresent {
+		id.NBX2EventTriggerDefinitionPresent = true
+		return (&e2apEntryX2EventTrigger{entry: &evtTrig.entry.e2SMgNBX2eventTriggerDefinition}).get(&id.X2EventTriggerDefinition)
+
+	} else if evtTrig.entry.E2SMgNBNRTEventTriggerDefinitionPresent {
+		id.NBNRTEventTriggerDefinitionPresent = true
+		return (&e2apEntryNRTEventTrigger{entry: &evtTrig.entry.e2SMgNBNRTEventTriggerDefinition}).get(&id.NBNRTEventTriggerDefinition)
+	}
+	return fmt.Errorf("Get() empty EventTriggerDefinition")
+}
+
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+type e2apEntryX2EventTrigger struct {
+	entry *C.E2SMgNBX2eventTriggerDefinition_t
+}
+
+func (evtTrig *e2apEntryX2EventTrigger) set(id *e2ap.X2EventTriggerDefinition) error {
+	evtTrig.entry.interfaceDirection = (C.uint8_t)(id.InterfaceDirection)
+	evtTrig.entry.interfaceMessageType.procedureCode = (C.uint8_t)(id.ProcedureCode)
+	evtTrig.entry.interfaceMessageType.typeOfMessage = (C.uint8_t)(id.TypeOfMessage)
+	return (&e2apEntryInterfaceId{entry: &evtTrig.entry.interfaceID}).set(&id.InterfaceId)
+}
+
+func (evtTrig *e2apEntryX2EventTrigger) get(id *e2ap.X2EventTriggerDefinition) error {
+	id.InterfaceDirection = (uint32)(evtTrig.entry.interfaceDirection)
+	id.ProcedureCode = (uint32)(evtTrig.entry.interfaceMessageType.procedureCode)
+	id.TypeOfMessage = (uint64)(evtTrig.entry.interfaceMessageType.typeOfMessage)
+	return (&e2apEntryInterfaceId{entry: &evtTrig.entry.interfaceID}).get(&id.InterfaceId)
+}
+
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+type e2apEntryNRTEventTrigger struct {
+	entry *C.E2SMgNBNRTEventTriggerDefinition_t
+}
+
+func (evtTrig *e2apEntryNRTEventTrigger) set(id *e2ap.NBNRTEventTriggerDefinition) error {
+	evtTrig.entry.eventDefinitionFormat1.triggerNature = (C.uint8_t)(id.TriggerNature)
+	return nil
+}
+
+func (evtTrig *e2apEntryNRTEventTrigger) get(id *e2ap.NBNRTEventTriggerDefinition) error {
+	id.TriggerNature = (uint8)(evtTrig.entry.eventDefinitionFormat1.triggerNature)
+	return nil
 }
 
 //-----------------------------------------------------------------------------
@@ -1081,8 +1182,9 @@
 
 		fmt.Fprintln(&b, "      ricActionToBeSetupItem[index].ricActionDefinitionPresent =", e2apMsg.msgC.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionPresent)
 		if e2apMsg.msgC.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionPresent {
-			fmt.Fprintln(&b, "      ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1Present =", e2apMsg.msgC.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat1Present)
-			fmt.Fprintln(&b, "      ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2Present =", e2apMsg.msgC.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionFormat2Present)
+			fmt.Fprintln(&b, "      ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1Present =", e2apMsg.msgC.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format1Present)
+			fmt.Fprintln(&b, "      ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2Present =", e2apMsg.msgC.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionX2Format2Present)
+			fmt.Fprintln(&b, "      ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1Present =", e2apMsg.msgC.ricSubscriptionDetails.ricActionToBeSetupItemIEs.ricActionToBeSetupItem[index].ricActionDefinitionChoice.actionDefinitionNRTFormat1Present)
 			// Dynamically allocated C-structs are already freed. Can't print those.
 		}
 
diff --git a/pkg/control/subscription.go b/pkg/control/subscription.go
index a730f34..6950b8d 100644
--- a/pkg/control/subscription.go
+++ b/pkg/control/subscription.go
@@ -155,10 +155,7 @@
 			}
 
 			if acts.RicActionDefinitionPresent != actt.RicActionDefinitionPresent ||
-				acts.ActionDefinitionChoice.ActionDefinitionFormat2Present !=
-					actt.ActionDefinitionChoice.ActionDefinitionFormat2Present ||
-				reflect.DeepEqual(acts.ActionDefinitionChoice.ActionDefinitionFormat2,
-					actt.ActionDefinitionChoice.ActionDefinitionFormat2) == false {
+				reflect.DeepEqual(acts.ActionDefinitionChoice, actt.ActionDefinitionChoice) == false {
 				return false
 			}
 
diff --git a/pkg/teststube2ap/stubE2.go b/pkg/teststube2ap/stubE2.go
index bb2dff6..fba8b76 100644
--- a/pkg/teststube2ap/stubE2.go
+++ b/pkg/teststube2ap/stubE2.go
@@ -103,49 +103,79 @@
 	p.Req.RequestId.InstanceId = 0
 	p.Req.FunctionId = 1
 
-	p.Req.EventTriggerDefinition.InterfaceId.GlobalEnbId.Present = true
-	p.Req.EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.StringPut("310150")
-	p.Req.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Id = 123
-	p.Req.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Bits = e2ap.E2AP_ENBIDHomeBits28
-
 	// gnb -> enb outgoing
 	// enb -> gnb incoming
 	// X2 36423-f40.doc
-	p.Req.EventTriggerDefinition.InterfaceDirection = e2ap.E2AP_InterfaceDirectionIncoming
-	p.Req.EventTriggerDefinition.ProcedureCode = 5 //28 35
-	p.Req.EventTriggerDefinition.TypeOfMessage = e2ap.E2AP_InitiatingMessage
+	p.Req.EventTriggerDefinition.NBX2EventTriggerDefinitionPresent = true
+	p.Req.EventTriggerDefinition.NBNRTEventTriggerDefinitionPresent = false
+	if p.Req.EventTriggerDefinition.NBX2EventTriggerDefinitionPresent == true {
+		p.Req.EventTriggerDefinition.InterfaceId.GlobalEnbId.Present = true
+		p.Req.EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.StringPut("310150")
+		p.Req.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Id = 123
+		p.Req.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Bits = e2ap.E2AP_ENBIDHomeBits28
+
+		p.Req.EventTriggerDefinition.InterfaceDirection = e2ap.E2AP_InterfaceDirectionIncoming
+		p.Req.EventTriggerDefinition.ProcedureCode = 5 //28 35
+		p.Req.EventTriggerDefinition.TypeOfMessage = e2ap.E2AP_InitiatingMessage
+	} else if p.Req.EventTriggerDefinition.NBNRTEventTriggerDefinitionPresent == true {
+		p.Req.EventTriggerDefinition.NBNRTEventTriggerDefinition.TriggerNature = e2ap.NRTTriggerNature_now
+	}
 
 	p.Req.ActionSetups = make([]e2ap.ActionToBeSetupItem, 1)
 
 	p.Req.ActionSetups[0].ActionId = 0
 	p.Req.ActionSetups[0].ActionType = e2ap.E2AP_ActionTypeReport
 	p.Req.ActionSetups[0].RicActionDefinitionPresent = true
-	p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionFormat1Present = false
-	p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionFormat2Present = true
+	p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionX2Format1Present = false
+	p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionX2Format2Present = true
+	p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionNRTFormat1Present = false
 
-	// 1..15
-	for index2 := 0; index2 < 1; index2++ {
-		ranUEgroupItem := e2ap.RANueGroupItem{}
+	if p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionX2Format1Present {
+		p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionX2Format1.StyleID = 99
 		// 1..255
-		for index2 := 0; index2 < 1; index2++ {
-			ranUEGroupDefItem := e2ap.RANueGroupDefItem{}
-			ranUEGroupDefItem.RanParameterID = 22
-			ranUEGroupDefItem.RanParameterTest = e2ap.RANParameterTest_equal
-			ranUEGroupDefItem.RanParameterValue.ValueIntPresent = true
-			ranUEGroupDefItem.RanParameterValue.ValueInt = 100
-			ranUEgroupItem.RanUEgroupDefinition.RanUEGroupDefItems = append(ranUEgroupItem.RanUEgroupDefinition.RanUEGroupDefItems, ranUEGroupDefItem)
+		for index := 0; index < 1; index++ {
+			actionParameterItem := e2ap.ActionParameterItem{}
+			actionParameterItem.ParameterID = 11
+			actionParameterItem.ActionParameterValue.ValueIntPresent = true
+			actionParameterItem.ActionParameterValue.ValueInt = 100
+			p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionX2Format1.ActionParameterItems =
+				append(p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionX2Format1.ActionParameterItems, actionParameterItem)
 		}
+	} else if p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionX2Format2Present {
+		// 1..15
+		for index := 0; index < 1; index++ {
+			ranUEgroupItem := e2ap.RANueGroupItem{}
+			// 1..255
+			for index2 := 0; index2 < 1; index2++ {
+				ranUEGroupDefItem := e2ap.RANueGroupDefItem{}
+				ranUEGroupDefItem.RanParameterID = 22
+				ranUEGroupDefItem.RanParameterTest = e2ap.RANParameterTest_equal
+				ranUEGroupDefItem.RanParameterValue.ValueIntPresent = true
+				ranUEGroupDefItem.RanParameterValue.ValueInt = 100
+				ranUEgroupItem.RanUEgroupDefinition.RanUEGroupDefItems = append(ranUEgroupItem.RanUEgroupDefinition.RanUEGroupDefItems, ranUEGroupDefItem)
+			}
+			// 1..255
+			for index3 := 0; index3 < 1; index3++ {
+				ranParameterItem := e2ap.RANParameterItem{}
+				ranParameterItem.RanParameterID = 33
+				ranParameterItem.RanParameterValue.ValueIntPresent = true
+				ranParameterItem.RanParameterValue.ValueInt = 100
+				ranUEgroupItem.RanPolicy.RanParameterItems = append(ranUEgroupItem.RanPolicy.RanParameterItems, ranParameterItem)
+			}
+			ranUEgroupItem.RanUEgroupID = 2
+			p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionX2Format2.RanUEgroupItems =
+				append(p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionX2Format2.RanUEgroupItems, ranUEgroupItem)
+		}
+	} else if p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionNRTFormat1Present {
 		// 1..255
-		for index3 := 0; index3 < 1; index3++ {
+		for index := 0; index < 1; index++ {
 			ranParameterItem := e2ap.RANParameterItem{}
 			ranParameterItem.RanParameterID = 33
 			ranParameterItem.RanParameterValue.ValueIntPresent = true
 			ranParameterItem.RanParameterValue.ValueInt = 100
-			ranUEgroupItem.RanPolicy.RanParameterItems = append(ranUEgroupItem.RanPolicy.RanParameterItems, ranParameterItem)
+			p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionNRTFormat1.RanParameterList =
+				append(p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionNRTFormat1.RanParameterList, ranParameterItem)
 		}
-		ranUEgroupItem.RanUEgroupID = 2
-		p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionFormat2.RanUEgroupItems =
-			append(p.Req.ActionSetups[0].ActionDefinitionChoice.ActionDefinitionFormat2.RanUEgroupItems, ranUEgroupItem)
 	}
 	p.Req.ActionSetups[0].SubsequentAction.Present = true
 	p.Req.ActionSetups[0].SubsequentAction.Type = e2ap.E2AP_SubSeqActionTypeContinue