asn1: fix visibility warnings from generated code

Fix warnings from generated asn1 code in order to build osmo-iuh with werror in a future patch: ../../include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h:29:23: error: ‘struct HNBAP_CriticalityDiagnostics_IE_List__Member’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror] These visibility warnings come from "SEQUENCE … OF SEQUENCE" definitions in the asn1 source files, as described in detail here: https://github.com/vlm/asn1c/issues/430 It is not possible to tell gcc to just ignore these warnings since they don't have their own type (unlike e.g. -Wuninitialized). Also it seems like a huge effort to patch this in asn1c. So work around the problem the same way the author of the issue worked around it by rewriting the lines to "SEQUENCE … OF …-Value" and adding a "…-Value ::= SEQUENCE" line below. Add a script in asn1/utils/asn1_restructure_sequence_of_sequence.py for the transformation and apply it. Related: OS#4462 Change-Id: If84445ed2e0df604b581684dcf83f8520b7da84c
2022-11-11 15:44:52 +01:00 · 2022-11-11 15:44:52 +01:00 · b81e6b64ac
parent 0c04a7e03f
commit b81e6b64ac
79 changed files with 2487 additions and 1695 deletions
--- a/asn1/hnbap/HNBAP-IEs.asn
+++ b/asn1/hnbap/HNBAP-IEs.asn
@ -127,7 +127,8 @@ CriticalityDiagnostics ::= SEQUENCE {
 	...
 }

-CriticalityDiagnostics-IE-List ::= SEQUENCE (SIZE (1..maxNrOfErrors)) OF
+CriticalityDiagnostics-IE-List ::= SEQUENCE (SIZE (1..maxNrOfErrors)) OF CriticalityDiagnostics-IE-List-Value
+CriticalityDiagnostics-IE-List-Value ::=
 	SEQUENCE {
 		iECriticality		Criticality,
 		iE-ID			ProtocolIE-ID,
--- a/asn1/ranap/RANAP-IEs.asn
+++ b/asn1/ranap/RANAP-IEs.asn
@ -265,7 +265,8 @@ Ass-RAB-Parameter-GuaranteedBitrateList	::= SEQUENCE (SIZE (1..maxNrOfSeparateTr

 Ass-RAB-Parameter-MaxBitrateList ::= SEQUENCE (SIZE (1..maxNrOfSeparateTrafficDirections)) OF MaxBitrate

-AuthorisedPLMNs ::= SEQUENCE (SIZE (1..maxNrOfPLMNsSN)) OF
+AuthorisedPLMNs ::= SEQUENCE (SIZE (1..maxNrOfPLMNsSN)) OF AuthorisedPLMNs-Value
+AuthorisedPLMNs-Value ::=
 	SEQUENCE {
 		pLMNidentity		PLMNidentity,
 		authorisedSNAsList	AuthorisedSNAs		OPTIONAL,
@ -479,7 +480,8 @@ CriticalityDiagnostics ::= SEQUENCE {
 	...
 }

-CriticalityDiagnostics-IE-List ::= SEQUENCE (SIZE (1..maxNrOfErrors)) OF
+CriticalityDiagnostics-IE-List ::= SEQUENCE (SIZE (1..maxNrOfErrors)) OF CriticalityDiagnostics-IE-List-Value
+CriticalityDiagnostics-IE-List-Value ::=
 	SEQUENCE {
 		iECriticality		Criticality,
 		iE-ID			ProtocolIE-ID,
@ -488,7 +490,8 @@ CriticalityDiagnostics-IE-List ::= SEQUENCE (SIZE (1..maxNrOfErrors)) OF
 		...
 	}

-MessageStructure ::= SEQUENCE (SIZE (1..maxNrOfLevels)) OF
+MessageStructure ::= SEQUENCE (SIZE (1..maxNrOfLevels)) OF MessageStructure-Value
+MessageStructure-Value ::=
 	SEQUENCE {
 		iE-ID			ProtocolIE-ID,
 		repetitionNumber	RepetitionNumber1		OPTIONAL,
@ -753,7 +756,8 @@ GA-PointWithUnCertaintyEllipse ::= SEQUENCE {
 	...
 }

-GA-Polygon ::= SEQUENCE (SIZE (1..maxNrOfPoints)) OF
+GA-Polygon ::= SEQUENCE (SIZE (1..maxNrOfPoints)) OF GA-Polygon-Value
+GA-Polygon-Value ::=
 	SEQUENCE {
 		geographicalCoordinates	GeographicalCoordinates,
 		iE-Extensions		IE-Extensions			OPTIONAL,
@ -923,7 +927,8 @@ KeyStatus	::= ENUMERATED {
 }
 -- L

-LA-LIST ::= SEQUENCE (SIZE (1..maxNrOfLAs)) OF
+LA-LIST ::= SEQUENCE (SIZE (1..maxNrOfLAs)) OF LA-LIST-Value
+LA-LIST-Value ::=
 	SEQUENCE {
 		lAC			LAC,
 		listOF-SNAs		ListOF-SNAs,
@ -1336,7 +1341,8 @@ LoggingDuration	::=	ENUMERATED {

 PLMNidentity 				::= OCTET STRING (SIZE (3))

-PLMNs-in-shared-network ::= SEQUENCE (SIZE (1..maxNrOfPLMNsSN)) OF
+PLMNs-in-shared-network ::= SEQUENCE (SIZE (1..maxNrOfPLMNsSN)) OF PLMNs-in-shared-network-Value
+PLMNs-in-shared-network-Value ::=
 	SEQUENCE {
 		pLMNidentity	PLMNidentity,
 		lA-LIST		LA-LIST,
@ -1414,7 +1420,8 @@ RABased	::= SEQUENCE {
 RAI-List	::= SEQUENCE (SIZE (1..maxNrOfRAIs)) OF
 	RAI

-RABDataVolumeReport ::= SEQUENCE (SIZE (1..maxNrOfVol)) OF
+RABDataVolumeReport ::= SEQUENCE (SIZE (1..maxNrOfVol)) OF RABDataVolumeReport-Value
+RABDataVolumeReport-Value ::=
 	SEQUENCE {
 		dl-UnsuccessfullyTransmittedDataVolume	UnsuccessfullyTransmittedDataVolume,
 		dataVolumeReference			DataVolumeReference	OPTIONAL,
@ -1456,7 +1463,8 @@ RAB-Parameters ::= SEQUENCE {
 	...
 }

-RABParametersList	::=	SEQUENCE (SIZE (1.. maxNrOfRABs)) OF SEQUENCE	{
+RABParametersList	::=	SEQUENCE (SIZE (1.. maxNrOfRABs)) OF RABParametersList-Value
+RABParametersList-Value ::= SEQUENCE {
 	rab-Id			RAB-ID,
 	cn-domain		CN-DomainIndicator,
 	rabDataVolumeReport	RABDataVolumeReport	OPTIONAL,
@ -1848,7 +1856,8 @@ RSRQ-Type ::= SEQUENCE {

 RSRQ-Extension ::= INTEGER (-30..46, ...)

-EUTRANFrequencies ::= SEQUENCE (SIZE (1..maxNrOfEUTRAFreqs)) OF SEQUENCE {
+EUTRANFrequencies ::= SEQUENCE (SIZE (1..maxNrOfEUTRAFreqs)) OF EUTRANFrequencies-Value
+EUTRANFrequencies-Value ::= SEQUENCE {
 	earfcn			INTEGER (0..65535),
 	measBand		MeasBand			OPTIONAL,
 	iE-Extensions		IE-Extensions OPTIONAL}
--- a/asn1/ranap/RANAP-PDU-Contents.asn
+++ b/asn1/ranap/RANAP-PDU-Contents.asn
@ -780,7 +780,8 @@ CNMBMSLinkingInformation-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 	...
 }

-JoinedMBMSBearerService-IEs ::= SEQUENCE (SIZE (1.. maxnoofMulticastServicesPerUE)) OF
+JoinedMBMSBearerService-IEs ::= SEQUENCE (SIZE (1.. maxnoofMulticastServicesPerUE)) OF JoinedMBMSBearerService-IEs-Value
+JoinedMBMSBearerService-IEs-Value ::=
 	SEQUENCE {
 		tMGI			TMGI,
 		mBMS-PTP-RAB-ID		MBMS-PTP-RAB-ID,
@ -2301,7 +2302,8 @@ RAB-ReleasedItem-ExtIEs RANAP-PROTOCOL-EXTENSION ::= {
 	...
 }

-DataVolumeList ::= SEQUENCE (SIZE (1..maxNrOfVol)) OF
+DataVolumeList ::= SEQUENCE (SIZE (1..maxNrOfVol)) OF DataVolumeList-Value
+DataVolumeList-Value ::=
 	SEQUENCE {
 		dl-UnsuccessfullyTransmittedDataVolume	UnsuccessfullyTransmittedDataVolume,
 		dataVolumeReference			DataVolumeReference	OPTIONAL,
@ -3210,7 +3212,8 @@ MBMSUELinkingRequestIEs RANAP-PROTOCOL-IES ::= {
 	...
 }

-LeftMBMSBearerService-IEs ::= SEQUENCE (SIZE (1.. maxnoofMulticastServicesPerUE)) OF
+LeftMBMSBearerService-IEs ::= SEQUENCE (SIZE (1.. maxnoofMulticastServicesPerUE)) OF LeftMBMSBearerService-IEs-Value
+LeftMBMSBearerService-IEs-Value ::=
 	SEQUENCE {
 		tMGI		TMGI,
 		iE-Extensions	ProtocolExtensionContainer { {LeftMBMSBearerService-ExtIEs} } OPTIONAL,
@ -3243,7 +3246,8 @@ MBMSUELinkingResponseIEs RANAP-PROTOCOL-IES ::= {
 	...
 }

-UnsuccessfulLinking-IEs ::= SEQUENCE (SIZE (1.. maxnoofMulticastServicesPerUE)) OF
+UnsuccessfulLinking-IEs ::= SEQUENCE (SIZE (1.. maxnoofMulticastServicesPerUE)) OF UnsuccessfulLinking-IEs-Value
+UnsuccessfulLinking-IEs-Value ::=
 	SEQUENCE {
 		tMGI		TMGI,
 		cause		Cause,
--- a/asn1/ranap/RANAP-PDU.asn
+++ b/asn1/ranap/RANAP-PDU.asn
@ -735,7 +735,8 @@ CNMBMSLinkingInformation ::= SEQUENCE {
 	...
 }

-JoinedMBMSBearerService-IEs ::= SEQUENCE (SIZE (1.. maxnoofMulticastServicesPerUE)) OF
+JoinedMBMSBearerService-IEs ::= SEQUENCE (SIZE (1.. maxnoofMulticastServicesPerUE)) OF JoinedMBMSBearerService-IEs-Value
+JoinedMBMSBearerService-IEs-Value ::=
 	SEQUENCE {
 		tMGI			TMGI,
 		mBMS-PTP-RAB-ID		MBMS-PTP-RAB-ID,
@ -885,7 +886,8 @@ RAB-ReleasedItem ::= SEQUENCE {
 	...
 }

-DataVolumeList ::= SEQUENCE (SIZE (1..maxNrOfVol)) OF
+DataVolumeList ::= SEQUENCE (SIZE (1..maxNrOfVol)) OF DataVolumeList-Value
+DataVolumeList-Value ::=
 	SEQUENCE {
 		dl-UnsuccessfullyTransmittedDataVolume	UnsuccessfullyTransmittedDataVolume,
 		dataVolumeReference			DataVolumeReference	OPTIONAL,
@ -1004,14 +1006,16 @@ MBMSSynchronisationInformation ::= SEQUENCE {
 	...
 }

-LeftMBMSBearerService-IEs ::= SEQUENCE (SIZE (1.. maxnoofMulticastServicesPerUE)) OF
+LeftMBMSBearerService-IEs ::= SEQUENCE (SIZE (1.. maxnoofMulticastServicesPerUE)) OF LeftMBMSBearerService-IEs-Value
+LeftMBMSBearerService-IEs-Value ::=
 	SEQUENCE {
 		tMGI		TMGI,
 		iE-Extensions	ProtocolExtensionContainer OPTIONAL,
 		...
 	}

-UnsuccessfulLinking-IEs ::= SEQUENCE (SIZE (1.. maxnoofMulticastServicesPerUE)) OF
+UnsuccessfulLinking-IEs ::= SEQUENCE (SIZE (1.. maxnoofMulticastServicesPerUE)) OF UnsuccessfulLinking-IEs-Value
+UnsuccessfulLinking-IEs-Value ::=
 	SEQUENCE {
 		tMGI		TMGI,
 		cause		Cause,
--- a/asn1/rua/RUA-IEs.asn
+++ b/asn1/rua/RUA-IEs.asn
@ -165,7 +165,8 @@ CriticalityDiagnostics ::= SEQUENCE {
 	...
 }

-CriticalityDiagnostics-IE-List ::= SEQUENCE (SIZE (1..maxNrOfErrors)) OF
+CriticalityDiagnostics-IE-List ::= SEQUENCE (SIZE (1..maxNrOfErrors)) OF CriticalityDiagnostics-IE-List-Value
+CriticalityDiagnostics-IE-List-Value ::=
 	SEQUENCE {
 		iECriticality			Criticality,
 		iE-ID				ProtocolIE-ID,
--- a/asn1/sabp/SABP-IEs.asn
+++ b/asn1/sabp/SABP-IEs.asn
@ -75,7 +75,8 @@ Criticality-Diagnostics ::= SEQUENCE {
 CriticalityDiagnostics-ExtIEs SABP-PROTOCOL-EXTENSION ::= {
 ...
 }
-CriticalityDiagnostics-IE-List ::= SEQUENCE (SIZE (1..maxNrOfErrors)) OF
+CriticalityDiagnostics-IE-List ::= SEQUENCE (SIZE (1..maxNrOfErrors)) OF CriticalityDiagnostics-IE-List-Value
+CriticalityDiagnostics-IE-List-Value ::=
 SEQUENCE {
 iECriticality Criticality,
 iE-ID ProtocolIE-ID,
@ -88,7 +89,8 @@ CriticalityDiagnostics-IE-List-ExtIEs SABP-PROTOCOL-EXTENSION ::= {
 -- { ID id-TypeOfError CRITICALITY ignore EXTENSION TypeOfError PRESENCE mandatory },
 ...
 }
-MessageStructure ::= SEQUENCE (SIZE (1..maxNrOfLevels)) OF
+MessageStructure ::= SEQUENCE (SIZE (1..maxNrOfLevels)) OF MessageStructure-Value
+MessageStructure-Value ::=
 SEQUENCE {
 iE-ID ProtocolIE-ID,
 repetitionNumber RepetitionNumber1 OPTIONAL,
--- a/asn1/utils/asn1_restructure_sequence_of_sequence.py
+++ b/asn1/utils/asn1_restructure_sequence_of_sequence.py
@ -0,0 +1,57 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: AGPL-3.0-or-later
+# Copyright 2022 sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
+"""
+Avoid compiler warnings like "‘struct HNBAP_CriticalityDiagnostics_IE_List__Member’
+declared inside parameter list will not be visible outside of this definition
+or declaration", which break compiling the sources with -Werror and can't be
+ignored with diagnostics as they don't have their own type (unlike e.g.
+-Wuninitialized).
+
+This problem is explained further in:
+https://github.com/vlm/asn1c/issues/430
+
+To avoid this, convert "SQUENCE … OF SEQUENCE" like here:
+
+    CriticalityDiagnostics-IE-List ::= SEQUENCE (SIZE (1..maxNrOfErrors)) OF
+    	SEQUENCE {
+        …
+to "SEQUENCE … OF …-Value" and below that "…-Value ::= SEQUENCE":
+
+    CriticalityDiagnostics-IE-List ::= SEQUENCE (SIZE (1..maxNrOfErrors)) OF CriticalityDiagnostics-IE-List-Value
+    CriticalityDiagnostics-IE-List-Value ::=
+    	SEQUENCE {
+        …
+"""
+import glob
+import re
+
+re_seq_of = re.compile("([A-Za-z0-0-]*)\s*::=\s*SEQUENCE .* OF$")
+re_seq_of2 = re.compile("([A-Za-z0-0-]*)\s*::=\s*SEQUENCE .* OF SEQUENCE\s*{$")
+
+for file in glob.glob("asn1/*/*.asn"):
+    print(f"{file}:")
+    with open(file) as handle:
+        lines = handle.readlines()
+
+    for i, line in enumerate(lines):
+        match = re_seq_of.search(line)
+        if match and "SEQUENCE" in lines[i + 1]:
+            name_value = f"{match.group(1)}-Value"
+            print(f"  {name_value}")
+            lines[i] = f"{line.rstrip()} {name_value}\n{name_value} ::=\n"
+            continue
+
+        match = re_seq_of2.search(line)
+        if match:
+            name_value = f"{match.group(1)}-Value"
+            print(f"  {name_value}")
+            line = line.split(" OF SEQUENCE")[0]
+            lines[i] = f"{line} OF {name_value}\n{name_value} ::= SEQUENCE {{\n"
+            continue
+
+    with open(file, "w") as handle:
+        handle.writelines(lines)
+
+
+print("Done")
--- a/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List-Value.h
+++ b/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List-Value.h
@ -0,0 +1,48 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "HNBAP-IEs"
+ * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
+ * 	`asn1c -R -fcompound-names`
+ */
+
+#ifndef	_HNBAP_CriticalityDiagnostics_IE_List_Value_H_
+#define	_HNBAP_CriticalityDiagnostics_IE_List_Value_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/hnbap/HNBAP_Criticality.h>
+#include <osmocom/hnbap/HNBAP_ProtocolIE-ID.h>
+#include <osmocom/hnbap/HNBAP_TypeOfError.h>
+#include <osmocom/hnbap/HNBAP_IE-Extensions.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* HNBAP_CriticalityDiagnostics-IE-List-Value */
+typedef struct HNBAP_CriticalityDiagnostics_IE_List_Value {
+	HNBAP_Criticality_t	 iECriticality;
+	HNBAP_ProtocolIE_ID_t	 iE_ID;
+	HNBAP_TypeOfError_t	 typeOfError;
+	HNBAP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} HNBAP_CriticalityDiagnostics_IE_List_Value_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_HNBAP_CriticalityDiagnostics_IE_List_Value;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _HNBAP_CriticalityDiagnostics_IE_List_Value_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h
+++ b/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h
@ -12,12 +12,8 @@
 #include <asn_application.h>

 /* Including external dependencies */
+#include <osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List-Value.h>
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/hnbap/HNBAP_Criticality.h>
-#include <osmocom/hnbap/HNBAP_ProtocolIE-ID.h>
-#include <osmocom/hnbap/HNBAP_TypeOfError.h>
-#include <osmocom/hnbap/HNBAP_IE-Extensions.h>
-#include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>

 #ifdef __cplusplus
@ -26,19 +22,7 @@ extern "C" {

 /* HNBAP_CriticalityDiagnostics-IE-List */
 typedef struct HNBAP_CriticalityDiagnostics_IE_List {
-	A_SEQUENCE_OF(struct HNBAP_CriticalityDiagnostics_IE_List__Member {
-		HNBAP_Criticality_t	 iECriticality;
-		HNBAP_ProtocolIE_ID_t	 iE_ID;
-		HNBAP_TypeOfError_t	 typeOfError;
-		HNBAP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
-		/*
-		 * This type is extensible,
-		 * possible extensions are below.
-		 */
-		
-		/* Context for parsing across buffer boundaries */
-		asn_struct_ctx_t _asn_ctx;
-	} ) list;
+	A_SEQUENCE_OF(HNBAP_CriticalityDiagnostics_IE_List_Value_t) list;
 	
 	/* Context for parsing across buffer boundaries */
 	asn_struct_ctx_t _asn_ctx;
--- a/include/osmocom/ranap/RANAP_AuthorisedPLMNs-Value.h
+++ b/include/osmocom/ranap/RANAP_AuthorisedPLMNs-Value.h
@ -0,0 +1,46 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "RANAP-IEs"
+ * 	found in "../../asn1/ranap/RANAP-IEs.asn"
+ * 	`asn1c -fcompound-names -R`
+ */
+
+#ifndef	_RANAP_AuthorisedPLMNs_Value_H_
+#define	_RANAP_AuthorisedPLMNs_Value_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_AuthorisedSNAs.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* RANAP_AuthorisedPLMNs-Value */
+typedef struct RANAP_AuthorisedPLMNs_Value {
+	RANAP_PLMNidentity_t	 pLMNidentity;
+	RANAP_AuthorisedSNAs_t	*authorisedSNAsList	/* OPTIONAL */;
+	RANAP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} RANAP_AuthorisedPLMNs_Value_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_RANAP_AuthorisedPLMNs_Value;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _RANAP_AuthorisedPLMNs_Value_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/ranap/RANAP_AuthorisedPLMNs.h
+++ b/include/osmocom/ranap/RANAP_AuthorisedPLMNs.h
@ -12,11 +12,8 @@
 #include <asn_application.h>

 /* Including external dependencies */
+#include <osmocom/ranap/RANAP_AuthorisedPLMNs-Value.h>
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/ranap/RANAP_PLMNidentity.h>
-#include <osmocom/ranap/RANAP_AuthorisedSNAs.h>
-#include <osmocom/ranap/RANAP_IE-Extensions.h>
-#include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>

 #ifdef __cplusplus
@ -25,18 +22,7 @@ extern "C" {

 /* RANAP_AuthorisedPLMNs */
 typedef struct RANAP_AuthorisedPLMNs {
-	A_SEQUENCE_OF(struct RANAP_AuthorisedPLMNs__Member {
-		RANAP_PLMNidentity_t	 pLMNidentity;
-		RANAP_AuthorisedSNAs_t	*authorisedSNAsList	/* OPTIONAL */;
-		RANAP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
-		/*
-		 * This type is extensible,
-		 * possible extensions are below.
-		 */
-		
-		/* Context for parsing across buffer boundaries */
-		asn_struct_ctx_t _asn_ctx;
-	} ) list;
+	A_SEQUENCE_OF(RANAP_AuthorisedPLMNs_Value_t) list;
 	
 	/* Context for parsing across buffer boundaries */
 	asn_struct_ctx_t _asn_ctx;
--- a/include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List-Value.h
+++ b/include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List-Value.h
@ -0,0 +1,48 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "RANAP-IEs"
+ * 	found in "../../asn1/ranap/RANAP-IEs.asn"
+ * 	`asn1c -fcompound-names -R`
+ */
+
+#ifndef	_RANAP_CriticalityDiagnostics_IE_List_Value_H_
+#define	_RANAP_CriticalityDiagnostics_IE_List_Value_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/ranap/RANAP_Criticality.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-ID.h>
+#include <osmocom/ranap/RANAP_RepetitionNumber0.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* RANAP_CriticalityDiagnostics-IE-List-Value */
+typedef struct RANAP_CriticalityDiagnostics_IE_List_Value {
+	RANAP_Criticality_t	 iECriticality;
+	RANAP_ProtocolIE_ID_t	 iE_ID;
+	RANAP_RepetitionNumber0_t	*repetitionNumber	/* OPTIONAL */;
+	RANAP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} RANAP_CriticalityDiagnostics_IE_List_Value_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_RANAP_CriticalityDiagnostics_IE_List_Value;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _RANAP_CriticalityDiagnostics_IE_List_Value_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h
+++ b/include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h
@ -12,12 +12,8 @@
 #include <asn_application.h>

 /* Including external dependencies */
+#include <osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List-Value.h>
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/ranap/RANAP_Criticality.h>
-#include <osmocom/ranap/RANAP_ProtocolIE-ID.h>
-#include <osmocom/ranap/RANAP_RepetitionNumber0.h>
-#include <osmocom/ranap/RANAP_IE-Extensions.h>
-#include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>

 #ifdef __cplusplus
@ -26,19 +22,7 @@ extern "C" {

 /* RANAP_CriticalityDiagnostics-IE-List */
 typedef struct RANAP_CriticalityDiagnostics_IE_List {
-	A_SEQUENCE_OF(struct RANAP_CriticalityDiagnostics_IE_List__Member {
-		RANAP_Criticality_t	 iECriticality;
-		RANAP_ProtocolIE_ID_t	 iE_ID;
-		RANAP_RepetitionNumber0_t	*repetitionNumber	/* OPTIONAL */;
-		RANAP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
-		/*
-		 * This type is extensible,
-		 * possible extensions are below.
-		 */
-		
-		/* Context for parsing across buffer boundaries */
-		asn_struct_ctx_t _asn_ctx;
-	} ) list;
+	A_SEQUENCE_OF(RANAP_CriticalityDiagnostics_IE_List_Value_t) list;
 	
 	/* Context for parsing across buffer boundaries */
 	asn_struct_ctx_t _asn_ctx;
--- a/include/osmocom/ranap/RANAP_DataVolumeList-Value.h
+++ b/include/osmocom/ranap/RANAP_DataVolumeList-Value.h
@ -0,0 +1,46 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "RANAP-PDU"
+ * 	found in "../../asn1/ranap/RANAP-PDU.asn"
+ * 	`asn1c -fcompound-names -R`
+ */
+
+#ifndef	_RANAP_DataVolumeList_Value_H_
+#define	_RANAP_DataVolumeList_Value_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.h>
+#include <osmocom/ranap/RANAP_DataVolumeReference.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* RANAP_DataVolumeList-Value */
+typedef struct RANAP_DataVolumeList_Value {
+	RANAP_UnsuccessfullyTransmittedDataVolume_t	 dl_UnsuccessfullyTransmittedDataVolume;
+	RANAP_DataVolumeReference_t	*dataVolumeReference	/* OPTIONAL */;
+	RANAP_ProtocolExtensionContainer_t	*iE_Extensions	/* OPTIONAL */;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} RANAP_DataVolumeList_Value_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_RANAP_DataVolumeList_Value;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _RANAP_DataVolumeList_Value_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/ranap/RANAP_DataVolumeList.h
+++ b/include/osmocom/ranap/RANAP_DataVolumeList.h
@ -12,11 +12,8 @@
 #include <asn_application.h>

 /* Including external dependencies */
+#include <osmocom/ranap/RANAP_DataVolumeList-Value.h>
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.h>
-#include <osmocom/ranap/RANAP_DataVolumeReference.h>
-#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
-#include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>

 #ifdef __cplusplus
@ -25,18 +22,7 @@ extern "C" {

 /* RANAP_DataVolumeList */
 typedef struct RANAP_DataVolumeList {
-	A_SEQUENCE_OF(struct RANAP_DataVolumeList__Member {
-		RANAP_UnsuccessfullyTransmittedDataVolume_t	 dl_UnsuccessfullyTransmittedDataVolume;
-		RANAP_DataVolumeReference_t	*dataVolumeReference	/* OPTIONAL */;
-		RANAP_ProtocolExtensionContainer_t	*iE_Extensions	/* OPTIONAL */;
-		/*
-		 * This type is extensible,
-		 * possible extensions are below.
-		 */
-		
-		/* Context for parsing across buffer boundaries */
-		asn_struct_ctx_t _asn_ctx;
-	} ) list;
+	A_SEQUENCE_OF(RANAP_DataVolumeList_Value_t) list;
 	
 	/* Context for parsing across buffer boundaries */
 	asn_struct_ctx_t _asn_ctx;
--- a/include/osmocom/ranap/RANAP_EUTRANFrequencies-Value.h
+++ b/include/osmocom/ranap/RANAP_EUTRANFrequencies-Value.h
@ -0,0 +1,42 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "RANAP-IEs"
+ * 	found in "../../asn1/ranap/RANAP-IEs.asn"
+ * 	`asn1c -fcompound-names -R`
+ */
+
+#ifndef	_RANAP_EUTRANFrequencies_Value_H_
+#define	_RANAP_EUTRANFrequencies_Value_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <NativeInteger.h>
+#include <osmocom/ranap/RANAP_MeasBand.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* RANAP_EUTRANFrequencies-Value */
+typedef struct RANAP_EUTRANFrequencies_Value {
+	long	 earfcn;
+	RANAP_MeasBand_t	*measBand	/* OPTIONAL */;
+	RANAP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} RANAP_EUTRANFrequencies_Value_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_RANAP_EUTRANFrequencies_Value;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _RANAP_EUTRANFrequencies_Value_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/ranap/RANAP_EUTRANFrequencies.h
+++ b/include/osmocom/ranap/RANAP_EUTRANFrequencies.h
@ -12,11 +12,8 @@
 #include <asn_application.h>

 /* Including external dependencies */
+#include <osmocom/ranap/RANAP_EUTRANFrequencies-Value.h>
 #include <asn_SEQUENCE_OF.h>
-#include <NativeInteger.h>
-#include <osmocom/ranap/RANAP_MeasBand.h>
-#include <osmocom/ranap/RANAP_IE-Extensions.h>
-#include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>

 #ifdef __cplusplus
@ -25,14 +22,7 @@ extern "C" {

 /* RANAP_EUTRANFrequencies */
 typedef struct RANAP_EUTRANFrequencies {
-	A_SEQUENCE_OF(struct RANAP_EUTRANFrequencies__Member {
-		long	 earfcn;
-		RANAP_MeasBand_t	*measBand	/* OPTIONAL */;
-		RANAP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
-		
-		/* Context for parsing across buffer boundaries */
-		asn_struct_ctx_t _asn_ctx;
-	} ) list;
+	A_SEQUENCE_OF(RANAP_EUTRANFrequencies_Value_t) list;
 	
 	/* Context for parsing across buffer boundaries */
 	asn_struct_ctx_t _asn_ctx;
--- a/include/osmocom/ranap/RANAP_GA-Polygon-Value.h
+++ b/include/osmocom/ranap/RANAP_GA-Polygon-Value.h
@ -0,0 +1,44 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "RANAP-IEs"
+ * 	found in "../../asn1/ranap/RANAP-IEs.asn"
+ * 	`asn1c -fcompound-names -R`
+ */
+
+#ifndef	_RANAP_GA_Polygon_Value_H_
+#define	_RANAP_GA_Polygon_Value_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/ranap/RANAP_GeographicalCoordinates.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* RANAP_GA-Polygon-Value */
+typedef struct RANAP_GA_Polygon_Value {
+	RANAP_GeographicalCoordinates_t	 geographicalCoordinates;
+	RANAP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} RANAP_GA_Polygon_Value_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_RANAP_GA_Polygon_Value;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _RANAP_GA_Polygon_Value_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/ranap/RANAP_GA-Polygon.h
+++ b/include/osmocom/ranap/RANAP_GA-Polygon.h
@ -12,10 +12,8 @@
 #include <asn_application.h>

 /* Including external dependencies */
+#include <osmocom/ranap/RANAP_GA-Polygon-Value.h>
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/ranap/RANAP_GeographicalCoordinates.h>
-#include <osmocom/ranap/RANAP_IE-Extensions.h>
-#include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>

 #ifdef __cplusplus
@ -24,17 +22,7 @@ extern "C" {

 /* RANAP_GA-Polygon */
 typedef struct RANAP_GA_Polygon {
-	A_SEQUENCE_OF(struct RANAP_GA_Polygon__Member {
-		RANAP_GeographicalCoordinates_t	 geographicalCoordinates;
-		RANAP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
-		/*
-		 * This type is extensible,
-		 * possible extensions are below.
-		 */
-		
-		/* Context for parsing across buffer boundaries */
-		asn_struct_ctx_t _asn_ctx;
-	} ) list;
+	A_SEQUENCE_OF(RANAP_GA_Polygon_Value_t) list;
 	
 	/* Context for parsing across buffer boundaries */
 	asn_struct_ctx_t _asn_ctx;
--- a/include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs-Value.h
+++ b/include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs-Value.h
@ -0,0 +1,46 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "RANAP-PDU"
+ * 	found in "../../asn1/ranap/RANAP-PDU.asn"
+ * 	`asn1c -fcompound-names -R`
+ */
+
+#ifndef	_RANAP_JoinedMBMSBearerService_IEs_Value_H_
+#define	_RANAP_JoinedMBMSBearerService_IEs_Value_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/ranap/RANAP_TMGI.h>
+#include <osmocom/ranap/RANAP_MBMS-PTP-RAB-ID.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* RANAP_JoinedMBMSBearerService-IEs-Value */
+typedef struct RANAP_JoinedMBMSBearerService_IEs_Value {
+	RANAP_TMGI_t	 tMGI;
+	RANAP_MBMS_PTP_RAB_ID_t	 mBMS_PTP_RAB_ID;
+	RANAP_ProtocolExtensionContainer_t	*iE_Extensions	/* OPTIONAL */;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} RANAP_JoinedMBMSBearerService_IEs_Value_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_RANAP_JoinedMBMSBearerService_IEs_Value;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _RANAP_JoinedMBMSBearerService_IEs_Value_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h
+++ b/include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h
@ -12,11 +12,8 @@
 #include <asn_application.h>

 /* Including external dependencies */
+#include <osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs-Value.h>
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/ranap/RANAP_TMGI.h>
-#include <osmocom/ranap/RANAP_MBMS-PTP-RAB-ID.h>
-#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
-#include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>

 #ifdef __cplusplus
@ -25,18 +22,7 @@ extern "C" {

 /* RANAP_JoinedMBMSBearerService-IEs */
 typedef struct RANAP_JoinedMBMSBearerService_IEs {
-	A_SEQUENCE_OF(struct RANAP_JoinedMBMSBearerService_IEs__Member {
-		RANAP_TMGI_t	 tMGI;
-		RANAP_MBMS_PTP_RAB_ID_t	 mBMS_PTP_RAB_ID;
-		RANAP_ProtocolExtensionContainer_t	*iE_Extensions	/* OPTIONAL */;
-		/*
-		 * This type is extensible,
-		 * possible extensions are below.
-		 */
-		
-		/* Context for parsing across buffer boundaries */
-		asn_struct_ctx_t _asn_ctx;
-	} ) list;
+	A_SEQUENCE_OF(RANAP_JoinedMBMSBearerService_IEs_Value_t) list;
 	
 	/* Context for parsing across buffer boundaries */
 	asn_struct_ctx_t _asn_ctx;
--- a/include/osmocom/ranap/RANAP_LA-LIST-Value.h
+++ b/include/osmocom/ranap/RANAP_LA-LIST-Value.h
@ -0,0 +1,46 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "RANAP-IEs"
+ * 	found in "../../asn1/ranap/RANAP-IEs.asn"
+ * 	`asn1c -fcompound-names -R`
+ */
+
+#ifndef	_RANAP_LA_LIST_Value_H_
+#define	_RANAP_LA_LIST_Value_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/ranap/RANAP_LAC.h>
+#include <osmocom/ranap/RANAP_ListOF-SNAs.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* RANAP_LA-LIST-Value */
+typedef struct RANAP_LA_LIST_Value {
+	RANAP_LAC_t	 lAC;
+	RANAP_ListOF_SNAs_t	 listOF_SNAs;
+	RANAP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} RANAP_LA_LIST_Value_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_RANAP_LA_LIST_Value;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _RANAP_LA_LIST_Value_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/ranap/RANAP_LA-LIST.h
+++ b/include/osmocom/ranap/RANAP_LA-LIST.h
@ -12,11 +12,8 @@
 #include <asn_application.h>

 /* Including external dependencies */
+#include <osmocom/ranap/RANAP_LA-LIST-Value.h>
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/ranap/RANAP_LAC.h>
-#include <osmocom/ranap/RANAP_ListOF-SNAs.h>
-#include <osmocom/ranap/RANAP_IE-Extensions.h>
-#include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>

 #ifdef __cplusplus
@ -25,18 +22,7 @@ extern "C" {

 /* RANAP_LA-LIST */
 typedef struct RANAP_LA_LIST {
-	A_SEQUENCE_OF(struct RANAP_LA_LIST__Member {
-		RANAP_LAC_t	 lAC;
-		RANAP_ListOF_SNAs_t	 listOF_SNAs;
-		RANAP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
-		/*
-		 * This type is extensible,
-		 * possible extensions are below.
-		 */
-		
-		/* Context for parsing across buffer boundaries */
-		asn_struct_ctx_t _asn_ctx;
-	} ) list;
+	A_SEQUENCE_OF(RANAP_LA_LIST_Value_t) list;
 	
 	/* Context for parsing across buffer boundaries */
 	asn_struct_ctx_t _asn_ctx;
--- a/include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs-Value.h
+++ b/include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs-Value.h
@ -0,0 +1,44 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "RANAP-PDU"
+ * 	found in "../../asn1/ranap/RANAP-PDU.asn"
+ * 	`asn1c -fcompound-names -R`
+ */
+
+#ifndef	_RANAP_LeftMBMSBearerService_IEs_Value_H_
+#define	_RANAP_LeftMBMSBearerService_IEs_Value_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/ranap/RANAP_TMGI.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* RANAP_LeftMBMSBearerService-IEs-Value */
+typedef struct RANAP_LeftMBMSBearerService_IEs_Value {
+	RANAP_TMGI_t	 tMGI;
+	RANAP_ProtocolExtensionContainer_t	*iE_Extensions	/* OPTIONAL */;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} RANAP_LeftMBMSBearerService_IEs_Value_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_RANAP_LeftMBMSBearerService_IEs_Value;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _RANAP_LeftMBMSBearerService_IEs_Value_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h
+++ b/include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h
@ -12,10 +12,8 @@
 #include <asn_application.h>

 /* Including external dependencies */
+#include <osmocom/ranap/RANAP_LeftMBMSBearerService-IEs-Value.h>
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/ranap/RANAP_TMGI.h>
-#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
-#include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>

 #ifdef __cplusplus
@ -24,17 +22,7 @@ extern "C" {

 /* RANAP_LeftMBMSBearerService-IEs */
 typedef struct RANAP_LeftMBMSBearerService_IEs {
-	A_SEQUENCE_OF(struct RANAP_LeftMBMSBearerService_IEs__Member {
-		RANAP_TMGI_t	 tMGI;
-		RANAP_ProtocolExtensionContainer_t	*iE_Extensions	/* OPTIONAL */;
-		/*
-		 * This type is extensible,
-		 * possible extensions are below.
-		 */
-		
-		/* Context for parsing across buffer boundaries */
-		asn_struct_ctx_t _asn_ctx;
-	} ) list;
+	A_SEQUENCE_OF(RANAP_LeftMBMSBearerService_IEs_Value_t) list;
 	
 	/* Context for parsing across buffer boundaries */
 	asn_struct_ctx_t _asn_ctx;
--- a/include/osmocom/ranap/RANAP_MessageStructure-Value.h
+++ b/include/osmocom/ranap/RANAP_MessageStructure-Value.h
@ -0,0 +1,46 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "RANAP-IEs"
+ * 	found in "../../asn1/ranap/RANAP-IEs.asn"
+ * 	`asn1c -fcompound-names -R`
+ */
+
+#ifndef	_RANAP_MessageStructure_Value_H_
+#define	_RANAP_MessageStructure_Value_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/ranap/RANAP_ProtocolIE-ID.h>
+#include <osmocom/ranap/RANAP_RepetitionNumber1.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* RANAP_MessageStructure-Value */
+typedef struct RANAP_MessageStructure_Value {
+	RANAP_ProtocolIE_ID_t	 iE_ID;
+	RANAP_RepetitionNumber1_t	*repetitionNumber	/* OPTIONAL */;
+	RANAP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} RANAP_MessageStructure_Value_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_RANAP_MessageStructure_Value;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _RANAP_MessageStructure_Value_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/ranap/RANAP_MessageStructure.h
+++ b/include/osmocom/ranap/RANAP_MessageStructure.h
@ -12,11 +12,8 @@
 #include <asn_application.h>

 /* Including external dependencies */
+#include <osmocom/ranap/RANAP_MessageStructure-Value.h>
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/ranap/RANAP_ProtocolIE-ID.h>
-#include <osmocom/ranap/RANAP_RepetitionNumber1.h>
-#include <osmocom/ranap/RANAP_IE-Extensions.h>
-#include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>

 #ifdef __cplusplus
@ -25,18 +22,7 @@ extern "C" {

 /* RANAP_MessageStructure */
 typedef struct RANAP_MessageStructure {
-	A_SEQUENCE_OF(struct RANAP_MessageStructure__Member {
-		RANAP_ProtocolIE_ID_t	 iE_ID;
-		RANAP_RepetitionNumber1_t	*repetitionNumber	/* OPTIONAL */;
-		RANAP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
-		/*
-		 * This type is extensible,
-		 * possible extensions are below.
-		 */
-		
-		/* Context for parsing across buffer boundaries */
-		asn_struct_ctx_t _asn_ctx;
-	} ) list;
+	A_SEQUENCE_OF(RANAP_MessageStructure_Value_t) list;
 	
 	/* Context for parsing across buffer boundaries */
 	asn_struct_ctx_t _asn_ctx;
--- a/include/osmocom/ranap/RANAP_PLMNs-in-shared-network-Value.h
+++ b/include/osmocom/ranap/RANAP_PLMNs-in-shared-network-Value.h
@ -0,0 +1,46 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "RANAP-IEs"
+ * 	found in "../../asn1/ranap/RANAP-IEs.asn"
+ * 	`asn1c -fcompound-names -R`
+ */
+
+#ifndef	_RANAP_PLMNs_in_shared_network_Value_H_
+#define	_RANAP_PLMNs_in_shared_network_Value_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_LA-LIST.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* RANAP_PLMNs-in-shared-network-Value */
+typedef struct RANAP_PLMNs_in_shared_network_Value {
+	RANAP_PLMNidentity_t	 pLMNidentity;
+	RANAP_LA_LIST_t	 lA_LIST;
+	RANAP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} RANAP_PLMNs_in_shared_network_Value_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_RANAP_PLMNs_in_shared_network_Value;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _RANAP_PLMNs_in_shared_network_Value_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h
+++ b/include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h
@ -12,11 +12,8 @@
 #include <asn_application.h>

 /* Including external dependencies */
+#include <osmocom/ranap/RANAP_PLMNs-in-shared-network-Value.h>
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/ranap/RANAP_PLMNidentity.h>
-#include <osmocom/ranap/RANAP_LA-LIST.h>
-#include <osmocom/ranap/RANAP_IE-Extensions.h>
-#include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>

 #ifdef __cplusplus
@ -25,18 +22,7 @@ extern "C" {

 /* RANAP_PLMNs-in-shared-network */
 typedef struct RANAP_PLMNs_in_shared_network {
-	A_SEQUENCE_OF(struct RANAP_PLMNs_in_shared_network__Member {
-		RANAP_PLMNidentity_t	 pLMNidentity;
-		RANAP_LA_LIST_t	 lA_LIST;
-		RANAP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
-		/*
-		 * This type is extensible,
-		 * possible extensions are below.
-		 */
-		
-		/* Context for parsing across buffer boundaries */
-		asn_struct_ctx_t _asn_ctx;
-	} ) list;
+	A_SEQUENCE_OF(RANAP_PLMNs_in_shared_network_Value_t) list;
 	
 	/* Context for parsing across buffer boundaries */
 	asn_struct_ctx_t _asn_ctx;
--- a/include/osmocom/ranap/RANAP_RABDataVolumeReport-Value.h
+++ b/include/osmocom/ranap/RANAP_RABDataVolumeReport-Value.h
@ -0,0 +1,46 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "RANAP-IEs"
+ * 	found in "../../asn1/ranap/RANAP-IEs.asn"
+ * 	`asn1c -fcompound-names -R`
+ */
+
+#ifndef	_RANAP_RABDataVolumeReport_Value_H_
+#define	_RANAP_RABDataVolumeReport_Value_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.h>
+#include <osmocom/ranap/RANAP_DataVolumeReference.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* RANAP_RABDataVolumeReport-Value */
+typedef struct RANAP_RABDataVolumeReport_Value {
+	RANAP_UnsuccessfullyTransmittedDataVolume_t	 dl_UnsuccessfullyTransmittedDataVolume;
+	RANAP_DataVolumeReference_t	*dataVolumeReference	/* OPTIONAL */;
+	RANAP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} RANAP_RABDataVolumeReport_Value_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_RANAP_RABDataVolumeReport_Value;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _RANAP_RABDataVolumeReport_Value_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/ranap/RANAP_RABDataVolumeReport.h
+++ b/include/osmocom/ranap/RANAP_RABDataVolumeReport.h
@ -12,11 +12,8 @@
 #include <asn_application.h>

 /* Including external dependencies */
+#include <osmocom/ranap/RANAP_RABDataVolumeReport-Value.h>
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.h>
-#include <osmocom/ranap/RANAP_DataVolumeReference.h>
-#include <osmocom/ranap/RANAP_IE-Extensions.h>
-#include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>

 #ifdef __cplusplus
@ -25,18 +22,7 @@ extern "C" {

 /* RANAP_RABDataVolumeReport */
 typedef struct RANAP_RABDataVolumeReport {
-	A_SEQUENCE_OF(struct RANAP_RABDataVolumeReport__Member {
-		RANAP_UnsuccessfullyTransmittedDataVolume_t	 dl_UnsuccessfullyTransmittedDataVolume;
-		RANAP_DataVolumeReference_t	*dataVolumeReference	/* OPTIONAL */;
-		RANAP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
-		/*
-		 * This type is extensible,
-		 * possible extensions are below.
-		 */
-		
-		/* Context for parsing across buffer boundaries */
-		asn_struct_ctx_t _asn_ctx;
-	} ) list;
+	A_SEQUENCE_OF(RANAP_RABDataVolumeReport_Value_t) list;
 	
 	/* Context for parsing across buffer boundaries */
 	asn_struct_ctx_t _asn_ctx;
--- a/include/osmocom/ranap/RANAP_RABParametersList-Value.h
+++ b/include/osmocom/ranap/RANAP_RABParametersList-Value.h
@ -0,0 +1,50 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "RANAP-IEs"
+ * 	found in "../../asn1/ranap/RANAP-IEs.asn"
+ * 	`asn1c -fcompound-names -R`
+ */
+
+#ifndef	_RANAP_RABParametersList_Value_H_
+#define	_RANAP_RABParametersList_Value_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_CN-DomainIndicator.h>
+#include <osmocom/ranap/RANAP_RABDataVolumeReport.h>
+#include <osmocom/ranap/RANAP_UPInformation.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* RANAP_RABParametersList-Value */
+typedef struct RANAP_RABParametersList_Value {
+	RANAP_RAB_ID_t	 rab_Id;
+	RANAP_CN_DomainIndicator_t	 cn_domain;
+	RANAP_RABDataVolumeReport_t	*rabDataVolumeReport	/* OPTIONAL */;
+	RANAP_UPInformation_t	*upInformation	/* OPTIONAL */;
+	RANAP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} RANAP_RABParametersList_Value_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_RANAP_RABParametersList_Value;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _RANAP_RABParametersList_Value_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/ranap/RANAP_RABParametersList.h
+++ b/include/osmocom/ranap/RANAP_RABParametersList.h
@ -12,13 +12,8 @@
 #include <asn_application.h>

 /* Including external dependencies */
+#include <osmocom/ranap/RANAP_RABParametersList-Value.h>
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/ranap/RANAP_RAB-ID.h>
-#include <osmocom/ranap/RANAP_CN-DomainIndicator.h>
-#include <osmocom/ranap/RANAP_RABDataVolumeReport.h>
-#include <osmocom/ranap/RANAP_UPInformation.h>
-#include <osmocom/ranap/RANAP_IE-Extensions.h>
-#include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>

 #ifdef __cplusplus
@ -27,20 +22,7 @@ extern "C" {

 /* RANAP_RABParametersList */
 typedef struct RANAP_RABParametersList {
-	A_SEQUENCE_OF(struct RANAP_RABParametersList__Member {
-		RANAP_RAB_ID_t	 rab_Id;
-		RANAP_CN_DomainIndicator_t	 cn_domain;
-		RANAP_RABDataVolumeReport_t	*rabDataVolumeReport	/* OPTIONAL */;
-		RANAP_UPInformation_t	*upInformation	/* OPTIONAL */;
-		RANAP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
-		/*
-		 * This type is extensible,
-		 * possible extensions are below.
-		 */
-		
-		/* Context for parsing across buffer boundaries */
-		asn_struct_ctx_t _asn_ctx;
-	} ) list;
+	A_SEQUENCE_OF(RANAP_RABParametersList_Value_t) list;
 	
 	/* Context for parsing across buffer boundaries */
 	asn_struct_ctx_t _asn_ctx;
--- a/include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs-Value.h
+++ b/include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs-Value.h
@ -0,0 +1,46 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "RANAP-PDU"
+ * 	found in "../../asn1/ranap/RANAP-PDU.asn"
+ * 	`asn1c -fcompound-names -R`
+ */
+
+#ifndef	_RANAP_UnsuccessfulLinking_IEs_Value_H_
+#define	_RANAP_UnsuccessfulLinking_IEs_Value_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/ranap/RANAP_TMGI.h>
+#include <osmocom/ranap/RANAP_Cause.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* RANAP_UnsuccessfulLinking-IEs-Value */
+typedef struct RANAP_UnsuccessfulLinking_IEs_Value {
+	RANAP_TMGI_t	 tMGI;
+	RANAP_Cause_t	 cause;
+	RANAP_ProtocolExtensionContainer_t	*iE_Extensions	/* OPTIONAL */;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} RANAP_UnsuccessfulLinking_IEs_Value_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_RANAP_UnsuccessfulLinking_IEs_Value;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _RANAP_UnsuccessfulLinking_IEs_Value_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h
+++ b/include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h
@ -12,11 +12,8 @@
 #include <asn_application.h>

 /* Including external dependencies */
+#include <osmocom/ranap/RANAP_UnsuccessfulLinking-IEs-Value.h>
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/ranap/RANAP_TMGI.h>
-#include <osmocom/ranap/RANAP_Cause.h>
-#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
-#include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>

 #ifdef __cplusplus
@ -25,18 +22,7 @@ extern "C" {

 /* RANAP_UnsuccessfulLinking-IEs */
 typedef struct RANAP_UnsuccessfulLinking_IEs {
-	A_SEQUENCE_OF(struct RANAP_UnsuccessfulLinking_IEs__Member {
-		RANAP_TMGI_t	 tMGI;
-		RANAP_Cause_t	 cause;
-		RANAP_ProtocolExtensionContainer_t	*iE_Extensions	/* OPTIONAL */;
-		/*
-		 * This type is extensible,
-		 * possible extensions are below.
-		 */
-		
-		/* Context for parsing across buffer boundaries */
-		asn_struct_ctx_t _asn_ctx;
-	} ) list;
+	A_SEQUENCE_OF(RANAP_UnsuccessfulLinking_IEs_Value_t) list;
 	
 	/* Context for parsing across buffer boundaries */
 	asn_struct_ctx_t _asn_ctx;
--- a/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List-Value.h
+++ b/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List-Value.h
@ -0,0 +1,48 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "RUA-IEs"
+ * 	found in "../../asn1/rua/RUA-IEs.asn"
+ * 	`asn1c -R -fcompound-names`
+ */
+
+#ifndef	_RUA_CriticalityDiagnostics_IE_List_Value_H_
+#define	_RUA_CriticalityDiagnostics_IE_List_Value_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/rua/RUA_Criticality.h>
+#include <osmocom/rua/RUA_ProtocolIE-ID.h>
+#include <osmocom/rua/RUA_TypeOfError.h>
+#include <osmocom/rua/RUA_IE-Extensions.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* RUA_CriticalityDiagnostics-IE-List-Value */
+typedef struct RUA_CriticalityDiagnostics_IE_List_Value {
+	RUA_Criticality_t	 iECriticality;
+	RUA_ProtocolIE_ID_t	 iE_ID;
+	RUA_TypeOfError_t	 typeOfError;
+	RUA_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} RUA_CriticalityDiagnostics_IE_List_Value_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_RUA_CriticalityDiagnostics_IE_List_Value;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _RUA_CriticalityDiagnostics_IE_List_Value_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h
+++ b/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h
@ -12,12 +12,8 @@
 #include <asn_application.h>

 /* Including external dependencies */
+#include <osmocom/rua/RUA_CriticalityDiagnostics-IE-List-Value.h>
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/rua/RUA_Criticality.h>
-#include <osmocom/rua/RUA_ProtocolIE-ID.h>
-#include <osmocom/rua/RUA_TypeOfError.h>
-#include <osmocom/rua/RUA_IE-Extensions.h>
-#include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>

 #ifdef __cplusplus
@ -26,19 +22,7 @@ extern "C" {

 /* RUA_CriticalityDiagnostics-IE-List */
 typedef struct RUA_CriticalityDiagnostics_IE_List {
-	A_SEQUENCE_OF(struct RUA_CriticalityDiagnostics_IE_List__Member {
-		RUA_Criticality_t	 iECriticality;
-		RUA_ProtocolIE_ID_t	 iE_ID;
-		RUA_TypeOfError_t	 typeOfError;
-		RUA_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
-		/*
-		 * This type is extensible,
-		 * possible extensions are below.
-		 */
-		
-		/* Context for parsing across buffer boundaries */
-		asn_struct_ctx_t _asn_ctx;
-	} ) list;
+	A_SEQUENCE_OF(RUA_CriticalityDiagnostics_IE_List_Value_t) list;
 	
 	/* Context for parsing across buffer boundaries */
 	asn_struct_ctx_t _asn_ctx;
--- a/include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List-Value.h
+++ b/include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List-Value.h
@ -0,0 +1,48 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "SABP-IEs"
+ * 	found in "../../asn1/sabp/SABP-IEs.asn"
+ * 	`asn1c -R -fcompound-names`
+ */
+
+#ifndef	_SABP_CriticalityDiagnostics_IE_List_Value_H_
+#define	_SABP_CriticalityDiagnostics_IE_List_Value_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/sabp/SABP_Criticality.h>
+#include <osmocom/sabp/SABP_ProtocolIE-ID.h>
+#include <osmocom/sabp/SABP_RepetitionNumber0.h>
+#include <osmocom/sabp/SABP_IE-Extensions.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* SABP_CriticalityDiagnostics-IE-List-Value */
+typedef struct SABP_CriticalityDiagnostics_IE_List_Value {
+	SABP_Criticality_t	 iECriticality;
+	SABP_ProtocolIE_ID_t	 iE_ID;
+	SABP_RepetitionNumber0_t	*repetitionNumber	/* OPTIONAL */;
+	SABP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SABP_CriticalityDiagnostics_IE_List_Value_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SABP_CriticalityDiagnostics_IE_List_Value;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _SABP_CriticalityDiagnostics_IE_List_Value_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List.h
+++ b/include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List.h
@ -12,12 +12,8 @@
 #include <asn_application.h>

 /* Including external dependencies */
+#include <osmocom/sabp/SABP_CriticalityDiagnostics-IE-List-Value.h>
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/sabp/SABP_Criticality.h>
-#include <osmocom/sabp/SABP_ProtocolIE-ID.h>
-#include <osmocom/sabp/SABP_RepetitionNumber0.h>
-#include <osmocom/sabp/SABP_IE-Extensions.h>
-#include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>

 #ifdef __cplusplus
@ -26,19 +22,7 @@ extern "C" {

 /* SABP_CriticalityDiagnostics-IE-List */
 typedef struct SABP_CriticalityDiagnostics_IE_List {
-	A_SEQUENCE_OF(struct SABP_CriticalityDiagnostics_IE_List__Member {
-		SABP_Criticality_t	 iECriticality;
-		SABP_ProtocolIE_ID_t	 iE_ID;
-		SABP_RepetitionNumber0_t	*repetitionNumber	/* OPTIONAL */;
-		SABP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
-		/*
-		 * This type is extensible,
-		 * possible extensions are below.
-		 */
-		
-		/* Context for parsing across buffer boundaries */
-		asn_struct_ctx_t _asn_ctx;
-	} ) list;
+	A_SEQUENCE_OF(SABP_CriticalityDiagnostics_IE_List_Value_t) list;
 	
 	/* Context for parsing across buffer boundaries */
 	asn_struct_ctx_t _asn_ctx;
--- a/include/osmocom/sabp/SABP_MessageStructure-Value.h
+++ b/include/osmocom/sabp/SABP_MessageStructure-Value.h
@ -0,0 +1,46 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "SABP-IEs"
+ * 	found in "../../asn1/sabp/SABP-IEs.asn"
+ * 	`asn1c -R -fcompound-names`
+ */
+
+#ifndef	_SABP_MessageStructure_Value_H_
+#define	_SABP_MessageStructure_Value_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/sabp/SABP_ProtocolIE-ID.h>
+#include <osmocom/sabp/SABP_RepetitionNumber1.h>
+#include <osmocom/sabp/SABP_IE-Extensions.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* SABP_MessageStructure-Value */
+typedef struct SABP_MessageStructure_Value {
+	SABP_ProtocolIE_ID_t	 iE_ID;
+	SABP_RepetitionNumber1_t	*repetitionNumber	/* OPTIONAL */;
+	SABP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SABP_MessageStructure_Value_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SABP_MessageStructure_Value;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _SABP_MessageStructure_Value_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sabp/SABP_MessageStructure.h
+++ b/include/osmocom/sabp/SABP_MessageStructure.h
@ -12,11 +12,8 @@
 #include <asn_application.h>

 /* Including external dependencies */
+#include <osmocom/sabp/SABP_MessageStructure-Value.h>
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/sabp/SABP_ProtocolIE-ID.h>
-#include <osmocom/sabp/SABP_RepetitionNumber1.h>
-#include <osmocom/sabp/SABP_IE-Extensions.h>
-#include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>

 #ifdef __cplusplus
@ -25,18 +22,7 @@ extern "C" {

 /* SABP_MessageStructure */
 typedef struct SABP_MessageStructure {
-	A_SEQUENCE_OF(struct SABP_MessageStructure__Member {
-		SABP_ProtocolIE_ID_t	 iE_ID;
-		SABP_RepetitionNumber1_t	*repetitionNumber	/* OPTIONAL */;
-		SABP_IE_Extensions_t	*iE_Extensions	/* OPTIONAL */;
-		/*
-		 * This type is extensible,
-		 * possible extensions are below.
-		 */
-		
-		/* Context for parsing across buffer boundaries */
-		asn_struct_ctx_t _asn_ctx;
-	} ) list;
+	A_SEQUENCE_OF(SABP_MessageStructure_Value_t) list;
 	
 	/* Context for parsing across buffer boundaries */
 	asn_struct_ctx_t _asn_ctx;
--- a/src/hnbap/HNBAP_CriticalityDiagnostics-IE-List-Value.c
+++ b/src/hnbap/HNBAP_CriticalityDiagnostics-IE-List-Value.c
@ -0,0 +1,94 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "HNBAP-IEs"
+ * 	found in "../../asn1/hnbap/HNBAP-IEs.asn"
+ * 	`asn1c -R -fcompound-names`
+ */
+
+#include <osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List-Value.h>
+
+static asn_TYPE_member_t asn_MBR_HNBAP_CriticalityDiagnostics_IE_List_Value_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct HNBAP_CriticalityDiagnostics_IE_List_Value, iECriticality),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_HNBAP_Criticality,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"iECriticality"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct HNBAP_CriticalityDiagnostics_IE_List_Value, iE_ID),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_HNBAP_ProtocolIE_ID,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"iE-ID"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct HNBAP_CriticalityDiagnostics_IE_List_Value, typeOfError),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_HNBAP_TypeOfError,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"typeOfError"
+		},
+	{ ATF_POINTER, 1, offsetof(struct HNBAP_CriticalityDiagnostics_IE_List_Value, iE_Extensions),
+		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_HNBAP_IE_Extensions,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"iE-Extensions"
+		},
+};
+static const int asn_MAP_HNBAP_CriticalityDiagnostics_IE_List_Value_oms_1[] = { 3 };
+static const ber_tlv_tag_t asn_DEF_HNBAP_CriticalityDiagnostics_IE_List_Value_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_HNBAP_CriticalityDiagnostics_IE_List_Value_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* iECriticality */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* iE-ID */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* typeOfError */
+    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* iE-Extensions */
+};
+static asn_SEQUENCE_specifics_t asn_SPC_HNBAP_CriticalityDiagnostics_IE_List_Value_specs_1 = {
+	sizeof(struct HNBAP_CriticalityDiagnostics_IE_List_Value),
+	offsetof(struct HNBAP_CriticalityDiagnostics_IE_List_Value, _asn_ctx),
+	asn_MAP_HNBAP_CriticalityDiagnostics_IE_List_Value_tag2el_1,
+	4,	/* Count of tags in the map */
+	asn_MAP_HNBAP_CriticalityDiagnostics_IE_List_Value_oms_1,	/* Optional members */
+	1, 0,	/* Root/Additions */
+	3,	/* Start extensions */
+	5	/* Stop extensions */
+};
+asn_TYPE_descriptor_t asn_DEF_HNBAP_CriticalityDiagnostics_IE_List_Value = {
+	"HNBAP_CriticalityDiagnostics-IE-List-Value",
+	"HNBAP_CriticalityDiagnostics-IE-List-Value",
+	SEQUENCE_free,
+	SEQUENCE_print,
+	SEQUENCE_constraint,
+	SEQUENCE_decode_ber,
+	SEQUENCE_encode_der,
+	SEQUENCE_decode_xer,
+	SEQUENCE_encode_xer,
+	SEQUENCE_decode_uper,
+	SEQUENCE_encode_uper,
+	SEQUENCE_decode_aper,
+	SEQUENCE_encode_aper,
+	0,	/* Use generic outmost tag fetcher */
+	asn_DEF_HNBAP_CriticalityDiagnostics_IE_List_Value_tags_1,
+	sizeof(asn_DEF_HNBAP_CriticalityDiagnostics_IE_List_Value_tags_1)
+		/sizeof(asn_DEF_HNBAP_CriticalityDiagnostics_IE_List_Value_tags_1[0]), /* 1 */
+	asn_DEF_HNBAP_CriticalityDiagnostics_IE_List_Value_tags_1,	/* Same as above */
+	sizeof(asn_DEF_HNBAP_CriticalityDiagnostics_IE_List_Value_tags_1)
+		/sizeof(asn_DEF_HNBAP_CriticalityDiagnostics_IE_List_Value_tags_1[0]), /* 1 */
+	0,	/* No PER visible constraints */
+	asn_MBR_HNBAP_CriticalityDiagnostics_IE_List_Value_1,
+	4,	/* Elements count */
+	&asn_SPC_HNBAP_CriticalityDiagnostics_IE_List_Value_specs_1	/* Additional specs */
+};
+
--- a/src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c
+++ b/src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c
@ -12,97 +12,11 @@ static asn_per_constraints_t asn_PER_type_HNBAP_CriticalityDiagnostics_IE_List_c
 	{ APC_CONSTRAINED,	 8,  8,  1l,  256l }	/* (SIZE(1..256)) */,
 	0, 0	/* No PER value map */
 };
-static asn_TYPE_member_t asn_MBR_Member_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct HNBAP_CriticalityDiagnostics_IE_List__Member, iECriticality),
-		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_HNBAP_Criticality,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"iECriticality"
-		},
-	{ ATF_NOFLAGS, 0, offsetof(struct HNBAP_CriticalityDiagnostics_IE_List__Member, iE_ID),
-		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_HNBAP_ProtocolIE_ID,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"iE-ID"
-		},
-	{ ATF_NOFLAGS, 0, offsetof(struct HNBAP_CriticalityDiagnostics_IE_List__Member, typeOfError),
-		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_HNBAP_TypeOfError,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"typeOfError"
-		},
-	{ ATF_POINTER, 1, offsetof(struct HNBAP_CriticalityDiagnostics_IE_List__Member, iE_Extensions),
-		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_HNBAP_IE_Extensions,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"iE-Extensions"
-		},
-};
-static const int asn_MAP_Member_oms_2[] = { 3 };
-static const ber_tlv_tag_t asn_DEF_Member_tags_2[] = {
-	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
-};
-static const asn_TYPE_tag2member_t asn_MAP_Member_tag2el_2[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* iECriticality */
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* iE-ID */
-    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* typeOfError */
-    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* iE-Extensions */
-};
-static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = {
-	sizeof(struct HNBAP_CriticalityDiagnostics_IE_List__Member),
-	offsetof(struct HNBAP_CriticalityDiagnostics_IE_List__Member, _asn_ctx),
-	asn_MAP_Member_tag2el_2,
-	4,	/* Count of tags in the map */
-	asn_MAP_Member_oms_2,	/* Optional members */
-	1, 0,	/* Root/Additions */
-	3,	/* Start extensions */
-	5	/* Stop extensions */
-};
-static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_Member_2 = {
-	"SEQUENCE",
-	"SEQUENCE",
-	SEQUENCE_free,
-	SEQUENCE_print,
-	SEQUENCE_constraint,
-	SEQUENCE_decode_ber,
-	SEQUENCE_encode_der,
-	SEQUENCE_decode_xer,
-	SEQUENCE_encode_xer,
-	SEQUENCE_decode_uper,
-	SEQUENCE_encode_uper,
-	SEQUENCE_decode_aper,
-	SEQUENCE_encode_aper,
-	0,	/* Use generic outmost tag fetcher */
-	asn_DEF_Member_tags_2,
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	asn_DEF_Member_tags_2,	/* Same as above */
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	0,	/* No PER visible constraints */
-	asn_MBR_Member_2,
-	4,	/* Elements count */
-	&asn_SPC_Member_specs_2	/* Additional specs */
-};
-
 static asn_TYPE_member_t asn_MBR_HNBAP_CriticalityDiagnostics_IE_List_1[] = {
 	{ ATF_POINTER, 0, 0,
-		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		-1 /* Ambiguous tag (CHOICE?) */,
 		0,
-		&asn_DEF_Member_2,
+		&asn_DEF_HNBAP_CriticalityDiagnostics_IE_List_Value,
 		0,	/* Defer constraints checking to the member type */
 		0,	/* No PER visible constraints */
 		0,
--- a/src/hnbap/Makefile.am
+++ b/src/hnbap/Makefile.am
@ -21,6 +21,7 @@ ASN_MODULE_SOURCES=	\
 	HNBAP_Context-ID.c	\
 	HNBAP_CriticalityDiagnostics.c	\
 	HNBAP_CriticalityDiagnostics-IE-List.c	\
+	HNBAP_CriticalityDiagnostics-IE-List-Value.c	\
 	HNBAP_CSG-ID.c	\
 	HNBAP_CSG-Capability.c	\
 	HNBAP_CSGMembershipStatus.c	\
@ -138,6 +139,7 @@ ASN_MODULE_INC=	\
 	HNBAP_Context-ID.h	\
 	HNBAP_CriticalityDiagnostics.h	\
 	HNBAP_CriticalityDiagnostics-IE-List.h	\
+	HNBAP_CriticalityDiagnostics-IE-List-Value.h	\
 	HNBAP_CSG-ID.h	\
 	HNBAP_CSG-Capability.h	\
 	HNBAP_CSGMembershipStatus.h	\
--- a/src/ranap/Makefile.am
+++ b/src/ranap/Makefile.am
@ -37,6 +37,7 @@ ASN_MODULE_SRC=	\
 	RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.c	\
 	RANAP_Ass-RAB-Parameter-MaxBitrateList.c	\
 	RANAP_AuthorisedPLMNs.c	\
+	RANAP_AuthorisedPLMNs-Value.c	\
 	RANAP_AuthorisedSNAs.c	\
 	RANAP_BindingID.c	\
 	RANAP_BroadcastAssistanceDataDecipheringKeys.c	\
@ -59,7 +60,9 @@ ASN_MODULE_SRC=	\
 	RANAP_ClientType.c	\
 	RANAP_CriticalityDiagnostics.c	\
 	RANAP_CriticalityDiagnostics-IE-List.c	\
+	RANAP_CriticalityDiagnostics-IE-List-Value.c	\
 	RANAP_MessageStructure.c	\
+	RANAP_MessageStructure-Value.c	\
 	RANAP_CGI.c	\
 	RANAP_ChosenEncryptionAlgorithm.c	\
 	RANAP_ChosenIntegrityProtectionAlgorithm.c	\
@ -117,6 +120,7 @@ ASN_MODULE_SRC=	\
 	RANAP_GA-PointWithUnCertainty.c	\
 	RANAP_GA-PointWithUnCertaintyEllipse.c	\
 	RANAP_GA-Polygon.c	\
+	RANAP_GA-Polygon-Value.c	\
 	RANAP_GA-UncertaintyEllipse.c	\
 	RANAP_GERAN-BSC-Container.c	\
 	RANAP_GERAN-Cell-ID.c	\
@ -152,6 +156,7 @@ ASN_MODULE_SRC=	\
 	RANAP_IuTransportAssociation.c	\
 	RANAP_KeyStatus.c	\
 	RANAP_LA-LIST.c	\
+	RANAP_LA-LIST-Value.c	\
 	RANAP_LAC.c	\
 	RANAP_LAI.c	\
 	RANAP_LastKnownServiceArea.c	\
@ -237,6 +242,7 @@ ASN_MODULE_SRC=	\
 	RANAP_LoggingDuration.c	\
 	RANAP_PLMNidentity.c	\
 	RANAP_PLMNs-in-shared-network.c	\
+	RANAP_PLMNs-in-shared-network-Value.c	\
 	RANAP_Port-Number.c	\
 	RANAP_PositioningDataDiscriminator.c	\
 	RANAP_PositioningDataSet.c	\
@ -255,6 +261,7 @@ ASN_MODULE_SRC=	\
 	RANAP_RABased.c	\
 	RANAP_RAI-List.c	\
 	RANAP_RABDataVolumeReport.c	\
+	RANAP_RABDataVolumeReport-Value.c	\
 	RANAP_RAB-ID.c	\
 	RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.c	\
 	RANAP_RAB-Parameter-ExtendedMaxBitrateList.c	\
@ -262,6 +269,7 @@ ASN_MODULE_SRC=	\
 	RANAP_RAB-Parameter-MaxBitrateList.c	\
 	RANAP_RAB-Parameters.c	\
 	RANAP_RABParametersList.c	\
+	RANAP_RABParametersList-Value.c	\
 	RANAP_RAB-SubflowCombinationBitRate.c	\
 	RANAP_RAB-TrCH-Mapping.c	\
 	RANAP_RAB-TrCH-MappingItem.c	\
@ -335,6 +343,7 @@ ASN_MODULE_SRC=	\
 	RANAP_RSRQ-Type.c	\
 	RANAP_RSRQ-Extension.c	\
 	RANAP_EUTRANFrequencies.c	\
+	RANAP_EUTRANFrequencies-Value.c	\
 	RANAP_MeasBand.c	\
 	RANAP_SubscriberProfileIDforRFP.c	\
 	RANAP_SourceStatisticsDescriptor.c	\
@ -544,6 +553,7 @@ ASN_MODULE_SRC=	\
 	RANAP_UserPlaneInformation.c	\
 	RANAP_CNMBMSLinkingInformation.c	\
 	RANAP_JoinedMBMSBearerService-IEs.c	\
+	RANAP_JoinedMBMSBearerService-IEs-Value.c	\
 	RANAP_RAB-SetupItem-RelocReqAck.c	\
 	RANAP_RAB-FailedItem.c	\
 	RANAP_RAB-ContextItem.c	\
@ -563,6 +573,7 @@ ASN_MODULE_SRC=	\
 	RANAP_RAB-SetupOrModifiedItem.c	\
 	RANAP_RAB-ReleasedItem.c	\
 	RANAP_DataVolumeList.c	\
+	RANAP_DataVolumeList-Value.c	\
 	RANAP_RAB-QueuedItem.c	\
 	RANAP_RAB-ReleaseFailedList.c	\
 	RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.c	\
@ -577,7 +588,9 @@ ASN_MODULE_SRC=	\
 	RANAP_RAB-ModifyItem.c	\
 	RANAP_MBMSSynchronisationInformation.c	\
 	RANAP_LeftMBMSBearerService-IEs.c	\
-	RANAP_UnsuccessfulLinking-IEs.c
+	RANAP_LeftMBMSBearerService-IEs-Value.c	\
+	RANAP_UnsuccessfulLinking-IEs.c		\
+	RANAP_UnsuccessfulLinking-IEs-Value.c

 ASN_MODULE_INC=	\
 	RANAP_Criticality.h	\
@ -618,6 +631,7 @@ ASN_MODULE_INC=	\
 	RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.h	\
 	RANAP_Ass-RAB-Parameter-MaxBitrateList.h	\
 	RANAP_AuthorisedPLMNs.h	\
+	RANAP_AuthorisedPLMNs-Value.h	\
 	RANAP_AuthorisedSNAs.h	\
 	RANAP_BindingID.h	\
 	RANAP_BroadcastAssistanceDataDecipheringKeys.h	\
@ -640,7 +654,9 @@ ASN_MODULE_INC=	\
 	RANAP_ClientType.h	\
 	RANAP_CriticalityDiagnostics.h	\
 	RANAP_CriticalityDiagnostics-IE-List.h	\
+	RANAP_CriticalityDiagnostics-IE-List-Value.h	\
 	RANAP_MessageStructure.h	\
+	RANAP_MessageStructure-Value.h	\
 	RANAP_CGI.h	\
 	RANAP_ChosenEncryptionAlgorithm.h	\
 	RANAP_ChosenIntegrityProtectionAlgorithm.h	\
@ -698,6 +714,7 @@ ASN_MODULE_INC=	\
 	RANAP_GA-PointWithUnCertainty.h	\
 	RANAP_GA-PointWithUnCertaintyEllipse.h	\
 	RANAP_GA-Polygon.h	\
+	RANAP_GA-Polygon-Value.h	\
 	RANAP_GA-UncertaintyEllipse.h	\
 	RANAP_GERAN-BSC-Container.h	\
 	RANAP_GERAN-Cell-ID.h	\
@ -733,6 +750,7 @@ ASN_MODULE_INC=	\
 	RANAP_IuTransportAssociation.h	\
 	RANAP_KeyStatus.h	\
 	RANAP_LA-LIST.h	\
+	RANAP_LA-LIST-Value.h	\
 	RANAP_LAC.h	\
 	RANAP_LAI.h	\
 	RANAP_LastKnownServiceArea.h	\
@ -818,6 +836,7 @@ ASN_MODULE_INC=	\
 	RANAP_LoggingDuration.h	\
 	RANAP_PLMNidentity.h	\
 	RANAP_PLMNs-in-shared-network.h	\
+	RANAP_PLMNs-in-shared-network-Value.h	\
 	RANAP_Port-Number.h	\
 	RANAP_PositioningDataDiscriminator.h	\
 	RANAP_PositioningDataSet.h	\
@ -836,6 +855,7 @@ ASN_MODULE_INC=	\
 	RANAP_RABased.h	\
 	RANAP_RAI-List.h	\
 	RANAP_RABDataVolumeReport.h	\
+	RANAP_RABDataVolumeReport-Value.h	\
 	RANAP_RAB-ID.h	\
 	RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.h	\
 	RANAP_RAB-Parameter-ExtendedMaxBitrateList.h	\
@ -843,6 +863,7 @@ ASN_MODULE_INC=	\
 	RANAP_RAB-Parameter-MaxBitrateList.h	\
 	RANAP_RAB-Parameters.h	\
 	RANAP_RABParametersList.h	\
+	RANAP_RABParametersList-Value.h	\
 	RANAP_RAB-SubflowCombinationBitRate.h	\
 	RANAP_RAB-TrCH-Mapping.h	\
 	RANAP_RAB-TrCH-MappingItem.h	\
@ -916,6 +937,7 @@ ASN_MODULE_INC=	\
 	RANAP_RSRQ-Type.h	\
 	RANAP_RSRQ-Extension.h	\
 	RANAP_EUTRANFrequencies.h	\
+	RANAP_EUTRANFrequencies-Value.h	\
 	RANAP_MeasBand.h	\
 	RANAP_SubscriberProfileIDforRFP.h	\
 	RANAP_SourceStatisticsDescriptor.h	\
@ -1125,6 +1147,7 @@ ASN_MODULE_INC=	\
 	RANAP_UserPlaneInformation.h	\
 	RANAP_CNMBMSLinkingInformation.h	\
 	RANAP_JoinedMBMSBearerService-IEs.h	\
+	RANAP_JoinedMBMSBearerService-IEs-Value.h	\
 	RANAP_RAB-SetupItem-RelocReqAck.h	\
 	RANAP_RAB-FailedItem.h	\
 	RANAP_RAB-ContextItem.h	\
@ -1144,6 +1167,7 @@ ASN_MODULE_INC=	\
 	RANAP_RAB-SetupOrModifiedItem.h	\
 	RANAP_RAB-ReleasedItem.h	\
 	RANAP_DataVolumeList.h	\
+	RANAP_DataVolumeList-Value.h	\
 	RANAP_RAB-QueuedItem.h	\
 	RANAP_RAB-ReleaseFailedList.h	\
 	RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.h	\
@ -1158,7 +1182,9 @@ ASN_MODULE_INC=	\
 	RANAP_RAB-ModifyItem.h	\
 	RANAP_MBMSSynchronisationInformation.h	\
 	RANAP_LeftMBMSBearerService-IEs.h	\
-	RANAP_UnsuccessfulLinking-IEs.h
+	RANAP_LeftMBMSBearerService-IEs-Value.h	\
+	RANAP_UnsuccessfulLinking-IEs.h		\
+	RANAP_UnsuccessfulLinking-IEs-Value.h

 AM_CFLAGS = -I$(top_srcdir)/include $(ASN1C_CFLAGS) $(OSMOCORE_CFLAGS)

--- a/src/ranap/RANAP_AuthorisedPLMNs-Value.c
+++ b/src/ranap/RANAP_AuthorisedPLMNs-Value.c
@ -0,0 +1,84 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "RANAP-IEs"
+ * 	found in "../../asn1/ranap/RANAP-IEs.asn"
+ * 	`asn1c -fcompound-names -R`
+ */
+
+#include <osmocom/ranap/RANAP_AuthorisedPLMNs-Value.h>
+
+static asn_TYPE_member_t asn_MBR_RANAP_AuthorisedPLMNs_Value_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_AuthorisedPLMNs_Value, pLMNidentity),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_PLMNidentity,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"pLMNidentity"
+		},
+	{ ATF_POINTER, 2, offsetof(struct RANAP_AuthorisedPLMNs_Value, authorisedSNAsList),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_AuthorisedSNAs,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"authorisedSNAsList"
+		},
+	{ ATF_POINTER, 1, offsetof(struct RANAP_AuthorisedPLMNs_Value, iE_Extensions),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_IE_Extensions,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"iE-Extensions"
+		},
+};
+static const int asn_MAP_RANAP_AuthorisedPLMNs_Value_oms_1[] = { 1, 2 };
+static const ber_tlv_tag_t asn_DEF_RANAP_AuthorisedPLMNs_Value_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_RANAP_AuthorisedPLMNs_Value_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* pLMNidentity */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* authorisedSNAsList */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
+};
+static asn_SEQUENCE_specifics_t asn_SPC_RANAP_AuthorisedPLMNs_Value_specs_1 = {
+	sizeof(struct RANAP_AuthorisedPLMNs_Value),
+	offsetof(struct RANAP_AuthorisedPLMNs_Value, _asn_ctx),
+	asn_MAP_RANAP_AuthorisedPLMNs_Value_tag2el_1,
+	3,	/* Count of tags in the map */
+	asn_MAP_RANAP_AuthorisedPLMNs_Value_oms_1,	/* Optional members */
+	2, 0,	/* Root/Additions */
+	2,	/* Start extensions */
+	4	/* Stop extensions */
+};
+asn_TYPE_descriptor_t asn_DEF_RANAP_AuthorisedPLMNs_Value = {
+	"RANAP_AuthorisedPLMNs-Value",
+	"RANAP_AuthorisedPLMNs-Value",
+	SEQUENCE_free,
+	SEQUENCE_print,
+	SEQUENCE_constraint,
+	SEQUENCE_decode_ber,
+	SEQUENCE_encode_der,
+	SEQUENCE_decode_xer,
+	SEQUENCE_encode_xer,
+	SEQUENCE_decode_uper,
+	SEQUENCE_encode_uper,
+	SEQUENCE_decode_aper,
+	SEQUENCE_encode_aper,
+	0,	/* Use generic outmost tag fetcher */
+	asn_DEF_RANAP_AuthorisedPLMNs_Value_tags_1,
+	sizeof(asn_DEF_RANAP_AuthorisedPLMNs_Value_tags_1)
+		/sizeof(asn_DEF_RANAP_AuthorisedPLMNs_Value_tags_1[0]), /* 1 */
+	asn_DEF_RANAP_AuthorisedPLMNs_Value_tags_1,	/* Same as above */
+	sizeof(asn_DEF_RANAP_AuthorisedPLMNs_Value_tags_1)
+		/sizeof(asn_DEF_RANAP_AuthorisedPLMNs_Value_tags_1[0]), /* 1 */
+	0,	/* No PER visible constraints */
+	asn_MBR_RANAP_AuthorisedPLMNs_Value_1,
+	3,	/* Elements count */
+	&asn_SPC_RANAP_AuthorisedPLMNs_Value_specs_1	/* Additional specs */
+};
+
--- a/src/ranap/RANAP_AuthorisedPLMNs.c
+++ b/src/ranap/RANAP_AuthorisedPLMNs.c
@ -12,87 +12,11 @@ static asn_per_constraints_t asn_PER_type_RANAP_AuthorisedPLMNs_constr_1 GCC_NOT
 	{ APC_CONSTRAINED,	 5,  5,  1l,  32l }	/* (SIZE(1..32)) */,
 	0, 0	/* No PER value map */
 };
-static asn_TYPE_member_t asn_MBR_Member_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_AuthorisedPLMNs__Member, pLMNidentity),
-		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_PLMNidentity,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"pLMNidentity"
-		},
-	{ ATF_POINTER, 2, offsetof(struct RANAP_AuthorisedPLMNs__Member, authorisedSNAsList),
-		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_AuthorisedSNAs,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"authorisedSNAsList"
-		},
-	{ ATF_POINTER, 1, offsetof(struct RANAP_AuthorisedPLMNs__Member, iE_Extensions),
-		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_IE_Extensions,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"iE-Extensions"
-		},
-};
-static const int asn_MAP_Member_oms_2[] = { 1, 2 };
-static const ber_tlv_tag_t asn_DEF_Member_tags_2[] = {
-	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
-};
-static const asn_TYPE_tag2member_t asn_MAP_Member_tag2el_2[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* pLMNidentity */
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* authorisedSNAsList */
-    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
-};
-static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = {
-	sizeof(struct RANAP_AuthorisedPLMNs__Member),
-	offsetof(struct RANAP_AuthorisedPLMNs__Member, _asn_ctx),
-	asn_MAP_Member_tag2el_2,
-	3,	/* Count of tags in the map */
-	asn_MAP_Member_oms_2,	/* Optional members */
-	2, 0,	/* Root/Additions */
-	2,	/* Start extensions */
-	4	/* Stop extensions */
-};
-static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_Member_2 = {
-	"SEQUENCE",
-	"SEQUENCE",
-	SEQUENCE_free,
-	SEQUENCE_print,
-	SEQUENCE_constraint,
-	SEQUENCE_decode_ber,
-	SEQUENCE_encode_der,
-	SEQUENCE_decode_xer,
-	SEQUENCE_encode_xer,
-	SEQUENCE_decode_uper,
-	SEQUENCE_encode_uper,
-	SEQUENCE_decode_aper,
-	SEQUENCE_encode_aper,
-	0,	/* Use generic outmost tag fetcher */
-	asn_DEF_Member_tags_2,
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	asn_DEF_Member_tags_2,	/* Same as above */
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	0,	/* No PER visible constraints */
-	asn_MBR_Member_2,
-	3,	/* Elements count */
-	&asn_SPC_Member_specs_2	/* Additional specs */
-};
-
 static asn_TYPE_member_t asn_MBR_RANAP_AuthorisedPLMNs_1[] = {
 	{ ATF_POINTER, 0, 0,
-		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		-1 /* Ambiguous tag (CHOICE?) */,
 		0,
-		&asn_DEF_Member_2,
+		&asn_DEF_RANAP_AuthorisedPLMNs_Value,
 		0,	/* Defer constraints checking to the member type */
 		0,	/* No PER visible constraints */
 		0,
--- a/src/ranap/RANAP_CriticalityDiagnostics-IE-List-Value.c
+++ b/src/ranap/RANAP_CriticalityDiagnostics-IE-List-Value.c
@ -0,0 +1,94 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "RANAP-IEs"
+ * 	found in "../../asn1/ranap/RANAP-IEs.asn"
+ * 	`asn1c -fcompound-names -R`
+ */
+
+#include <osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List-Value.h>
+
+static asn_TYPE_member_t asn_MBR_RANAP_CriticalityDiagnostics_IE_List_Value_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_CriticalityDiagnostics_IE_List_Value, iECriticality),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_Criticality,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"iECriticality"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_CriticalityDiagnostics_IE_List_Value, iE_ID),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_ProtocolIE_ID,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"iE-ID"
+		},
+	{ ATF_POINTER, 2, offsetof(struct RANAP_CriticalityDiagnostics_IE_List_Value, repetitionNumber),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_RepetitionNumber0,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"repetitionNumber"
+		},
+	{ ATF_POINTER, 1, offsetof(struct RANAP_CriticalityDiagnostics_IE_List_Value, iE_Extensions),
+		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_IE_Extensions,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"iE-Extensions"
+		},
+};
+static const int asn_MAP_RANAP_CriticalityDiagnostics_IE_List_Value_oms_1[] = { 2, 3 };
+static const ber_tlv_tag_t asn_DEF_RANAP_CriticalityDiagnostics_IE_List_Value_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_RANAP_CriticalityDiagnostics_IE_List_Value_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* iECriticality */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* iE-ID */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* repetitionNumber */
+    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* iE-Extensions */
+};
+static asn_SEQUENCE_specifics_t asn_SPC_RANAP_CriticalityDiagnostics_IE_List_Value_specs_1 = {
+	sizeof(struct RANAP_CriticalityDiagnostics_IE_List_Value),
+	offsetof(struct RANAP_CriticalityDiagnostics_IE_List_Value, _asn_ctx),
+	asn_MAP_RANAP_CriticalityDiagnostics_IE_List_Value_tag2el_1,
+	4,	/* Count of tags in the map */
+	asn_MAP_RANAP_CriticalityDiagnostics_IE_List_Value_oms_1,	/* Optional members */
+	2, 0,	/* Root/Additions */
+	3,	/* Start extensions */
+	5	/* Stop extensions */
+};
+asn_TYPE_descriptor_t asn_DEF_RANAP_CriticalityDiagnostics_IE_List_Value = {
+	"RANAP_CriticalityDiagnostics-IE-List-Value",
+	"RANAP_CriticalityDiagnostics-IE-List-Value",
+	SEQUENCE_free,
+	SEQUENCE_print,
+	SEQUENCE_constraint,
+	SEQUENCE_decode_ber,
+	SEQUENCE_encode_der,
+	SEQUENCE_decode_xer,
+	SEQUENCE_encode_xer,
+	SEQUENCE_decode_uper,
+	SEQUENCE_encode_uper,
+	SEQUENCE_decode_aper,
+	SEQUENCE_encode_aper,
+	0,	/* Use generic outmost tag fetcher */
+	asn_DEF_RANAP_CriticalityDiagnostics_IE_List_Value_tags_1,
+	sizeof(asn_DEF_RANAP_CriticalityDiagnostics_IE_List_Value_tags_1)
+		/sizeof(asn_DEF_RANAP_CriticalityDiagnostics_IE_List_Value_tags_1[0]), /* 1 */
+	asn_DEF_RANAP_CriticalityDiagnostics_IE_List_Value_tags_1,	/* Same as above */
+	sizeof(asn_DEF_RANAP_CriticalityDiagnostics_IE_List_Value_tags_1)
+		/sizeof(asn_DEF_RANAP_CriticalityDiagnostics_IE_List_Value_tags_1[0]), /* 1 */
+	0,	/* No PER visible constraints */
+	asn_MBR_RANAP_CriticalityDiagnostics_IE_List_Value_1,
+	4,	/* Elements count */
+	&asn_SPC_RANAP_CriticalityDiagnostics_IE_List_Value_specs_1	/* Additional specs */
+};
+
--- a/src/ranap/RANAP_CriticalityDiagnostics-IE-List.c
+++ b/src/ranap/RANAP_CriticalityDiagnostics-IE-List.c
@ -12,97 +12,11 @@ static asn_per_constraints_t asn_PER_type_RANAP_CriticalityDiagnostics_IE_List_c
 	{ APC_CONSTRAINED,	 8,  8,  1l,  256l }	/* (SIZE(1..256)) */,
 	0, 0	/* No PER value map */
 };
-static asn_TYPE_member_t asn_MBR_Member_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_CriticalityDiagnostics_IE_List__Member, iECriticality),
-		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_Criticality,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"iECriticality"
-		},
-	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_CriticalityDiagnostics_IE_List__Member, iE_ID),
-		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_ProtocolIE_ID,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"iE-ID"
-		},
-	{ ATF_POINTER, 2, offsetof(struct RANAP_CriticalityDiagnostics_IE_List__Member, repetitionNumber),
-		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_RepetitionNumber0,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"repetitionNumber"
-		},
-	{ ATF_POINTER, 1, offsetof(struct RANAP_CriticalityDiagnostics_IE_List__Member, iE_Extensions),
-		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_IE_Extensions,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"iE-Extensions"
-		},
-};
-static const int asn_MAP_Member_oms_2[] = { 2, 3 };
-static const ber_tlv_tag_t asn_DEF_Member_tags_2[] = {
-	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
-};
-static const asn_TYPE_tag2member_t asn_MAP_Member_tag2el_2[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* iECriticality */
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* iE-ID */
-    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* repetitionNumber */
-    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* iE-Extensions */
-};
-static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = {
-	sizeof(struct RANAP_CriticalityDiagnostics_IE_List__Member),
-	offsetof(struct RANAP_CriticalityDiagnostics_IE_List__Member, _asn_ctx),
-	asn_MAP_Member_tag2el_2,
-	4,	/* Count of tags in the map */
-	asn_MAP_Member_oms_2,	/* Optional members */
-	2, 0,	/* Root/Additions */
-	3,	/* Start extensions */
-	5	/* Stop extensions */
-};
-static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_Member_2 = {
-	"SEQUENCE",
-	"SEQUENCE",
-	SEQUENCE_free,
-	SEQUENCE_print,
-	SEQUENCE_constraint,
-	SEQUENCE_decode_ber,
-	SEQUENCE_encode_der,
-	SEQUENCE_decode_xer,
-	SEQUENCE_encode_xer,
-	SEQUENCE_decode_uper,
-	SEQUENCE_encode_uper,
-	SEQUENCE_decode_aper,
-	SEQUENCE_encode_aper,
-	0,	/* Use generic outmost tag fetcher */
-	asn_DEF_Member_tags_2,
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	asn_DEF_Member_tags_2,	/* Same as above */
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	0,	/* No PER visible constraints */
-	asn_MBR_Member_2,
-	4,	/* Elements count */
-	&asn_SPC_Member_specs_2	/* Additional specs */
-};
-
 static asn_TYPE_member_t asn_MBR_RANAP_CriticalityDiagnostics_IE_List_1[] = {
 	{ ATF_POINTER, 0, 0,
-		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		-1 /* Ambiguous tag (CHOICE?) */,
 		0,
-		&asn_DEF_Member_2,
+		&asn_DEF_RANAP_CriticalityDiagnostics_IE_List_Value,
 		0,	/* Defer constraints checking to the member type */
 		0,	/* No PER visible constraints */
 		0,
--- a/src/ranap/RANAP_DataVolumeList-Value.c
+++ b/src/ranap/RANAP_DataVolumeList-Value.c
@ -0,0 +1,84 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "RANAP-PDU"
+ * 	found in "../../asn1/ranap/RANAP-PDU.asn"
+ * 	`asn1c -fcompound-names -R`
+ */
+
+#include <osmocom/ranap/RANAP_DataVolumeList-Value.h>
+
+static asn_TYPE_member_t asn_MBR_RANAP_DataVolumeList_Value_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_DataVolumeList_Value, dl_UnsuccessfullyTransmittedDataVolume),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_UnsuccessfullyTransmittedDataVolume,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"dl-UnsuccessfullyTransmittedDataVolume"
+		},
+	{ ATF_POINTER, 2, offsetof(struct RANAP_DataVolumeList_Value, dataVolumeReference),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_DataVolumeReference,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"dataVolumeReference"
+		},
+	{ ATF_POINTER, 1, offsetof(struct RANAP_DataVolumeList_Value, iE_Extensions),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_ProtocolExtensionContainer,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"iE-Extensions"
+		},
+};
+static const int asn_MAP_RANAP_DataVolumeList_Value_oms_1[] = { 1, 2 };
+static const ber_tlv_tag_t asn_DEF_RANAP_DataVolumeList_Value_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_RANAP_DataVolumeList_Value_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* dl-UnsuccessfullyTransmittedDataVolume */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* dataVolumeReference */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
+};
+static asn_SEQUENCE_specifics_t asn_SPC_RANAP_DataVolumeList_Value_specs_1 = {
+	sizeof(struct RANAP_DataVolumeList_Value),
+	offsetof(struct RANAP_DataVolumeList_Value, _asn_ctx),
+	asn_MAP_RANAP_DataVolumeList_Value_tag2el_1,
+	3,	/* Count of tags in the map */
+	asn_MAP_RANAP_DataVolumeList_Value_oms_1,	/* Optional members */
+	2, 0,	/* Root/Additions */
+	2,	/* Start extensions */
+	4	/* Stop extensions */
+};
+asn_TYPE_descriptor_t asn_DEF_RANAP_DataVolumeList_Value = {
+	"RANAP_DataVolumeList-Value",
+	"RANAP_DataVolumeList-Value",
+	SEQUENCE_free,
+	SEQUENCE_print,
+	SEQUENCE_constraint,
+	SEQUENCE_decode_ber,
+	SEQUENCE_encode_der,
+	SEQUENCE_decode_xer,
+	SEQUENCE_encode_xer,
+	SEQUENCE_decode_uper,
+	SEQUENCE_encode_uper,
+	SEQUENCE_decode_aper,
+	SEQUENCE_encode_aper,
+	0,	/* Use generic outmost tag fetcher */
+	asn_DEF_RANAP_DataVolumeList_Value_tags_1,
+	sizeof(asn_DEF_RANAP_DataVolumeList_Value_tags_1)
+		/sizeof(asn_DEF_RANAP_DataVolumeList_Value_tags_1[0]), /* 1 */
+	asn_DEF_RANAP_DataVolumeList_Value_tags_1,	/* Same as above */
+	sizeof(asn_DEF_RANAP_DataVolumeList_Value_tags_1)
+		/sizeof(asn_DEF_RANAP_DataVolumeList_Value_tags_1[0]), /* 1 */
+	0,	/* No PER visible constraints */
+	asn_MBR_RANAP_DataVolumeList_Value_1,
+	3,	/* Elements count */
+	&asn_SPC_RANAP_DataVolumeList_Value_specs_1	/* Additional specs */
+};
+
--- a/src/ranap/RANAP_DataVolumeList.c
+++ b/src/ranap/RANAP_DataVolumeList.c
@ -12,87 +12,11 @@ static asn_per_constraints_t asn_PER_type_RANAP_DataVolumeList_constr_1 GCC_NOTU
 	{ APC_CONSTRAINED,	 1,  1,  1l,  2l }	/* (SIZE(1..2)) */,
 	0, 0	/* No PER value map */
 };
-static asn_TYPE_member_t asn_MBR_Member_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_DataVolumeList__Member, dl_UnsuccessfullyTransmittedDataVolume),
-		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_UnsuccessfullyTransmittedDataVolume,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"dl-UnsuccessfullyTransmittedDataVolume"
-		},
-	{ ATF_POINTER, 2, offsetof(struct RANAP_DataVolumeList__Member, dataVolumeReference),
-		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_DataVolumeReference,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"dataVolumeReference"
-		},
-	{ ATF_POINTER, 1, offsetof(struct RANAP_DataVolumeList__Member, iE_Extensions),
-		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_ProtocolExtensionContainer,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"iE-Extensions"
-		},
-};
-static const int asn_MAP_Member_oms_2[] = { 1, 2 };
-static const ber_tlv_tag_t asn_DEF_Member_tags_2[] = {
-	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
-};
-static const asn_TYPE_tag2member_t asn_MAP_Member_tag2el_2[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* dl-UnsuccessfullyTransmittedDataVolume */
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* dataVolumeReference */
-    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
-};
-static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = {
-	sizeof(struct RANAP_DataVolumeList__Member),
-	offsetof(struct RANAP_DataVolumeList__Member, _asn_ctx),
-	asn_MAP_Member_tag2el_2,
-	3,	/* Count of tags in the map */
-	asn_MAP_Member_oms_2,	/* Optional members */
-	2, 0,	/* Root/Additions */
-	2,	/* Start extensions */
-	4	/* Stop extensions */
-};
-static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_Member_2 = {
-	"SEQUENCE",
-	"SEQUENCE",
-	SEQUENCE_free,
-	SEQUENCE_print,
-	SEQUENCE_constraint,
-	SEQUENCE_decode_ber,
-	SEQUENCE_encode_der,
-	SEQUENCE_decode_xer,
-	SEQUENCE_encode_xer,
-	SEQUENCE_decode_uper,
-	SEQUENCE_encode_uper,
-	SEQUENCE_decode_aper,
-	SEQUENCE_encode_aper,
-	0,	/* Use generic outmost tag fetcher */
-	asn_DEF_Member_tags_2,
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	asn_DEF_Member_tags_2,	/* Same as above */
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	0,	/* No PER visible constraints */
-	asn_MBR_Member_2,
-	3,	/* Elements count */
-	&asn_SPC_Member_specs_2	/* Additional specs */
-};
-
 static asn_TYPE_member_t asn_MBR_RANAP_DataVolumeList_1[] = {
 	{ ATF_POINTER, 0, 0,
-		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		-1 /* Ambiguous tag (CHOICE?) */,
 		0,
-		&asn_DEF_Member_2,
+		&asn_DEF_RANAP_DataVolumeList_Value,
 		0,	/* Defer constraints checking to the member type */
 		0,	/* No PER visible constraints */
 		0,
--- a/src/ranap/RANAP_EUTRANFrequencies-Value.c
+++ b/src/ranap/RANAP_EUTRANFrequencies-Value.c
@ -0,0 +1,114 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "RANAP-IEs"
+ * 	found in "../../asn1/ranap/RANAP-IEs.asn"
+ * 	`asn1c -fcompound-names -R`
+ */
+
+#include <osmocom/ranap/RANAP_EUTRANFrequencies-Value.h>
+
+static int
+memb_earfcn_constraint_1(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 >= 0l && value <= 65535l)) {
+		/* Constraint check succeeded */
+		return 0;
+	} 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_memb_earfcn_constr_2 GCC_NOTUSED = {
+	{ APC_CONSTRAINED,	 16,  16,  0l,  65535l }	/* (0..65535) */,
+	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
+	0, 0	/* No PER value map */
+};
+static asn_TYPE_member_t asn_MBR_RANAP_EUTRANFrequencies_Value_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_EUTRANFrequencies_Value, earfcn),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_NativeInteger,
+		memb_earfcn_constraint_1,
+		&asn_PER_memb_earfcn_constr_2,
+		0,
+		"earfcn"
+		},
+	{ ATF_POINTER, 2, offsetof(struct RANAP_EUTRANFrequencies_Value, measBand),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_MeasBand,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"measBand"
+		},
+	{ ATF_POINTER, 1, offsetof(struct RANAP_EUTRANFrequencies_Value, iE_Extensions),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_IE_Extensions,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"iE-Extensions"
+		},
+};
+static const int asn_MAP_RANAP_EUTRANFrequencies_Value_oms_1[] = { 1, 2 };
+static const ber_tlv_tag_t asn_DEF_RANAP_EUTRANFrequencies_Value_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_RANAP_EUTRANFrequencies_Value_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* earfcn */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* measBand */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
+};
+static asn_SEQUENCE_specifics_t asn_SPC_RANAP_EUTRANFrequencies_Value_specs_1 = {
+	sizeof(struct RANAP_EUTRANFrequencies_Value),
+	offsetof(struct RANAP_EUTRANFrequencies_Value, _asn_ctx),
+	asn_MAP_RANAP_EUTRANFrequencies_Value_tag2el_1,
+	3,	/* Count of tags in the map */
+	asn_MAP_RANAP_EUTRANFrequencies_Value_oms_1,	/* Optional members */
+	2, 0,	/* Root/Additions */
+	-1,	/* Start extensions */
+	-1	/* Stop extensions */
+};
+asn_TYPE_descriptor_t asn_DEF_RANAP_EUTRANFrequencies_Value = {
+	"RANAP_EUTRANFrequencies-Value",
+	"RANAP_EUTRANFrequencies-Value",
+	SEQUENCE_free,
+	SEQUENCE_print,
+	SEQUENCE_constraint,
+	SEQUENCE_decode_ber,
+	SEQUENCE_encode_der,
+	SEQUENCE_decode_xer,
+	SEQUENCE_encode_xer,
+	SEQUENCE_decode_uper,
+	SEQUENCE_encode_uper,
+	SEQUENCE_decode_aper,
+	SEQUENCE_encode_aper,
+	0,	/* Use generic outmost tag fetcher */
+	asn_DEF_RANAP_EUTRANFrequencies_Value_tags_1,
+	sizeof(asn_DEF_RANAP_EUTRANFrequencies_Value_tags_1)
+		/sizeof(asn_DEF_RANAP_EUTRANFrequencies_Value_tags_1[0]), /* 1 */
+	asn_DEF_RANAP_EUTRANFrequencies_Value_tags_1,	/* Same as above */
+	sizeof(asn_DEF_RANAP_EUTRANFrequencies_Value_tags_1)
+		/sizeof(asn_DEF_RANAP_EUTRANFrequencies_Value_tags_1[0]), /* 1 */
+	0,	/* No PER visible constraints */
+	asn_MBR_RANAP_EUTRANFrequencies_Value_1,
+	3,	/* Elements count */
+	&asn_SPC_RANAP_EUTRANFrequencies_Value_specs_1	/* Additional specs */
+};
+
--- a/src/ranap/RANAP_EUTRANFrequencies.c
+++ b/src/ranap/RANAP_EUTRANFrequencies.c
@ -7,122 +7,16 @@

 #include <osmocom/ranap/RANAP_EUTRANFrequencies.h>

-static int
-memb_earfcn_constraint_2(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 >= 0l && value <= 65535l)) {
-		/* Constraint check succeeded */
-		return 0;
-	} 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_memb_earfcn_constr_3 GCC_NOTUSED = {
-	{ APC_CONSTRAINED,	 16,  16,  0l,  65535l }	/* (0..65535) */,
-	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
-	0, 0	/* No PER value map */
-};
 static asn_per_constraints_t asn_PER_type_RANAP_EUTRANFrequencies_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 3,  3,  1l,  8l }	/* (SIZE(1..8)) */,
 	0, 0	/* No PER value map */
 };
-static asn_TYPE_member_t asn_MBR_Member_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_EUTRANFrequencies__Member, earfcn),
-		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_NativeInteger,
-		memb_earfcn_constraint_2,
-		&asn_PER_memb_earfcn_constr_3,
-		0,
-		"earfcn"
-		},
-	{ ATF_POINTER, 2, offsetof(struct RANAP_EUTRANFrequencies__Member, measBand),
-		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_MeasBand,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"measBand"
-		},
-	{ ATF_POINTER, 1, offsetof(struct RANAP_EUTRANFrequencies__Member, iE_Extensions),
-		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_IE_Extensions,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"iE-Extensions"
-		},
-};
-static const int asn_MAP_Member_oms_2[] = { 1, 2 };
-static const ber_tlv_tag_t asn_DEF_Member_tags_2[] = {
-	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
-};
-static const asn_TYPE_tag2member_t asn_MAP_Member_tag2el_2[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* earfcn */
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* measBand */
-    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
-};
-static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = {
-	sizeof(struct RANAP_EUTRANFrequencies__Member),
-	offsetof(struct RANAP_EUTRANFrequencies__Member, _asn_ctx),
-	asn_MAP_Member_tag2el_2,
-	3,	/* Count of tags in the map */
-	asn_MAP_Member_oms_2,	/* Optional members */
-	2, 0,	/* Root/Additions */
-	-1,	/* Start extensions */
-	-1	/* Stop extensions */
-};
-static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_Member_2 = {
-	"SEQUENCE",
-	"SEQUENCE",
-	SEQUENCE_free,
-	SEQUENCE_print,
-	SEQUENCE_constraint,
-	SEQUENCE_decode_ber,
-	SEQUENCE_encode_der,
-	SEQUENCE_decode_xer,
-	SEQUENCE_encode_xer,
-	SEQUENCE_decode_uper,
-	SEQUENCE_encode_uper,
-	SEQUENCE_decode_aper,
-	SEQUENCE_encode_aper,
-	0,	/* Use generic outmost tag fetcher */
-	asn_DEF_Member_tags_2,
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	asn_DEF_Member_tags_2,	/* Same as above */
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	0,	/* No PER visible constraints */
-	asn_MBR_Member_2,
-	3,	/* Elements count */
-	&asn_SPC_Member_specs_2	/* Additional specs */
-};
-
 static asn_TYPE_member_t asn_MBR_RANAP_EUTRANFrequencies_1[] = {
 	{ ATF_POINTER, 0, 0,
-		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		-1 /* Ambiguous tag (CHOICE?) */,
 		0,
-		&asn_DEF_Member_2,
+		&asn_DEF_RANAP_EUTRANFrequencies_Value,
 		0,	/* Defer constraints checking to the member type */
 		0,	/* No PER visible constraints */
 		0,
--- a/src/ranap/RANAP_GA-Polygon-Value.c
+++ b/src/ranap/RANAP_GA-Polygon-Value.c
@ -0,0 +1,74 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "RANAP-IEs"
+ * 	found in "../../asn1/ranap/RANAP-IEs.asn"
+ * 	`asn1c -fcompound-names -R`
+ */
+
+#include <osmocom/ranap/RANAP_GA-Polygon-Value.h>
+
+static asn_TYPE_member_t asn_MBR_RANAP_GA_Polygon_Value_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_GA_Polygon_Value, geographicalCoordinates),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_GeographicalCoordinates,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"geographicalCoordinates"
+		},
+	{ ATF_POINTER, 1, offsetof(struct RANAP_GA_Polygon_Value, iE_Extensions),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_IE_Extensions,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"iE-Extensions"
+		},
+};
+static const int asn_MAP_RANAP_GA_Polygon_Value_oms_1[] = { 1 };
+static const ber_tlv_tag_t asn_DEF_RANAP_GA_Polygon_Value_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_RANAP_GA_Polygon_Value_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* geographicalCoordinates */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* iE-Extensions */
+};
+static asn_SEQUENCE_specifics_t asn_SPC_RANAP_GA_Polygon_Value_specs_1 = {
+	sizeof(struct RANAP_GA_Polygon_Value),
+	offsetof(struct RANAP_GA_Polygon_Value, _asn_ctx),
+	asn_MAP_RANAP_GA_Polygon_Value_tag2el_1,
+	2,	/* Count of tags in the map */
+	asn_MAP_RANAP_GA_Polygon_Value_oms_1,	/* Optional members */
+	1, 0,	/* Root/Additions */
+	1,	/* Start extensions */
+	3	/* Stop extensions */
+};
+asn_TYPE_descriptor_t asn_DEF_RANAP_GA_Polygon_Value = {
+	"RANAP_GA-Polygon-Value",
+	"RANAP_GA-Polygon-Value",
+	SEQUENCE_free,
+	SEQUENCE_print,
+	SEQUENCE_constraint,
+	SEQUENCE_decode_ber,
+	SEQUENCE_encode_der,
+	SEQUENCE_decode_xer,
+	SEQUENCE_encode_xer,
+	SEQUENCE_decode_uper,
+	SEQUENCE_encode_uper,
+	SEQUENCE_decode_aper,
+	SEQUENCE_encode_aper,
+	0,	/* Use generic outmost tag fetcher */
+	asn_DEF_RANAP_GA_Polygon_Value_tags_1,
+	sizeof(asn_DEF_RANAP_GA_Polygon_Value_tags_1)
+		/sizeof(asn_DEF_RANAP_GA_Polygon_Value_tags_1[0]), /* 1 */
+	asn_DEF_RANAP_GA_Polygon_Value_tags_1,	/* Same as above */
+	sizeof(asn_DEF_RANAP_GA_Polygon_Value_tags_1)
+		/sizeof(asn_DEF_RANAP_GA_Polygon_Value_tags_1[0]), /* 1 */
+	0,	/* No PER visible constraints */
+	asn_MBR_RANAP_GA_Polygon_Value_1,
+	2,	/* Elements count */
+	&asn_SPC_RANAP_GA_Polygon_Value_specs_1	/* Additional specs */
+};
+
--- a/src/ranap/RANAP_GA-Polygon.c
+++ b/src/ranap/RANAP_GA-Polygon.c
@ -12,77 +12,11 @@ static asn_per_constraints_t asn_PER_type_RANAP_GA_Polygon_constr_1 GCC_NOTUSED
 	{ APC_CONSTRAINED,	 4,  4,  1l,  15l }	/* (SIZE(1..15)) */,
 	0, 0	/* No PER value map */
 };
-static asn_TYPE_member_t asn_MBR_Member_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_GA_Polygon__Member, geographicalCoordinates),
-		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_GeographicalCoordinates,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"geographicalCoordinates"
-		},
-	{ ATF_POINTER, 1, offsetof(struct RANAP_GA_Polygon__Member, iE_Extensions),
-		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_IE_Extensions,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"iE-Extensions"
-		},
-};
-static const int asn_MAP_Member_oms_2[] = { 1 };
-static const ber_tlv_tag_t asn_DEF_Member_tags_2[] = {
-	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
-};
-static const asn_TYPE_tag2member_t asn_MAP_Member_tag2el_2[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* geographicalCoordinates */
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* iE-Extensions */
-};
-static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = {
-	sizeof(struct RANAP_GA_Polygon__Member),
-	offsetof(struct RANAP_GA_Polygon__Member, _asn_ctx),
-	asn_MAP_Member_tag2el_2,
-	2,	/* Count of tags in the map */
-	asn_MAP_Member_oms_2,	/* Optional members */
-	1, 0,	/* Root/Additions */
-	1,	/* Start extensions */
-	3	/* Stop extensions */
-};
-static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_Member_2 = {
-	"SEQUENCE",
-	"SEQUENCE",
-	SEQUENCE_free,
-	SEQUENCE_print,
-	SEQUENCE_constraint,
-	SEQUENCE_decode_ber,
-	SEQUENCE_encode_der,
-	SEQUENCE_decode_xer,
-	SEQUENCE_encode_xer,
-	SEQUENCE_decode_uper,
-	SEQUENCE_encode_uper,
-	SEQUENCE_decode_aper,
-	SEQUENCE_encode_aper,
-	0,	/* Use generic outmost tag fetcher */
-	asn_DEF_Member_tags_2,
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	asn_DEF_Member_tags_2,	/* Same as above */
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	0,	/* No PER visible constraints */
-	asn_MBR_Member_2,
-	2,	/* Elements count */
-	&asn_SPC_Member_specs_2	/* Additional specs */
-};
-
 static asn_TYPE_member_t asn_MBR_RANAP_GA_Polygon_1[] = {
 	{ ATF_POINTER, 0, 0,
-		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		-1 /* Ambiguous tag (CHOICE?) */,
 		0,
-		&asn_DEF_Member_2,
+		&asn_DEF_RANAP_GA_Polygon_Value,
 		0,	/* Defer constraints checking to the member type */
 		0,	/* No PER visible constraints */
 		0,
--- a/src/ranap/RANAP_JoinedMBMSBearerService-IEs-Value.c
+++ b/src/ranap/RANAP_JoinedMBMSBearerService-IEs-Value.c
@ -0,0 +1,84 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "RANAP-PDU"
+ * 	found in "../../asn1/ranap/RANAP-PDU.asn"
+ * 	`asn1c -fcompound-names -R`
+ */
+
+#include <osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs-Value.h>
+
+static asn_TYPE_member_t asn_MBR_RANAP_JoinedMBMSBearerService_IEs_Value_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_JoinedMBMSBearerService_IEs_Value, tMGI),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_TMGI,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"tMGI"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_JoinedMBMSBearerService_IEs_Value, mBMS_PTP_RAB_ID),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_MBMS_PTP_RAB_ID,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"mBMS-PTP-RAB-ID"
+		},
+	{ ATF_POINTER, 1, offsetof(struct RANAP_JoinedMBMSBearerService_IEs_Value, iE_Extensions),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_ProtocolExtensionContainer,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"iE-Extensions"
+		},
+};
+static const int asn_MAP_RANAP_JoinedMBMSBearerService_IEs_Value_oms_1[] = { 2 };
+static const ber_tlv_tag_t asn_DEF_RANAP_JoinedMBMSBearerService_IEs_Value_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_RANAP_JoinedMBMSBearerService_IEs_Value_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* tMGI */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* mBMS-PTP-RAB-ID */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
+};
+static asn_SEQUENCE_specifics_t asn_SPC_RANAP_JoinedMBMSBearerService_IEs_Value_specs_1 = {
+	sizeof(struct RANAP_JoinedMBMSBearerService_IEs_Value),
+	offsetof(struct RANAP_JoinedMBMSBearerService_IEs_Value, _asn_ctx),
+	asn_MAP_RANAP_JoinedMBMSBearerService_IEs_Value_tag2el_1,
+	3,	/* Count of tags in the map */
+	asn_MAP_RANAP_JoinedMBMSBearerService_IEs_Value_oms_1,	/* Optional members */
+	1, 0,	/* Root/Additions */
+	2,	/* Start extensions */
+	4	/* Stop extensions */
+};
+asn_TYPE_descriptor_t asn_DEF_RANAP_JoinedMBMSBearerService_IEs_Value = {
+	"RANAP_JoinedMBMSBearerService-IEs-Value",
+	"RANAP_JoinedMBMSBearerService-IEs-Value",
+	SEQUENCE_free,
+	SEQUENCE_print,
+	SEQUENCE_constraint,
+	SEQUENCE_decode_ber,
+	SEQUENCE_encode_der,
+	SEQUENCE_decode_xer,
+	SEQUENCE_encode_xer,
+	SEQUENCE_decode_uper,
+	SEQUENCE_encode_uper,
+	SEQUENCE_decode_aper,
+	SEQUENCE_encode_aper,
+	0,	/* Use generic outmost tag fetcher */
+	asn_DEF_RANAP_JoinedMBMSBearerService_IEs_Value_tags_1,
+	sizeof(asn_DEF_RANAP_JoinedMBMSBearerService_IEs_Value_tags_1)
+		/sizeof(asn_DEF_RANAP_JoinedMBMSBearerService_IEs_Value_tags_1[0]), /* 1 */
+	asn_DEF_RANAP_JoinedMBMSBearerService_IEs_Value_tags_1,	/* Same as above */
+	sizeof(asn_DEF_RANAP_JoinedMBMSBearerService_IEs_Value_tags_1)
+		/sizeof(asn_DEF_RANAP_JoinedMBMSBearerService_IEs_Value_tags_1[0]), /* 1 */
+	0,	/* No PER visible constraints */
+	asn_MBR_RANAP_JoinedMBMSBearerService_IEs_Value_1,
+	3,	/* Elements count */
+	&asn_SPC_RANAP_JoinedMBMSBearerService_IEs_Value_specs_1	/* Additional specs */
+};
+
--- a/src/ranap/RANAP_JoinedMBMSBearerService-IEs.c
+++ b/src/ranap/RANAP_JoinedMBMSBearerService-IEs.c
@ -12,87 +12,11 @@ static asn_per_constraints_t asn_PER_type_RANAP_JoinedMBMSBearerService_IEs_cons
 	{ APC_CONSTRAINED,	 7,  7,  1l,  128l }	/* (SIZE(1..128)) */,
 	0, 0	/* No PER value map */
 };
-static asn_TYPE_member_t asn_MBR_Member_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_JoinedMBMSBearerService_IEs__Member, tMGI),
-		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_TMGI,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"tMGI"
-		},
-	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_JoinedMBMSBearerService_IEs__Member, mBMS_PTP_RAB_ID),
-		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_MBMS_PTP_RAB_ID,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"mBMS-PTP-RAB-ID"
-		},
-	{ ATF_POINTER, 1, offsetof(struct RANAP_JoinedMBMSBearerService_IEs__Member, iE_Extensions),
-		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_ProtocolExtensionContainer,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"iE-Extensions"
-		},
-};
-static const int asn_MAP_Member_oms_2[] = { 2 };
-static const ber_tlv_tag_t asn_DEF_Member_tags_2[] = {
-	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
-};
-static const asn_TYPE_tag2member_t asn_MAP_Member_tag2el_2[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* tMGI */
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* mBMS-PTP-RAB-ID */
-    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
-};
-static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = {
-	sizeof(struct RANAP_JoinedMBMSBearerService_IEs__Member),
-	offsetof(struct RANAP_JoinedMBMSBearerService_IEs__Member, _asn_ctx),
-	asn_MAP_Member_tag2el_2,
-	3,	/* Count of tags in the map */
-	asn_MAP_Member_oms_2,	/* Optional members */
-	1, 0,	/* Root/Additions */
-	2,	/* Start extensions */
-	4	/* Stop extensions */
-};
-static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_Member_2 = {
-	"SEQUENCE",
-	"SEQUENCE",
-	SEQUENCE_free,
-	SEQUENCE_print,
-	SEQUENCE_constraint,
-	SEQUENCE_decode_ber,
-	SEQUENCE_encode_der,
-	SEQUENCE_decode_xer,
-	SEQUENCE_encode_xer,
-	SEQUENCE_decode_uper,
-	SEQUENCE_encode_uper,
-	SEQUENCE_decode_aper,
-	SEQUENCE_encode_aper,
-	0,	/* Use generic outmost tag fetcher */
-	asn_DEF_Member_tags_2,
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	asn_DEF_Member_tags_2,	/* Same as above */
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	0,	/* No PER visible constraints */
-	asn_MBR_Member_2,
-	3,	/* Elements count */
-	&asn_SPC_Member_specs_2	/* Additional specs */
-};
-
 static asn_TYPE_member_t asn_MBR_RANAP_JoinedMBMSBearerService_IEs_1[] = {
 	{ ATF_POINTER, 0, 0,
-		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		-1 /* Ambiguous tag (CHOICE?) */,
 		0,
-		&asn_DEF_Member_2,
+		&asn_DEF_RANAP_JoinedMBMSBearerService_IEs_Value,
 		0,	/* Defer constraints checking to the member type */
 		0,	/* No PER visible constraints */
 		0,
--- a/src/ranap/RANAP_LA-LIST-Value.c
+++ b/src/ranap/RANAP_LA-LIST-Value.c
@ -0,0 +1,84 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "RANAP-IEs"
+ * 	found in "../../asn1/ranap/RANAP-IEs.asn"
+ * 	`asn1c -fcompound-names -R`
+ */
+
+#include <osmocom/ranap/RANAP_LA-LIST-Value.h>
+
+static asn_TYPE_member_t asn_MBR_RANAP_LA_LIST_Value_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_LA_LIST_Value, lAC),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_LAC,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"lAC"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_LA_LIST_Value, listOF_SNAs),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_ListOF_SNAs,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"listOF-SNAs"
+		},
+	{ ATF_POINTER, 1, offsetof(struct RANAP_LA_LIST_Value, iE_Extensions),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_IE_Extensions,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"iE-Extensions"
+		},
+};
+static const int asn_MAP_RANAP_LA_LIST_Value_oms_1[] = { 2 };
+static const ber_tlv_tag_t asn_DEF_RANAP_LA_LIST_Value_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_RANAP_LA_LIST_Value_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* lAC */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* listOF-SNAs */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
+};
+static asn_SEQUENCE_specifics_t asn_SPC_RANAP_LA_LIST_Value_specs_1 = {
+	sizeof(struct RANAP_LA_LIST_Value),
+	offsetof(struct RANAP_LA_LIST_Value, _asn_ctx),
+	asn_MAP_RANAP_LA_LIST_Value_tag2el_1,
+	3,	/* Count of tags in the map */
+	asn_MAP_RANAP_LA_LIST_Value_oms_1,	/* Optional members */
+	1, 0,	/* Root/Additions */
+	2,	/* Start extensions */
+	4	/* Stop extensions */
+};
+asn_TYPE_descriptor_t asn_DEF_RANAP_LA_LIST_Value = {
+	"RANAP_LA-LIST-Value",
+	"RANAP_LA-LIST-Value",
+	SEQUENCE_free,
+	SEQUENCE_print,
+	SEQUENCE_constraint,
+	SEQUENCE_decode_ber,
+	SEQUENCE_encode_der,
+	SEQUENCE_decode_xer,
+	SEQUENCE_encode_xer,
+	SEQUENCE_decode_uper,
+	SEQUENCE_encode_uper,
+	SEQUENCE_decode_aper,
+	SEQUENCE_encode_aper,
+	0,	/* Use generic outmost tag fetcher */
+	asn_DEF_RANAP_LA_LIST_Value_tags_1,
+	sizeof(asn_DEF_RANAP_LA_LIST_Value_tags_1)
+		/sizeof(asn_DEF_RANAP_LA_LIST_Value_tags_1[0]), /* 1 */
+	asn_DEF_RANAP_LA_LIST_Value_tags_1,	/* Same as above */
+	sizeof(asn_DEF_RANAP_LA_LIST_Value_tags_1)
+		/sizeof(asn_DEF_RANAP_LA_LIST_Value_tags_1[0]), /* 1 */
+	0,	/* No PER visible constraints */
+	asn_MBR_RANAP_LA_LIST_Value_1,
+	3,	/* Elements count */
+	&asn_SPC_RANAP_LA_LIST_Value_specs_1	/* Additional specs */
+};
+
--- a/src/ranap/RANAP_LA-LIST.c
+++ b/src/ranap/RANAP_LA-LIST.c
@ -12,87 +12,11 @@ static asn_per_constraints_t asn_PER_type_RANAP_LA_LIST_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED,	 16, -1,  1l,  65536l }	/* (SIZE(1..65536)) */,
 	0, 0	/* No PER value map */
 };
-static asn_TYPE_member_t asn_MBR_Member_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_LA_LIST__Member, lAC),
-		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_LAC,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"lAC"
-		},
-	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_LA_LIST__Member, listOF_SNAs),
-		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_ListOF_SNAs,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"listOF-SNAs"
-		},
-	{ ATF_POINTER, 1, offsetof(struct RANAP_LA_LIST__Member, iE_Extensions),
-		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_IE_Extensions,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"iE-Extensions"
-		},
-};
-static const int asn_MAP_Member_oms_2[] = { 2 };
-static const ber_tlv_tag_t asn_DEF_Member_tags_2[] = {
-	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
-};
-static const asn_TYPE_tag2member_t asn_MAP_Member_tag2el_2[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* lAC */
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* listOF-SNAs */
-    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
-};
-static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = {
-	sizeof(struct RANAP_LA_LIST__Member),
-	offsetof(struct RANAP_LA_LIST__Member, _asn_ctx),
-	asn_MAP_Member_tag2el_2,
-	3,	/* Count of tags in the map */
-	asn_MAP_Member_oms_2,	/* Optional members */
-	1, 0,	/* Root/Additions */
-	2,	/* Start extensions */
-	4	/* Stop extensions */
-};
-static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_Member_2 = {
-	"SEQUENCE",
-	"SEQUENCE",
-	SEQUENCE_free,
-	SEQUENCE_print,
-	SEQUENCE_constraint,
-	SEQUENCE_decode_ber,
-	SEQUENCE_encode_der,
-	SEQUENCE_decode_xer,
-	SEQUENCE_encode_xer,
-	SEQUENCE_decode_uper,
-	SEQUENCE_encode_uper,
-	SEQUENCE_decode_aper,
-	SEQUENCE_encode_aper,
-	0,	/* Use generic outmost tag fetcher */
-	asn_DEF_Member_tags_2,
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	asn_DEF_Member_tags_2,	/* Same as above */
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	0,	/* No PER visible constraints */
-	asn_MBR_Member_2,
-	3,	/* Elements count */
-	&asn_SPC_Member_specs_2	/* Additional specs */
-};
-
 static asn_TYPE_member_t asn_MBR_RANAP_LA_LIST_1[] = {
 	{ ATF_POINTER, 0, 0,
-		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		-1 /* Ambiguous tag (CHOICE?) */,
 		0,
-		&asn_DEF_Member_2,
+		&asn_DEF_RANAP_LA_LIST_Value,
 		0,	/* Defer constraints checking to the member type */
 		0,	/* No PER visible constraints */
 		0,
--- a/src/ranap/RANAP_LeftMBMSBearerService-IEs-Value.c
+++ b/src/ranap/RANAP_LeftMBMSBearerService-IEs-Value.c
@ -0,0 +1,74 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "RANAP-PDU"
+ * 	found in "../../asn1/ranap/RANAP-PDU.asn"
+ * 	`asn1c -fcompound-names -R`
+ */
+
+#include <osmocom/ranap/RANAP_LeftMBMSBearerService-IEs-Value.h>
+
+static asn_TYPE_member_t asn_MBR_RANAP_LeftMBMSBearerService_IEs_Value_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_LeftMBMSBearerService_IEs_Value, tMGI),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_TMGI,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"tMGI"
+		},
+	{ ATF_POINTER, 1, offsetof(struct RANAP_LeftMBMSBearerService_IEs_Value, iE_Extensions),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_ProtocolExtensionContainer,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"iE-Extensions"
+		},
+};
+static const int asn_MAP_RANAP_LeftMBMSBearerService_IEs_Value_oms_1[] = { 1 };
+static const ber_tlv_tag_t asn_DEF_RANAP_LeftMBMSBearerService_IEs_Value_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_RANAP_LeftMBMSBearerService_IEs_Value_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* tMGI */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* iE-Extensions */
+};
+static asn_SEQUENCE_specifics_t asn_SPC_RANAP_LeftMBMSBearerService_IEs_Value_specs_1 = {
+	sizeof(struct RANAP_LeftMBMSBearerService_IEs_Value),
+	offsetof(struct RANAP_LeftMBMSBearerService_IEs_Value, _asn_ctx),
+	asn_MAP_RANAP_LeftMBMSBearerService_IEs_Value_tag2el_1,
+	2,	/* Count of tags in the map */
+	asn_MAP_RANAP_LeftMBMSBearerService_IEs_Value_oms_1,	/* Optional members */
+	1, 0,	/* Root/Additions */
+	1,	/* Start extensions */
+	3	/* Stop extensions */
+};
+asn_TYPE_descriptor_t asn_DEF_RANAP_LeftMBMSBearerService_IEs_Value = {
+	"RANAP_LeftMBMSBearerService-IEs-Value",
+	"RANAP_LeftMBMSBearerService-IEs-Value",
+	SEQUENCE_free,
+	SEQUENCE_print,
+	SEQUENCE_constraint,
+	SEQUENCE_decode_ber,
+	SEQUENCE_encode_der,
+	SEQUENCE_decode_xer,
+	SEQUENCE_encode_xer,
+	SEQUENCE_decode_uper,
+	SEQUENCE_encode_uper,
+	SEQUENCE_decode_aper,
+	SEQUENCE_encode_aper,
+	0,	/* Use generic outmost tag fetcher */
+	asn_DEF_RANAP_LeftMBMSBearerService_IEs_Value_tags_1,
+	sizeof(asn_DEF_RANAP_LeftMBMSBearerService_IEs_Value_tags_1)
+		/sizeof(asn_DEF_RANAP_LeftMBMSBearerService_IEs_Value_tags_1[0]), /* 1 */
+	asn_DEF_RANAP_LeftMBMSBearerService_IEs_Value_tags_1,	/* Same as above */
+	sizeof(asn_DEF_RANAP_LeftMBMSBearerService_IEs_Value_tags_1)
+		/sizeof(asn_DEF_RANAP_LeftMBMSBearerService_IEs_Value_tags_1[0]), /* 1 */
+	0,	/* No PER visible constraints */
+	asn_MBR_RANAP_LeftMBMSBearerService_IEs_Value_1,
+	2,	/* Elements count */
+	&asn_SPC_RANAP_LeftMBMSBearerService_IEs_Value_specs_1	/* Additional specs */
+};
+
--- a/src/ranap/RANAP_LeftMBMSBearerService-IEs.c
+++ b/src/ranap/RANAP_LeftMBMSBearerService-IEs.c
@ -12,77 +12,11 @@ static asn_per_constraints_t asn_PER_type_RANAP_LeftMBMSBearerService_IEs_constr
 	{ APC_CONSTRAINED,	 7,  7,  1l,  128l }	/* (SIZE(1..128)) */,
 	0, 0	/* No PER value map */
 };
-static asn_TYPE_member_t asn_MBR_Member_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_LeftMBMSBearerService_IEs__Member, tMGI),
-		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_TMGI,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"tMGI"
-		},
-	{ ATF_POINTER, 1, offsetof(struct RANAP_LeftMBMSBearerService_IEs__Member, iE_Extensions),
-		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_ProtocolExtensionContainer,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"iE-Extensions"
-		},
-};
-static const int asn_MAP_Member_oms_2[] = { 1 };
-static const ber_tlv_tag_t asn_DEF_Member_tags_2[] = {
-	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
-};
-static const asn_TYPE_tag2member_t asn_MAP_Member_tag2el_2[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* tMGI */
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* iE-Extensions */
-};
-static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = {
-	sizeof(struct RANAP_LeftMBMSBearerService_IEs__Member),
-	offsetof(struct RANAP_LeftMBMSBearerService_IEs__Member, _asn_ctx),
-	asn_MAP_Member_tag2el_2,
-	2,	/* Count of tags in the map */
-	asn_MAP_Member_oms_2,	/* Optional members */
-	1, 0,	/* Root/Additions */
-	1,	/* Start extensions */
-	3	/* Stop extensions */
-};
-static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_Member_2 = {
-	"SEQUENCE",
-	"SEQUENCE",
-	SEQUENCE_free,
-	SEQUENCE_print,
-	SEQUENCE_constraint,
-	SEQUENCE_decode_ber,
-	SEQUENCE_encode_der,
-	SEQUENCE_decode_xer,
-	SEQUENCE_encode_xer,
-	SEQUENCE_decode_uper,
-	SEQUENCE_encode_uper,
-	SEQUENCE_decode_aper,
-	SEQUENCE_encode_aper,
-	0,	/* Use generic outmost tag fetcher */
-	asn_DEF_Member_tags_2,
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	asn_DEF_Member_tags_2,	/* Same as above */
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	0,	/* No PER visible constraints */
-	asn_MBR_Member_2,
-	2,	/* Elements count */
-	&asn_SPC_Member_specs_2	/* Additional specs */
-};
-
 static asn_TYPE_member_t asn_MBR_RANAP_LeftMBMSBearerService_IEs_1[] = {
 	{ ATF_POINTER, 0, 0,
-		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		-1 /* Ambiguous tag (CHOICE?) */,
 		0,
-		&asn_DEF_Member_2,
+		&asn_DEF_RANAP_LeftMBMSBearerService_IEs_Value,
 		0,	/* Defer constraints checking to the member type */
 		0,	/* No PER visible constraints */
 		0,
--- a/src/ranap/RANAP_MessageStructure-Value.c
+++ b/src/ranap/RANAP_MessageStructure-Value.c
@ -0,0 +1,84 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "RANAP-IEs"
+ * 	found in "../../asn1/ranap/RANAP-IEs.asn"
+ * 	`asn1c -fcompound-names -R`
+ */
+
+#include <osmocom/ranap/RANAP_MessageStructure-Value.h>
+
+static asn_TYPE_member_t asn_MBR_RANAP_MessageStructure_Value_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_MessageStructure_Value, iE_ID),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_ProtocolIE_ID,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"iE-ID"
+		},
+	{ ATF_POINTER, 2, offsetof(struct RANAP_MessageStructure_Value, repetitionNumber),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_RepetitionNumber1,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"repetitionNumber"
+		},
+	{ ATF_POINTER, 1, offsetof(struct RANAP_MessageStructure_Value, iE_Extensions),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_IE_Extensions,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"iE-Extensions"
+		},
+};
+static const int asn_MAP_RANAP_MessageStructure_Value_oms_1[] = { 1, 2 };
+static const ber_tlv_tag_t asn_DEF_RANAP_MessageStructure_Value_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_RANAP_MessageStructure_Value_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* iE-ID */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* repetitionNumber */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
+};
+static asn_SEQUENCE_specifics_t asn_SPC_RANAP_MessageStructure_Value_specs_1 = {
+	sizeof(struct RANAP_MessageStructure_Value),
+	offsetof(struct RANAP_MessageStructure_Value, _asn_ctx),
+	asn_MAP_RANAP_MessageStructure_Value_tag2el_1,
+	3,	/* Count of tags in the map */
+	asn_MAP_RANAP_MessageStructure_Value_oms_1,	/* Optional members */
+	2, 0,	/* Root/Additions */
+	2,	/* Start extensions */
+	4	/* Stop extensions */
+};
+asn_TYPE_descriptor_t asn_DEF_RANAP_MessageStructure_Value = {
+	"RANAP_MessageStructure-Value",
+	"RANAP_MessageStructure-Value",
+	SEQUENCE_free,
+	SEQUENCE_print,
+	SEQUENCE_constraint,
+	SEQUENCE_decode_ber,
+	SEQUENCE_encode_der,
+	SEQUENCE_decode_xer,
+	SEQUENCE_encode_xer,
+	SEQUENCE_decode_uper,
+	SEQUENCE_encode_uper,
+	SEQUENCE_decode_aper,
+	SEQUENCE_encode_aper,
+	0,	/* Use generic outmost tag fetcher */
+	asn_DEF_RANAP_MessageStructure_Value_tags_1,
+	sizeof(asn_DEF_RANAP_MessageStructure_Value_tags_1)
+		/sizeof(asn_DEF_RANAP_MessageStructure_Value_tags_1[0]), /* 1 */
+	asn_DEF_RANAP_MessageStructure_Value_tags_1,	/* Same as above */
+	sizeof(asn_DEF_RANAP_MessageStructure_Value_tags_1)
+		/sizeof(asn_DEF_RANAP_MessageStructure_Value_tags_1[0]), /* 1 */
+	0,	/* No PER visible constraints */
+	asn_MBR_RANAP_MessageStructure_Value_1,
+	3,	/* Elements count */
+	&asn_SPC_RANAP_MessageStructure_Value_specs_1	/* Additional specs */
+};
+
--- a/src/ranap/RANAP_MessageStructure.c
+++ b/src/ranap/RANAP_MessageStructure.c
@ -12,87 +12,11 @@ static asn_per_constraints_t asn_PER_type_RANAP_MessageStructure_constr_1 GCC_NO
 	{ APC_CONSTRAINED,	 8,  8,  1l,  256l }	/* (SIZE(1..256)) */,
 	0, 0	/* No PER value map */
 };
-static asn_TYPE_member_t asn_MBR_Member_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_MessageStructure__Member, iE_ID),
-		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_ProtocolIE_ID,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"iE-ID"
-		},
-	{ ATF_POINTER, 2, offsetof(struct RANAP_MessageStructure__Member, repetitionNumber),
-		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_RepetitionNumber1,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"repetitionNumber"
-		},
-	{ ATF_POINTER, 1, offsetof(struct RANAP_MessageStructure__Member, iE_Extensions),
-		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_IE_Extensions,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"iE-Extensions"
-		},
-};
-static const int asn_MAP_Member_oms_2[] = { 1, 2 };
-static const ber_tlv_tag_t asn_DEF_Member_tags_2[] = {
-	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
-};
-static const asn_TYPE_tag2member_t asn_MAP_Member_tag2el_2[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* iE-ID */
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* repetitionNumber */
-    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
-};
-static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = {
-	sizeof(struct RANAP_MessageStructure__Member),
-	offsetof(struct RANAP_MessageStructure__Member, _asn_ctx),
-	asn_MAP_Member_tag2el_2,
-	3,	/* Count of tags in the map */
-	asn_MAP_Member_oms_2,	/* Optional members */
-	2, 0,	/* Root/Additions */
-	2,	/* Start extensions */
-	4	/* Stop extensions */
-};
-static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_Member_2 = {
-	"SEQUENCE",
-	"SEQUENCE",
-	SEQUENCE_free,
-	SEQUENCE_print,
-	SEQUENCE_constraint,
-	SEQUENCE_decode_ber,
-	SEQUENCE_encode_der,
-	SEQUENCE_decode_xer,
-	SEQUENCE_encode_xer,
-	SEQUENCE_decode_uper,
-	SEQUENCE_encode_uper,
-	SEQUENCE_decode_aper,
-	SEQUENCE_encode_aper,
-	0,	/* Use generic outmost tag fetcher */
-	asn_DEF_Member_tags_2,
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	asn_DEF_Member_tags_2,	/* Same as above */
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	0,	/* No PER visible constraints */
-	asn_MBR_Member_2,
-	3,	/* Elements count */
-	&asn_SPC_Member_specs_2	/* Additional specs */
-};
-
 static asn_TYPE_member_t asn_MBR_RANAP_MessageStructure_1[] = {
 	{ ATF_POINTER, 0, 0,
-		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		-1 /* Ambiguous tag (CHOICE?) */,
 		0,
-		&asn_DEF_Member_2,
+		&asn_DEF_RANAP_MessageStructure_Value,
 		0,	/* Defer constraints checking to the member type */
 		0,	/* No PER visible constraints */
 		0,
--- a/src/ranap/RANAP_PLMNs-in-shared-network-Value.c
+++ b/src/ranap/RANAP_PLMNs-in-shared-network-Value.c
@ -0,0 +1,84 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "RANAP-IEs"
+ * 	found in "../../asn1/ranap/RANAP-IEs.asn"
+ * 	`asn1c -fcompound-names -R`
+ */
+
+#include <osmocom/ranap/RANAP_PLMNs-in-shared-network-Value.h>
+
+static asn_TYPE_member_t asn_MBR_RANAP_PLMNs_in_shared_network_Value_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_PLMNs_in_shared_network_Value, pLMNidentity),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_PLMNidentity,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"pLMNidentity"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_PLMNs_in_shared_network_Value, lA_LIST),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_LA_LIST,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"lA-LIST"
+		},
+	{ ATF_POINTER, 1, offsetof(struct RANAP_PLMNs_in_shared_network_Value, iE_Extensions),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_IE_Extensions,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"iE-Extensions"
+		},
+};
+static const int asn_MAP_RANAP_PLMNs_in_shared_network_Value_oms_1[] = { 2 };
+static const ber_tlv_tag_t asn_DEF_RANAP_PLMNs_in_shared_network_Value_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_RANAP_PLMNs_in_shared_network_Value_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* pLMNidentity */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* lA-LIST */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
+};
+static asn_SEQUENCE_specifics_t asn_SPC_RANAP_PLMNs_in_shared_network_Value_specs_1 = {
+	sizeof(struct RANAP_PLMNs_in_shared_network_Value),
+	offsetof(struct RANAP_PLMNs_in_shared_network_Value, _asn_ctx),
+	asn_MAP_RANAP_PLMNs_in_shared_network_Value_tag2el_1,
+	3,	/* Count of tags in the map */
+	asn_MAP_RANAP_PLMNs_in_shared_network_Value_oms_1,	/* Optional members */
+	1, 0,	/* Root/Additions */
+	2,	/* Start extensions */
+	4	/* Stop extensions */
+};
+asn_TYPE_descriptor_t asn_DEF_RANAP_PLMNs_in_shared_network_Value = {
+	"RANAP_PLMNs-in-shared-network-Value",
+	"RANAP_PLMNs-in-shared-network-Value",
+	SEQUENCE_free,
+	SEQUENCE_print,
+	SEQUENCE_constraint,
+	SEQUENCE_decode_ber,
+	SEQUENCE_encode_der,
+	SEQUENCE_decode_xer,
+	SEQUENCE_encode_xer,
+	SEQUENCE_decode_uper,
+	SEQUENCE_encode_uper,
+	SEQUENCE_decode_aper,
+	SEQUENCE_encode_aper,
+	0,	/* Use generic outmost tag fetcher */
+	asn_DEF_RANAP_PLMNs_in_shared_network_Value_tags_1,
+	sizeof(asn_DEF_RANAP_PLMNs_in_shared_network_Value_tags_1)
+		/sizeof(asn_DEF_RANAP_PLMNs_in_shared_network_Value_tags_1[0]), /* 1 */
+	asn_DEF_RANAP_PLMNs_in_shared_network_Value_tags_1,	/* Same as above */
+	sizeof(asn_DEF_RANAP_PLMNs_in_shared_network_Value_tags_1)
+		/sizeof(asn_DEF_RANAP_PLMNs_in_shared_network_Value_tags_1[0]), /* 1 */
+	0,	/* No PER visible constraints */
+	asn_MBR_RANAP_PLMNs_in_shared_network_Value_1,
+	3,	/* Elements count */
+	&asn_SPC_RANAP_PLMNs_in_shared_network_Value_specs_1	/* Additional specs */
+};
+
--- a/src/ranap/RANAP_PLMNs-in-shared-network.c
+++ b/src/ranap/RANAP_PLMNs-in-shared-network.c
@ -12,87 +12,11 @@ static asn_per_constraints_t asn_PER_type_RANAP_PLMNs_in_shared_network_constr_1
 	{ APC_CONSTRAINED,	 5,  5,  1l,  32l }	/* (SIZE(1..32)) */,
 	0, 0	/* No PER value map */
 };
-static asn_TYPE_member_t asn_MBR_Member_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_PLMNs_in_shared_network__Member, pLMNidentity),
-		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_PLMNidentity,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"pLMNidentity"
-		},
-	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_PLMNs_in_shared_network__Member, lA_LIST),
-		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_LA_LIST,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"lA-LIST"
-		},
-	{ ATF_POINTER, 1, offsetof(struct RANAP_PLMNs_in_shared_network__Member, iE_Extensions),
-		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_IE_Extensions,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"iE-Extensions"
-		},
-};
-static const int asn_MAP_Member_oms_2[] = { 2 };
-static const ber_tlv_tag_t asn_DEF_Member_tags_2[] = {
-	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
-};
-static const asn_TYPE_tag2member_t asn_MAP_Member_tag2el_2[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* pLMNidentity */
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* lA-LIST */
-    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
-};
-static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = {
-	sizeof(struct RANAP_PLMNs_in_shared_network__Member),
-	offsetof(struct RANAP_PLMNs_in_shared_network__Member, _asn_ctx),
-	asn_MAP_Member_tag2el_2,
-	3,	/* Count of tags in the map */
-	asn_MAP_Member_oms_2,	/* Optional members */
-	1, 0,	/* Root/Additions */
-	2,	/* Start extensions */
-	4	/* Stop extensions */
-};
-static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_Member_2 = {
-	"SEQUENCE",
-	"SEQUENCE",
-	SEQUENCE_free,
-	SEQUENCE_print,
-	SEQUENCE_constraint,
-	SEQUENCE_decode_ber,
-	SEQUENCE_encode_der,
-	SEQUENCE_decode_xer,
-	SEQUENCE_encode_xer,
-	SEQUENCE_decode_uper,
-	SEQUENCE_encode_uper,
-	SEQUENCE_decode_aper,
-	SEQUENCE_encode_aper,
-	0,	/* Use generic outmost tag fetcher */
-	asn_DEF_Member_tags_2,
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	asn_DEF_Member_tags_2,	/* Same as above */
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	0,	/* No PER visible constraints */
-	asn_MBR_Member_2,
-	3,	/* Elements count */
-	&asn_SPC_Member_specs_2	/* Additional specs */
-};
-
 static asn_TYPE_member_t asn_MBR_RANAP_PLMNs_in_shared_network_1[] = {
 	{ ATF_POINTER, 0, 0,
-		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		-1 /* Ambiguous tag (CHOICE?) */,
 		0,
-		&asn_DEF_Member_2,
+		&asn_DEF_RANAP_PLMNs_in_shared_network_Value,
 		0,	/* Defer constraints checking to the member type */
 		0,	/* No PER visible constraints */
 		0,
--- a/src/ranap/RANAP_RABDataVolumeReport-Value.c
+++ b/src/ranap/RANAP_RABDataVolumeReport-Value.c
@ -0,0 +1,84 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "RANAP-IEs"
+ * 	found in "../../asn1/ranap/RANAP-IEs.asn"
+ * 	`asn1c -fcompound-names -R`
+ */
+
+#include <osmocom/ranap/RANAP_RABDataVolumeReport-Value.h>
+
+static asn_TYPE_member_t asn_MBR_RANAP_RABDataVolumeReport_Value_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RABDataVolumeReport_Value, dl_UnsuccessfullyTransmittedDataVolume),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_UnsuccessfullyTransmittedDataVolume,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"dl-UnsuccessfullyTransmittedDataVolume"
+		},
+	{ ATF_POINTER, 2, offsetof(struct RANAP_RABDataVolumeReport_Value, dataVolumeReference),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_DataVolumeReference,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"dataVolumeReference"
+		},
+	{ ATF_POINTER, 1, offsetof(struct RANAP_RABDataVolumeReport_Value, iE_Extensions),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_IE_Extensions,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"iE-Extensions"
+		},
+};
+static const int asn_MAP_RANAP_RABDataVolumeReport_Value_oms_1[] = { 1, 2 };
+static const ber_tlv_tag_t asn_DEF_RANAP_RABDataVolumeReport_Value_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_RANAP_RABDataVolumeReport_Value_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* dl-UnsuccessfullyTransmittedDataVolume */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* dataVolumeReference */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
+};
+static asn_SEQUENCE_specifics_t asn_SPC_RANAP_RABDataVolumeReport_Value_specs_1 = {
+	sizeof(struct RANAP_RABDataVolumeReport_Value),
+	offsetof(struct RANAP_RABDataVolumeReport_Value, _asn_ctx),
+	asn_MAP_RANAP_RABDataVolumeReport_Value_tag2el_1,
+	3,	/* Count of tags in the map */
+	asn_MAP_RANAP_RABDataVolumeReport_Value_oms_1,	/* Optional members */
+	2, 0,	/* Root/Additions */
+	2,	/* Start extensions */
+	4	/* Stop extensions */
+};
+asn_TYPE_descriptor_t asn_DEF_RANAP_RABDataVolumeReport_Value = {
+	"RANAP_RABDataVolumeReport-Value",
+	"RANAP_RABDataVolumeReport-Value",
+	SEQUENCE_free,
+	SEQUENCE_print,
+	SEQUENCE_constraint,
+	SEQUENCE_decode_ber,
+	SEQUENCE_encode_der,
+	SEQUENCE_decode_xer,
+	SEQUENCE_encode_xer,
+	SEQUENCE_decode_uper,
+	SEQUENCE_encode_uper,
+	SEQUENCE_decode_aper,
+	SEQUENCE_encode_aper,
+	0,	/* Use generic outmost tag fetcher */
+	asn_DEF_RANAP_RABDataVolumeReport_Value_tags_1,
+	sizeof(asn_DEF_RANAP_RABDataVolumeReport_Value_tags_1)
+		/sizeof(asn_DEF_RANAP_RABDataVolumeReport_Value_tags_1[0]), /* 1 */
+	asn_DEF_RANAP_RABDataVolumeReport_Value_tags_1,	/* Same as above */
+	sizeof(asn_DEF_RANAP_RABDataVolumeReport_Value_tags_1)
+		/sizeof(asn_DEF_RANAP_RABDataVolumeReport_Value_tags_1[0]), /* 1 */
+	0,	/* No PER visible constraints */
+	asn_MBR_RANAP_RABDataVolumeReport_Value_1,
+	3,	/* Elements count */
+	&asn_SPC_RANAP_RABDataVolumeReport_Value_specs_1	/* Additional specs */
+};
+
--- a/src/ranap/RANAP_RABDataVolumeReport.c
+++ b/src/ranap/RANAP_RABDataVolumeReport.c
@ -12,87 +12,11 @@ static asn_per_constraints_t asn_PER_type_RANAP_RABDataVolumeReport_constr_1 GCC
 	{ APC_CONSTRAINED,	 1,  1,  1l,  2l }	/* (SIZE(1..2)) */,
 	0, 0	/* No PER value map */
 };
-static asn_TYPE_member_t asn_MBR_Member_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RABDataVolumeReport__Member, dl_UnsuccessfullyTransmittedDataVolume),
-		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_UnsuccessfullyTransmittedDataVolume,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"dl-UnsuccessfullyTransmittedDataVolume"
-		},
-	{ ATF_POINTER, 2, offsetof(struct RANAP_RABDataVolumeReport__Member, dataVolumeReference),
-		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_DataVolumeReference,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"dataVolumeReference"
-		},
-	{ ATF_POINTER, 1, offsetof(struct RANAP_RABDataVolumeReport__Member, iE_Extensions),
-		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_IE_Extensions,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"iE-Extensions"
-		},
-};
-static const int asn_MAP_Member_oms_2[] = { 1, 2 };
-static const ber_tlv_tag_t asn_DEF_Member_tags_2[] = {
-	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
-};
-static const asn_TYPE_tag2member_t asn_MAP_Member_tag2el_2[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* dl-UnsuccessfullyTransmittedDataVolume */
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* dataVolumeReference */
-    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
-};
-static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = {
-	sizeof(struct RANAP_RABDataVolumeReport__Member),
-	offsetof(struct RANAP_RABDataVolumeReport__Member, _asn_ctx),
-	asn_MAP_Member_tag2el_2,
-	3,	/* Count of tags in the map */
-	asn_MAP_Member_oms_2,	/* Optional members */
-	2, 0,	/* Root/Additions */
-	2,	/* Start extensions */
-	4	/* Stop extensions */
-};
-static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_Member_2 = {
-	"SEQUENCE",
-	"SEQUENCE",
-	SEQUENCE_free,
-	SEQUENCE_print,
-	SEQUENCE_constraint,
-	SEQUENCE_decode_ber,
-	SEQUENCE_encode_der,
-	SEQUENCE_decode_xer,
-	SEQUENCE_encode_xer,
-	SEQUENCE_decode_uper,
-	SEQUENCE_encode_uper,
-	SEQUENCE_decode_aper,
-	SEQUENCE_encode_aper,
-	0,	/* Use generic outmost tag fetcher */
-	asn_DEF_Member_tags_2,
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	asn_DEF_Member_tags_2,	/* Same as above */
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	0,	/* No PER visible constraints */
-	asn_MBR_Member_2,
-	3,	/* Elements count */
-	&asn_SPC_Member_specs_2	/* Additional specs */
-};
-
 static asn_TYPE_member_t asn_MBR_RANAP_RABDataVolumeReport_1[] = {
 	{ ATF_POINTER, 0, 0,
-		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		-1 /* Ambiguous tag (CHOICE?) */,
 		0,
-		&asn_DEF_Member_2,
+		&asn_DEF_RANAP_RABDataVolumeReport_Value,
 		0,	/* Defer constraints checking to the member type */
 		0,	/* No PER visible constraints */
 		0,
--- a/src/ranap/RANAP_RABParametersList-Value.c
+++ b/src/ranap/RANAP_RABParametersList-Value.c
@ -0,0 +1,104 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "RANAP-IEs"
+ * 	found in "../../asn1/ranap/RANAP-IEs.asn"
+ * 	`asn1c -fcompound-names -R`
+ */
+
+#include <osmocom/ranap/RANAP_RABParametersList-Value.h>
+
+static asn_TYPE_member_t asn_MBR_RANAP_RABParametersList_Value_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RABParametersList_Value, rab_Id),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_RAB_ID,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"rab-Id"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RABParametersList_Value, cn_domain),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_CN_DomainIndicator,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"cn-domain"
+		},
+	{ ATF_POINTER, 3, offsetof(struct RANAP_RABParametersList_Value, rabDataVolumeReport),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_RABDataVolumeReport,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"rabDataVolumeReport"
+		},
+	{ ATF_POINTER, 2, offsetof(struct RANAP_RABParametersList_Value, upInformation),
+		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_UPInformation,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"upInformation"
+		},
+	{ ATF_POINTER, 1, offsetof(struct RANAP_RABParametersList_Value, iE_Extensions),
+		(ASN_TAG_CLASS_CONTEXT | (4 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_IE_Extensions,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"iE-Extensions"
+		},
+};
+static const int asn_MAP_RANAP_RABParametersList_Value_oms_1[] = { 2, 3, 4 };
+static const ber_tlv_tag_t asn_DEF_RANAP_RABParametersList_Value_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_RANAP_RABParametersList_Value_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* rab-Id */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* cn-domain */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* rabDataVolumeReport */
+    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 }, /* upInformation */
+    { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 4, 0, 0 } /* iE-Extensions */
+};
+static asn_SEQUENCE_specifics_t asn_SPC_RANAP_RABParametersList_Value_specs_1 = {
+	sizeof(struct RANAP_RABParametersList_Value),
+	offsetof(struct RANAP_RABParametersList_Value, _asn_ctx),
+	asn_MAP_RANAP_RABParametersList_Value_tag2el_1,
+	5,	/* Count of tags in the map */
+	asn_MAP_RANAP_RABParametersList_Value_oms_1,	/* Optional members */
+	3, 0,	/* Root/Additions */
+	4,	/* Start extensions */
+	6	/* Stop extensions */
+};
+asn_TYPE_descriptor_t asn_DEF_RANAP_RABParametersList_Value = {
+	"RANAP_RABParametersList-Value",
+	"RANAP_RABParametersList-Value",
+	SEQUENCE_free,
+	SEQUENCE_print,
+	SEQUENCE_constraint,
+	SEQUENCE_decode_ber,
+	SEQUENCE_encode_der,
+	SEQUENCE_decode_xer,
+	SEQUENCE_encode_xer,
+	SEQUENCE_decode_uper,
+	SEQUENCE_encode_uper,
+	SEQUENCE_decode_aper,
+	SEQUENCE_encode_aper,
+	0,	/* Use generic outmost tag fetcher */
+	asn_DEF_RANAP_RABParametersList_Value_tags_1,
+	sizeof(asn_DEF_RANAP_RABParametersList_Value_tags_1)
+		/sizeof(asn_DEF_RANAP_RABParametersList_Value_tags_1[0]), /* 1 */
+	asn_DEF_RANAP_RABParametersList_Value_tags_1,	/* Same as above */
+	sizeof(asn_DEF_RANAP_RABParametersList_Value_tags_1)
+		/sizeof(asn_DEF_RANAP_RABParametersList_Value_tags_1[0]), /* 1 */
+	0,	/* No PER visible constraints */
+	asn_MBR_RANAP_RABParametersList_Value_1,
+	5,	/* Elements count */
+	&asn_SPC_RANAP_RABParametersList_Value_specs_1	/* Additional specs */
+};
+
--- a/src/ranap/RANAP_RABParametersList.c
+++ b/src/ranap/RANAP_RABParametersList.c
@ -12,107 +12,11 @@ static asn_per_constraints_t asn_PER_type_RANAP_RABParametersList_constr_1 GCC_N
 	{ APC_CONSTRAINED,	 8,  8,  1l,  256l }	/* (SIZE(1..256)) */,
 	0, 0	/* No PER value map */
 };
-static asn_TYPE_member_t asn_MBR_Member_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RABParametersList__Member, rab_Id),
-		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_RAB_ID,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"rab-Id"
-		},
-	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RABParametersList__Member, cn_domain),
-		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_CN_DomainIndicator,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"cn-domain"
-		},
-	{ ATF_POINTER, 3, offsetof(struct RANAP_RABParametersList__Member, rabDataVolumeReport),
-		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_RABDataVolumeReport,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"rabDataVolumeReport"
-		},
-	{ ATF_POINTER, 2, offsetof(struct RANAP_RABParametersList__Member, upInformation),
-		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_UPInformation,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"upInformation"
-		},
-	{ ATF_POINTER, 1, offsetof(struct RANAP_RABParametersList__Member, iE_Extensions),
-		(ASN_TAG_CLASS_CONTEXT | (4 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_IE_Extensions,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"iE-Extensions"
-		},
-};
-static const int asn_MAP_Member_oms_2[] = { 2, 3, 4 };
-static const ber_tlv_tag_t asn_DEF_Member_tags_2[] = {
-	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
-};
-static const asn_TYPE_tag2member_t asn_MAP_Member_tag2el_2[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* rab-Id */
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* cn-domain */
-    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* rabDataVolumeReport */
-    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 }, /* upInformation */
-    { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 4, 0, 0 } /* iE-Extensions */
-};
-static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = {
-	sizeof(struct RANAP_RABParametersList__Member),
-	offsetof(struct RANAP_RABParametersList__Member, _asn_ctx),
-	asn_MAP_Member_tag2el_2,
-	5,	/* Count of tags in the map */
-	asn_MAP_Member_oms_2,	/* Optional members */
-	3, 0,	/* Root/Additions */
-	4,	/* Start extensions */
-	6	/* Stop extensions */
-};
-static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_Member_2 = {
-	"SEQUENCE",
-	"SEQUENCE",
-	SEQUENCE_free,
-	SEQUENCE_print,
-	SEQUENCE_constraint,
-	SEQUENCE_decode_ber,
-	SEQUENCE_encode_der,
-	SEQUENCE_decode_xer,
-	SEQUENCE_encode_xer,
-	SEQUENCE_decode_uper,
-	SEQUENCE_encode_uper,
-	SEQUENCE_decode_aper,
-	SEQUENCE_encode_aper,
-	0,	/* Use generic outmost tag fetcher */
-	asn_DEF_Member_tags_2,
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	asn_DEF_Member_tags_2,	/* Same as above */
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	0,	/* No PER visible constraints */
-	asn_MBR_Member_2,
-	5,	/* Elements count */
-	&asn_SPC_Member_specs_2	/* Additional specs */
-};
-
 static asn_TYPE_member_t asn_MBR_RANAP_RABParametersList_1[] = {
 	{ ATF_POINTER, 0, 0,
-		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		-1 /* Ambiguous tag (CHOICE?) */,
 		0,
-		&asn_DEF_Member_2,
+		&asn_DEF_RANAP_RABParametersList_Value,
 		0,	/* Defer constraints checking to the member type */
 		0,	/* No PER visible constraints */
 		0,
--- a/src/ranap/RANAP_UnsuccessfulLinking-IEs-Value.c
+++ b/src/ranap/RANAP_UnsuccessfulLinking-IEs-Value.c
@ -0,0 +1,84 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "RANAP-PDU"
+ * 	found in "../../asn1/ranap/RANAP-PDU.asn"
+ * 	`asn1c -fcompound-names -R`
+ */
+
+#include <osmocom/ranap/RANAP_UnsuccessfulLinking-IEs-Value.h>
+
+static asn_TYPE_member_t asn_MBR_RANAP_UnsuccessfulLinking_IEs_Value_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_UnsuccessfulLinking_IEs_Value, tMGI),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_TMGI,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"tMGI"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_UnsuccessfulLinking_IEs_Value, cause),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		+1,	/* EXPLICIT tag at current level */
+		&asn_DEF_RANAP_Cause,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"cause"
+		},
+	{ ATF_POINTER, 1, offsetof(struct RANAP_UnsuccessfulLinking_IEs_Value, iE_Extensions),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RANAP_ProtocolExtensionContainer,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"iE-Extensions"
+		},
+};
+static const int asn_MAP_RANAP_UnsuccessfulLinking_IEs_Value_oms_1[] = { 2 };
+static const ber_tlv_tag_t asn_DEF_RANAP_UnsuccessfulLinking_IEs_Value_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_RANAP_UnsuccessfulLinking_IEs_Value_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* tMGI */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* cause */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
+};
+static asn_SEQUENCE_specifics_t asn_SPC_RANAP_UnsuccessfulLinking_IEs_Value_specs_1 = {
+	sizeof(struct RANAP_UnsuccessfulLinking_IEs_Value),
+	offsetof(struct RANAP_UnsuccessfulLinking_IEs_Value, _asn_ctx),
+	asn_MAP_RANAP_UnsuccessfulLinking_IEs_Value_tag2el_1,
+	3,	/* Count of tags in the map */
+	asn_MAP_RANAP_UnsuccessfulLinking_IEs_Value_oms_1,	/* Optional members */
+	1, 0,	/* Root/Additions */
+	2,	/* Start extensions */
+	4	/* Stop extensions */
+};
+asn_TYPE_descriptor_t asn_DEF_RANAP_UnsuccessfulLinking_IEs_Value = {
+	"RANAP_UnsuccessfulLinking-IEs-Value",
+	"RANAP_UnsuccessfulLinking-IEs-Value",
+	SEQUENCE_free,
+	SEQUENCE_print,
+	SEQUENCE_constraint,
+	SEQUENCE_decode_ber,
+	SEQUENCE_encode_der,
+	SEQUENCE_decode_xer,
+	SEQUENCE_encode_xer,
+	SEQUENCE_decode_uper,
+	SEQUENCE_encode_uper,
+	SEQUENCE_decode_aper,
+	SEQUENCE_encode_aper,
+	0,	/* Use generic outmost tag fetcher */
+	asn_DEF_RANAP_UnsuccessfulLinking_IEs_Value_tags_1,
+	sizeof(asn_DEF_RANAP_UnsuccessfulLinking_IEs_Value_tags_1)
+		/sizeof(asn_DEF_RANAP_UnsuccessfulLinking_IEs_Value_tags_1[0]), /* 1 */
+	asn_DEF_RANAP_UnsuccessfulLinking_IEs_Value_tags_1,	/* Same as above */
+	sizeof(asn_DEF_RANAP_UnsuccessfulLinking_IEs_Value_tags_1)
+		/sizeof(asn_DEF_RANAP_UnsuccessfulLinking_IEs_Value_tags_1[0]), /* 1 */
+	0,	/* No PER visible constraints */
+	asn_MBR_RANAP_UnsuccessfulLinking_IEs_Value_1,
+	3,	/* Elements count */
+	&asn_SPC_RANAP_UnsuccessfulLinking_IEs_Value_specs_1	/* Additional specs */
+};
+
--- a/src/ranap/RANAP_UnsuccessfulLinking-IEs.c
+++ b/src/ranap/RANAP_UnsuccessfulLinking-IEs.c
@ -12,87 +12,11 @@ static asn_per_constraints_t asn_PER_type_RANAP_UnsuccessfulLinking_IEs_constr_1
 	{ APC_CONSTRAINED,	 7,  7,  1l,  128l }	/* (SIZE(1..128)) */,
 	0, 0	/* No PER value map */
 };
-static asn_TYPE_member_t asn_MBR_Member_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_UnsuccessfulLinking_IEs__Member, tMGI),
-		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_TMGI,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"tMGI"
-		},
-	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_UnsuccessfulLinking_IEs__Member, cause),
-		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
-		+1,	/* EXPLICIT tag at current level */
-		&asn_DEF_RANAP_Cause,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"cause"
-		},
-	{ ATF_POINTER, 1, offsetof(struct RANAP_UnsuccessfulLinking_IEs__Member, iE_Extensions),
-		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RANAP_ProtocolExtensionContainer,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"iE-Extensions"
-		},
-};
-static const int asn_MAP_Member_oms_2[] = { 2 };
-static const ber_tlv_tag_t asn_DEF_Member_tags_2[] = {
-	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
-};
-static const asn_TYPE_tag2member_t asn_MAP_Member_tag2el_2[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* tMGI */
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* cause */
-    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
-};
-static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = {
-	sizeof(struct RANAP_UnsuccessfulLinking_IEs__Member),
-	offsetof(struct RANAP_UnsuccessfulLinking_IEs__Member, _asn_ctx),
-	asn_MAP_Member_tag2el_2,
-	3,	/* Count of tags in the map */
-	asn_MAP_Member_oms_2,	/* Optional members */
-	1, 0,	/* Root/Additions */
-	2,	/* Start extensions */
-	4	/* Stop extensions */
-};
-static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_Member_2 = {
-	"SEQUENCE",
-	"SEQUENCE",
-	SEQUENCE_free,
-	SEQUENCE_print,
-	SEQUENCE_constraint,
-	SEQUENCE_decode_ber,
-	SEQUENCE_encode_der,
-	SEQUENCE_decode_xer,
-	SEQUENCE_encode_xer,
-	SEQUENCE_decode_uper,
-	SEQUENCE_encode_uper,
-	SEQUENCE_decode_aper,
-	SEQUENCE_encode_aper,
-	0,	/* Use generic outmost tag fetcher */
-	asn_DEF_Member_tags_2,
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	asn_DEF_Member_tags_2,	/* Same as above */
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	0,	/* No PER visible constraints */
-	asn_MBR_Member_2,
-	3,	/* Elements count */
-	&asn_SPC_Member_specs_2	/* Additional specs */
-};
-
 static asn_TYPE_member_t asn_MBR_RANAP_UnsuccessfulLinking_IEs_1[] = {
 	{ ATF_POINTER, 0, 0,
-		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		-1 /* Ambiguous tag (CHOICE?) */,
 		0,
-		&asn_DEF_Member_2,
+		&asn_DEF_RANAP_UnsuccessfulLinking_IEs_Value,
 		0,	/* Defer constraints checking to the member type */
 		0,	/* No PER visible constraints */
 		0,
--- a/src/rua/Makefile.am
+++ b/src/rua/Makefile.am
@ -22,6 +22,7 @@ ASN_MODULE_SOURCES=	\
 	RUA_CauseMisc.c	\
 	RUA_CriticalityDiagnostics.c	\
 	RUA_CriticalityDiagnostics-IE-List.c	\
+	RUA_CriticalityDiagnostics-IE-List-Value.c	\
 	RUA_TypeOfError.c	\
 	RUA_RUA-PDU.c	\
 	RUA_InitiatingMessage.c	\
@ -59,6 +60,7 @@ ASN_MODULE_INC=	\
 	RUA_CauseMisc.h	\
 	RUA_CriticalityDiagnostics.h	\
 	RUA_CriticalityDiagnostics-IE-List.h	\
+	RUA_CriticalityDiagnostics-IE-List-Value.h	\
 	RUA_TypeOfError.h	\
 	RUA_RUA-PDU.h	\
 	RUA_InitiatingMessage.h	\
--- a/src/rua/RUA_CriticalityDiagnostics-IE-List-Value.c
+++ b/src/rua/RUA_CriticalityDiagnostics-IE-List-Value.c
@ -0,0 +1,94 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "RUA-IEs"
+ * 	found in "../../asn1/rua/RUA-IEs.asn"
+ * 	`asn1c -R -fcompound-names`
+ */
+
+#include <osmocom/rua/RUA_CriticalityDiagnostics-IE-List-Value.h>
+
+static asn_TYPE_member_t asn_MBR_RUA_CriticalityDiagnostics_IE_List_Value_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct RUA_CriticalityDiagnostics_IE_List_Value, iECriticality),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RUA_Criticality,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"iECriticality"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct RUA_CriticalityDiagnostics_IE_List_Value, iE_ID),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RUA_ProtocolIE_ID,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"iE-ID"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct RUA_CriticalityDiagnostics_IE_List_Value, typeOfError),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RUA_TypeOfError,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"typeOfError"
+		},
+	{ ATF_POINTER, 1, offsetof(struct RUA_CriticalityDiagnostics_IE_List_Value, iE_Extensions),
+		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_RUA_IE_Extensions,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"iE-Extensions"
+		},
+};
+static const int asn_MAP_RUA_CriticalityDiagnostics_IE_List_Value_oms_1[] = { 3 };
+static const ber_tlv_tag_t asn_DEF_RUA_CriticalityDiagnostics_IE_List_Value_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_RUA_CriticalityDiagnostics_IE_List_Value_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* iECriticality */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* iE-ID */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* typeOfError */
+    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* iE-Extensions */
+};
+static asn_SEQUENCE_specifics_t asn_SPC_RUA_CriticalityDiagnostics_IE_List_Value_specs_1 = {
+	sizeof(struct RUA_CriticalityDiagnostics_IE_List_Value),
+	offsetof(struct RUA_CriticalityDiagnostics_IE_List_Value, _asn_ctx),
+	asn_MAP_RUA_CriticalityDiagnostics_IE_List_Value_tag2el_1,
+	4,	/* Count of tags in the map */
+	asn_MAP_RUA_CriticalityDiagnostics_IE_List_Value_oms_1,	/* Optional members */
+	1, 0,	/* Root/Additions */
+	3,	/* Start extensions */
+	5	/* Stop extensions */
+};
+asn_TYPE_descriptor_t asn_DEF_RUA_CriticalityDiagnostics_IE_List_Value = {
+	"RUA_CriticalityDiagnostics-IE-List-Value",
+	"RUA_CriticalityDiagnostics-IE-List-Value",
+	SEQUENCE_free,
+	SEQUENCE_print,
+	SEQUENCE_constraint,
+	SEQUENCE_decode_ber,
+	SEQUENCE_encode_der,
+	SEQUENCE_decode_xer,
+	SEQUENCE_encode_xer,
+	SEQUENCE_decode_uper,
+	SEQUENCE_encode_uper,
+	SEQUENCE_decode_aper,
+	SEQUENCE_encode_aper,
+	0,	/* Use generic outmost tag fetcher */
+	asn_DEF_RUA_CriticalityDiagnostics_IE_List_Value_tags_1,
+	sizeof(asn_DEF_RUA_CriticalityDiagnostics_IE_List_Value_tags_1)
+		/sizeof(asn_DEF_RUA_CriticalityDiagnostics_IE_List_Value_tags_1[0]), /* 1 */
+	asn_DEF_RUA_CriticalityDiagnostics_IE_List_Value_tags_1,	/* Same as above */
+	sizeof(asn_DEF_RUA_CriticalityDiagnostics_IE_List_Value_tags_1)
+		/sizeof(asn_DEF_RUA_CriticalityDiagnostics_IE_List_Value_tags_1[0]), /* 1 */
+	0,	/* No PER visible constraints */
+	asn_MBR_RUA_CriticalityDiagnostics_IE_List_Value_1,
+	4,	/* Elements count */
+	&asn_SPC_RUA_CriticalityDiagnostics_IE_List_Value_specs_1	/* Additional specs */
+};
+
--- a/src/rua/RUA_CriticalityDiagnostics-IE-List.c
+++ b/src/rua/RUA_CriticalityDiagnostics-IE-List.c
@ -12,97 +12,11 @@ static asn_per_constraints_t asn_PER_type_RUA_CriticalityDiagnostics_IE_List_con
 	{ APC_CONSTRAINED,	 8,  8,  1l,  256l }	/* (SIZE(1..256)) */,
 	0, 0	/* No PER value map */
 };
-static asn_TYPE_member_t asn_MBR_Member_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct RUA_CriticalityDiagnostics_IE_List__Member, iECriticality),
-		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RUA_Criticality,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"iECriticality"
-		},
-	{ ATF_NOFLAGS, 0, offsetof(struct RUA_CriticalityDiagnostics_IE_List__Member, iE_ID),
-		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RUA_ProtocolIE_ID,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"iE-ID"
-		},
-	{ ATF_NOFLAGS, 0, offsetof(struct RUA_CriticalityDiagnostics_IE_List__Member, typeOfError),
-		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RUA_TypeOfError,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"typeOfError"
-		},
-	{ ATF_POINTER, 1, offsetof(struct RUA_CriticalityDiagnostics_IE_List__Member, iE_Extensions),
-		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_RUA_IE_Extensions,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"iE-Extensions"
-		},
-};
-static const int asn_MAP_Member_oms_2[] = { 3 };
-static const ber_tlv_tag_t asn_DEF_Member_tags_2[] = {
-	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
-};
-static const asn_TYPE_tag2member_t asn_MAP_Member_tag2el_2[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* iECriticality */
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* iE-ID */
-    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* typeOfError */
-    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* iE-Extensions */
-};
-static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = {
-	sizeof(struct RUA_CriticalityDiagnostics_IE_List__Member),
-	offsetof(struct RUA_CriticalityDiagnostics_IE_List__Member, _asn_ctx),
-	asn_MAP_Member_tag2el_2,
-	4,	/* Count of tags in the map */
-	asn_MAP_Member_oms_2,	/* Optional members */
-	1, 0,	/* Root/Additions */
-	3,	/* Start extensions */
-	5	/* Stop extensions */
-};
-static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_Member_2 = {
-	"SEQUENCE",
-	"SEQUENCE",
-	SEQUENCE_free,
-	SEQUENCE_print,
-	SEQUENCE_constraint,
-	SEQUENCE_decode_ber,
-	SEQUENCE_encode_der,
-	SEQUENCE_decode_xer,
-	SEQUENCE_encode_xer,
-	SEQUENCE_decode_uper,
-	SEQUENCE_encode_uper,
-	SEQUENCE_decode_aper,
-	SEQUENCE_encode_aper,
-	0,	/* Use generic outmost tag fetcher */
-	asn_DEF_Member_tags_2,
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	asn_DEF_Member_tags_2,	/* Same as above */
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	0,	/* No PER visible constraints */
-	asn_MBR_Member_2,
-	4,	/* Elements count */
-	&asn_SPC_Member_specs_2	/* Additional specs */
-};
-
 static asn_TYPE_member_t asn_MBR_RUA_CriticalityDiagnostics_IE_List_1[] = {
 	{ ATF_POINTER, 0, 0,
-		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		-1 /* Ambiguous tag (CHOICE?) */,
 		0,
-		&asn_DEF_Member_2,
+		&asn_DEF_RUA_CriticalityDiagnostics_IE_List_Value,
 		0,	/* Defer constraints checking to the member type */
 		0,	/* No PER visible constraints */
 		0,
--- a/src/sabp/Makefile.am
+++ b/src/sabp/Makefile.am
@ -17,7 +17,9 @@ ASN_MODULE_SRC=	\
 	SABP_Cause.c	\
 	SABP_Criticality-Diagnostics.c	\
 	SABP_CriticalityDiagnostics-IE-List.c	\
+	SABP_CriticalityDiagnostics-IE-List-Value.c	\
 	SABP_MessageStructure.c	\
+	SABP_MessageStructure-Value.c	\
 	SABP_Data-Coding-Scheme.c	\
 	SABP_Failure-List.c	\
 	SABP_Failure-List-Item.c	\
@ -81,7 +83,9 @@ ASN_MODULE_INC=	\
 	SABP_Cause.h	\
 	SABP_Criticality-Diagnostics.h	\
 	SABP_CriticalityDiagnostics-IE-List.h	\
+	SABP_CriticalityDiagnostics-IE-List-Value.h	\
 	SABP_MessageStructure.h	\
+	SABP_MessageStructure-Value.h	\
 	SABP_Data-Coding-Scheme.h	\
 	SABP_Failure-List.h	\
 	SABP_Failure-List-Item.h	\
--- a/src/sabp/SABP_CriticalityDiagnostics-IE-List-Value.c
+++ b/src/sabp/SABP_CriticalityDiagnostics-IE-List-Value.c
@ -0,0 +1,94 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "SABP-IEs"
+ * 	found in "../../asn1/sabp/SABP-IEs.asn"
+ * 	`asn1c -R -fcompound-names`
+ */
+
+#include <osmocom/sabp/SABP_CriticalityDiagnostics-IE-List-Value.h>
+
+static asn_TYPE_member_t asn_MBR_SABP_CriticalityDiagnostics_IE_List_Value_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct SABP_CriticalityDiagnostics_IE_List_Value, iECriticality),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_SABP_Criticality,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"iECriticality"
+		},
+	{ ATF_NOFLAGS, 0, offsetof(struct SABP_CriticalityDiagnostics_IE_List_Value, iE_ID),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_SABP_ProtocolIE_ID,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"iE-ID"
+		},
+	{ ATF_POINTER, 2, offsetof(struct SABP_CriticalityDiagnostics_IE_List_Value, repetitionNumber),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_SABP_RepetitionNumber0,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"repetitionNumber"
+		},
+	{ ATF_POINTER, 1, offsetof(struct SABP_CriticalityDiagnostics_IE_List_Value, iE_Extensions),
+		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_SABP_IE_Extensions,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"iE-Extensions"
+		},
+};
+static const int asn_MAP_SABP_CriticalityDiagnostics_IE_List_Value_oms_1[] = { 2, 3 };
+static const ber_tlv_tag_t asn_DEF_SABP_CriticalityDiagnostics_IE_List_Value_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_SABP_CriticalityDiagnostics_IE_List_Value_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* iECriticality */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* iE-ID */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* repetitionNumber */
+    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* iE-Extensions */
+};
+static asn_SEQUENCE_specifics_t asn_SPC_SABP_CriticalityDiagnostics_IE_List_Value_specs_1 = {
+	sizeof(struct SABP_CriticalityDiagnostics_IE_List_Value),
+	offsetof(struct SABP_CriticalityDiagnostics_IE_List_Value, _asn_ctx),
+	asn_MAP_SABP_CriticalityDiagnostics_IE_List_Value_tag2el_1,
+	4,	/* Count of tags in the map */
+	asn_MAP_SABP_CriticalityDiagnostics_IE_List_Value_oms_1,	/* Optional members */
+	2, 0,	/* Root/Additions */
+	3,	/* Start extensions */
+	5	/* Stop extensions */
+};
+asn_TYPE_descriptor_t asn_DEF_SABP_CriticalityDiagnostics_IE_List_Value = {
+	"SABP_CriticalityDiagnostics-IE-List-Value",
+	"SABP_CriticalityDiagnostics-IE-List-Value",
+	SEQUENCE_free,
+	SEQUENCE_print,
+	SEQUENCE_constraint,
+	SEQUENCE_decode_ber,
+	SEQUENCE_encode_der,
+	SEQUENCE_decode_xer,
+	SEQUENCE_encode_xer,
+	SEQUENCE_decode_uper,
+	SEQUENCE_encode_uper,
+	SEQUENCE_decode_aper,
+	SEQUENCE_encode_aper,
+	0,	/* Use generic outmost tag fetcher */
+	asn_DEF_SABP_CriticalityDiagnostics_IE_List_Value_tags_1,
+	sizeof(asn_DEF_SABP_CriticalityDiagnostics_IE_List_Value_tags_1)
+		/sizeof(asn_DEF_SABP_CriticalityDiagnostics_IE_List_Value_tags_1[0]), /* 1 */
+	asn_DEF_SABP_CriticalityDiagnostics_IE_List_Value_tags_1,	/* Same as above */
+	sizeof(asn_DEF_SABP_CriticalityDiagnostics_IE_List_Value_tags_1)
+		/sizeof(asn_DEF_SABP_CriticalityDiagnostics_IE_List_Value_tags_1[0]), /* 1 */
+	0,	/* No PER visible constraints */
+	asn_MBR_SABP_CriticalityDiagnostics_IE_List_Value_1,
+	4,	/* Elements count */
+	&asn_SPC_SABP_CriticalityDiagnostics_IE_List_Value_specs_1	/* Additional specs */
+};
+
--- a/src/sabp/SABP_CriticalityDiagnostics-IE-List.c
+++ b/src/sabp/SABP_CriticalityDiagnostics-IE-List.c
@ -12,97 +12,11 @@ static asn_per_constraints_t asn_PER_type_SABP_CriticalityDiagnostics_IE_List_co
 	{ APC_CONSTRAINED,	 8,  8,  1l,  256l }	/* (SIZE(1..256)) */,
 	0, 0	/* No PER value map */
 };
-static asn_TYPE_member_t asn_MBR_Member_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct SABP_CriticalityDiagnostics_IE_List__Member, iECriticality),
-		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_SABP_Criticality,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"iECriticality"
-		},
-	{ ATF_NOFLAGS, 0, offsetof(struct SABP_CriticalityDiagnostics_IE_List__Member, iE_ID),
-		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_SABP_ProtocolIE_ID,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"iE-ID"
-		},
-	{ ATF_POINTER, 2, offsetof(struct SABP_CriticalityDiagnostics_IE_List__Member, repetitionNumber),
-		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_SABP_RepetitionNumber0,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"repetitionNumber"
-		},
-	{ ATF_POINTER, 1, offsetof(struct SABP_CriticalityDiagnostics_IE_List__Member, iE_Extensions),
-		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_SABP_IE_Extensions,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"iE-Extensions"
-		},
-};
-static const int asn_MAP_Member_oms_2[] = { 2, 3 };
-static const ber_tlv_tag_t asn_DEF_Member_tags_2[] = {
-	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
-};
-static const asn_TYPE_tag2member_t asn_MAP_Member_tag2el_2[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* iECriticality */
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* iE-ID */
-    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* repetitionNumber */
-    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* iE-Extensions */
-};
-static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = {
-	sizeof(struct SABP_CriticalityDiagnostics_IE_List__Member),
-	offsetof(struct SABP_CriticalityDiagnostics_IE_List__Member, _asn_ctx),
-	asn_MAP_Member_tag2el_2,
-	4,	/* Count of tags in the map */
-	asn_MAP_Member_oms_2,	/* Optional members */
-	2, 0,	/* Root/Additions */
-	3,	/* Start extensions */
-	5	/* Stop extensions */
-};
-static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_Member_2 = {
-	"SEQUENCE",
-	"SEQUENCE",
-	SEQUENCE_free,
-	SEQUENCE_print,
-	SEQUENCE_constraint,
-	SEQUENCE_decode_ber,
-	SEQUENCE_encode_der,
-	SEQUENCE_decode_xer,
-	SEQUENCE_encode_xer,
-	SEQUENCE_decode_uper,
-	SEQUENCE_encode_uper,
-	SEQUENCE_decode_aper,
-	SEQUENCE_encode_aper,
-	0,	/* Use generic outmost tag fetcher */
-	asn_DEF_Member_tags_2,
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	asn_DEF_Member_tags_2,	/* Same as above */
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	0,	/* No PER visible constraints */
-	asn_MBR_Member_2,
-	4,	/* Elements count */
-	&asn_SPC_Member_specs_2	/* Additional specs */
-};
-
 static asn_TYPE_member_t asn_MBR_SABP_CriticalityDiagnostics_IE_List_1[] = {
 	{ ATF_POINTER, 0, 0,
-		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		-1 /* Ambiguous tag (CHOICE?) */,
 		0,
-		&asn_DEF_Member_2,
+		&asn_DEF_SABP_CriticalityDiagnostics_IE_List_Value,
 		0,	/* Defer constraints checking to the member type */
 		0,	/* No PER visible constraints */
 		0,
--- a/src/sabp/SABP_MessageStructure-Value.c
+++ b/src/sabp/SABP_MessageStructure-Value.c
@ -0,0 +1,84 @@
+/*
+ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c)
+ * From ASN.1 module "SABP-IEs"
+ * 	found in "../../asn1/sabp/SABP-IEs.asn"
+ * 	`asn1c -R -fcompound-names`
+ */
+
+#include <osmocom/sabp/SABP_MessageStructure-Value.h>
+
+static asn_TYPE_member_t asn_MBR_SABP_MessageStructure_Value_1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct SABP_MessageStructure_Value, iE_ID),
+		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_SABP_ProtocolIE_ID,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"iE-ID"
+		},
+	{ ATF_POINTER, 2, offsetof(struct SABP_MessageStructure_Value, repetitionNumber),
+		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_SABP_RepetitionNumber1,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"repetitionNumber"
+		},
+	{ ATF_POINTER, 1, offsetof(struct SABP_MessageStructure_Value, iE_Extensions),
+		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_SABP_IE_Extensions,
+		0,	/* Defer constraints checking to the member type */
+		0,	/* No PER visible constraints */
+		0,
+		"iE-Extensions"
+		},
+};
+static const int asn_MAP_SABP_MessageStructure_Value_oms_1[] = { 1, 2 };
+static const ber_tlv_tag_t asn_DEF_SABP_MessageStructure_Value_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_SABP_MessageStructure_Value_tag2el_1[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* iE-ID */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* repetitionNumber */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
+};
+static asn_SEQUENCE_specifics_t asn_SPC_SABP_MessageStructure_Value_specs_1 = {
+	sizeof(struct SABP_MessageStructure_Value),
+	offsetof(struct SABP_MessageStructure_Value, _asn_ctx),
+	asn_MAP_SABP_MessageStructure_Value_tag2el_1,
+	3,	/* Count of tags in the map */
+	asn_MAP_SABP_MessageStructure_Value_oms_1,	/* Optional members */
+	2, 0,	/* Root/Additions */
+	2,	/* Start extensions */
+	4	/* Stop extensions */
+};
+asn_TYPE_descriptor_t asn_DEF_SABP_MessageStructure_Value = {
+	"SABP_MessageStructure-Value",
+	"SABP_MessageStructure-Value",
+	SEQUENCE_free,
+	SEQUENCE_print,
+	SEQUENCE_constraint,
+	SEQUENCE_decode_ber,
+	SEQUENCE_encode_der,
+	SEQUENCE_decode_xer,
+	SEQUENCE_encode_xer,
+	SEQUENCE_decode_uper,
+	SEQUENCE_encode_uper,
+	SEQUENCE_decode_aper,
+	SEQUENCE_encode_aper,
+	0,	/* Use generic outmost tag fetcher */
+	asn_DEF_SABP_MessageStructure_Value_tags_1,
+	sizeof(asn_DEF_SABP_MessageStructure_Value_tags_1)
+		/sizeof(asn_DEF_SABP_MessageStructure_Value_tags_1[0]), /* 1 */
+	asn_DEF_SABP_MessageStructure_Value_tags_1,	/* Same as above */
+	sizeof(asn_DEF_SABP_MessageStructure_Value_tags_1)
+		/sizeof(asn_DEF_SABP_MessageStructure_Value_tags_1[0]), /* 1 */
+	0,	/* No PER visible constraints */
+	asn_MBR_SABP_MessageStructure_Value_1,
+	3,	/* Elements count */
+	&asn_SPC_SABP_MessageStructure_Value_specs_1	/* Additional specs */
+};
+
--- a/src/sabp/SABP_MessageStructure.c
+++ b/src/sabp/SABP_MessageStructure.c
@ -12,87 +12,11 @@ static asn_per_constraints_t asn_PER_type_SABP_MessageStructure_constr_1 GCC_NOT
 	{ APC_CONSTRAINED,	 8,  8,  1l,  256l }	/* (SIZE(1..256)) */,
 	0, 0	/* No PER value map */
 };
-static asn_TYPE_member_t asn_MBR_Member_2[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct SABP_MessageStructure__Member, iE_ID),
-		(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_SABP_ProtocolIE_ID,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"iE-ID"
-		},
-	{ ATF_POINTER, 2, offsetof(struct SABP_MessageStructure__Member, repetitionNumber),
-		(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_SABP_RepetitionNumber1,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"repetitionNumber"
-		},
-	{ ATF_POINTER, 1, offsetof(struct SABP_MessageStructure__Member, iE_Extensions),
-		(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_SABP_IE_Extensions,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* No PER visible constraints */
-		0,
-		"iE-Extensions"
-		},
-};
-static const int asn_MAP_Member_oms_2[] = { 1, 2 };
-static const ber_tlv_tag_t asn_DEF_Member_tags_2[] = {
-	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
-};
-static const asn_TYPE_tag2member_t asn_MAP_Member_tag2el_2[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* iE-ID */
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* repetitionNumber */
-    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */
-};
-static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = {
-	sizeof(struct SABP_MessageStructure__Member),
-	offsetof(struct SABP_MessageStructure__Member, _asn_ctx),
-	asn_MAP_Member_tag2el_2,
-	3,	/* Count of tags in the map */
-	asn_MAP_Member_oms_2,	/* Optional members */
-	2, 0,	/* Root/Additions */
-	2,	/* Start extensions */
-	4	/* Stop extensions */
-};
-static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_Member_2 = {
-	"SEQUENCE",
-	"SEQUENCE",
-	SEQUENCE_free,
-	SEQUENCE_print,
-	SEQUENCE_constraint,
-	SEQUENCE_decode_ber,
-	SEQUENCE_encode_der,
-	SEQUENCE_decode_xer,
-	SEQUENCE_encode_xer,
-	SEQUENCE_decode_uper,
-	SEQUENCE_encode_uper,
-	SEQUENCE_decode_aper,
-	SEQUENCE_encode_aper,
-	0,	/* Use generic outmost tag fetcher */
-	asn_DEF_Member_tags_2,
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	asn_DEF_Member_tags_2,	/* Same as above */
-	sizeof(asn_DEF_Member_tags_2)
-		/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
-	0,	/* No PER visible constraints */
-	asn_MBR_Member_2,
-	3,	/* Elements count */
-	&asn_SPC_Member_specs_2	/* Additional specs */
-};
-
 static asn_TYPE_member_t asn_MBR_SABP_MessageStructure_1[] = {
 	{ ATF_POINTER, 0, 0,
-		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+		-1 /* Ambiguous tag (CHOICE?) */,
 		0,
-		&asn_DEF_Member_2,
+		&asn_DEF_SABP_MessageStructure_Value,
 		0,	/* Defer constraints checking to the member type */
 		0,	/* No PER visible constraints */
 		0,