diff --git a/asn1-compiled/AlternativeIdentity.c b/asn1-compiled/AlternativeIdentity.c
index e071287..b7437db 100644
--- a/asn1-compiled/AlternativeIdentity.c
+++ b/asn1-compiled/AlternativeIdentity.c
@@ -58,7 +58,7 @@ static asn_TYPE_member_t asn_MBR_AlternativeIdentity_1[] = {
 		},
 };
 static asn_TYPE_tag2member_t asn_MAP_AlternativeIdentity_tag2el_1[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* url at 526 */
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* url at 527 */
 };
 static asn_CHOICE_specifics_t asn_SPC_AlternativeIdentity_specs_1 = {
 	sizeof(struct AlternativeIdentity),
diff --git a/asn1-compiled/BISDNParameters.c b/asn1-compiled/BISDNParameters.c
index 2272e81..e609d18 100644
--- a/asn1-compiled/BISDNParameters.c
+++ b/asn1-compiled/BISDNParameters.c
@@ -102,16 +102,16 @@ static ber_tlv_tag_t asn_DEF_BISDNParameters_tags_1[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_TYPE_tag2member_t asn_MAP_BISDNParameters_tag2el_1[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* aALParameters at 501 */
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* additionalATMCellRate at 502 */
-    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* aESACalledParty at 503 */
-    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 }, /* aESACallingParty at 504 */
-    { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 4, 0, 0 }, /* alternativeATMTrafficDescriptor at 506 */
-    { (ASN_TAG_CLASS_CONTEXT | (5 << 2)), 5, 0, 0 }, /* aTMCellRate at 507 */
-    { (ASN_TAG_CLASS_CONTEXT | (6 << 2)), 6, 0, 0 }, /* cDVTDescriptor at 508 */
-    { (ASN_TAG_CLASS_CONTEXT | (7 << 2)), 7, 0, 0 }, /* cumulativeTransitDelay at 509 */
-    { (ASN_TAG_CLASS_CONTEXT | (8 << 2)), 8, 0, 0 }, /* endToEndTransitDelay at 510 */
-    { (ASN_TAG_CLASS_CONTEXT | (9 << 2)), 9, 0, 0 } /* minAcceptableATMTrafficDescriptor at 512 */
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* aALParameters at 502 */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* additionalATMCellRate at 503 */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* aESACalledParty at 504 */
+    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 }, /* aESACallingParty at 505 */
+    { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 4, 0, 0 }, /* alternativeATMTrafficDescriptor at 507 */
+    { (ASN_TAG_CLASS_CONTEXT | (5 << 2)), 5, 0, 0 }, /* aTMCellRate at 508 */
+    { (ASN_TAG_CLASS_CONTEXT | (6 << 2)), 6, 0, 0 }, /* cDVTDescriptor at 509 */
+    { (ASN_TAG_CLASS_CONTEXT | (7 << 2)), 7, 0, 0 }, /* cumulativeTransitDelay at 510 */
+    { (ASN_TAG_CLASS_CONTEXT | (8 << 2)), 8, 0, 0 }, /* endToEndTransitDelay at 511 */
+    { (ASN_TAG_CLASS_CONTEXT | (9 << 2)), 9, 0, 0 } /* minAcceptableATMTrafficDescriptor at 513 */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_BISDNParameters_specs_1 = {
 	sizeof(struct BISDNParameters),
diff --git a/asn1-compiled/BackwardServiceInteractionInd.c b/asn1-compiled/BackwardServiceInteractionInd.c
index 5e4248c..15b2106 100644
--- a/asn1-compiled/BackwardServiceInteractionInd.c
+++ b/asn1-compiled/BackwardServiceInteractionInd.c
@@ -152,10 +152,10 @@ static ber_tlv_tag_t asn_DEF_BackwardServiceInteractionInd_tags_1[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_TYPE_tag2member_t asn_MAP_BackwardServiceInteractionInd_tag2el_1[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 0, 0, 0 }, /* conferenceTreatmentIndicator at 359 */
-    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 1, 0, 0 }, /* callCompletionTreatmentIndicator at 363 */
-    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 2, 0, 0 }, /* holdTreatmentIndicator at 367 */
-    { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 3, 0, 0 } /* ectTreatmentIndicator at 371 */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 0, 0, 0 }, /* conferenceTreatmentIndicator at 360 */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 1, 0, 0 }, /* callCompletionTreatmentIndicator at 364 */
+    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 2, 0, 0 }, /* holdTreatmentIndicator at 368 */
+    { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 3, 0, 0 } /* ectTreatmentIndicator at 372 */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_BackwardServiceInteractionInd_specs_1 = {
 	sizeof(struct BackwardServiceInteractionInd),
diff --git a/asn1-compiled/BearerCapability.c b/asn1-compiled/BearerCapability.c
index fe4e757..a9ca106 100644
--- a/asn1-compiled/BearerCapability.c
+++ b/asn1-compiled/BearerCapability.c
@@ -114,9 +114,9 @@ static asn_TYPE_member_t asn_MBR_BearerCapability_1[] = {
 		},
 };
 static asn_TYPE_tag2member_t asn_MAP_BearerCapability_tag2el_1[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* bearerCap at 483 */
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* tmr at 484 */
-    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* broadbandBearerCap at 486 */
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* bearerCap at 484 */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* tmr at 485 */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* broadbandBearerCap at 487 */
 };
 static asn_CHOICE_specifics_t asn_SPC_BearerCapability_specs_1 = {
 	sizeof(struct BearerCapability),
diff --git a/asn1-compiled/ConnectArg.c b/asn1-compiled/ConnectArg.c
index e547181..4d4d476 100644
--- a/asn1-compiled/ConnectArg.c
+++ b/asn1-compiled/ConnectArg.c
@@ -345,43 +345,43 @@ static ber_tlv_tag_t asn_DEF_ConnectArg_tags_1[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_TYPE_tag2member_t asn_MAP_ConnectArg_tag2el_1[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* destinationRoutingAddress at 545 */
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* alertingPattern at 546 */
-    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* correlationID at 547 */
-    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 }, /* cutAndPaste at 548 */
-    { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 4, 0, 0 }, /* forwardingCondition at 549 */
-    { (ASN_TAG_CLASS_CONTEXT | (5 << 2)), 5, 0, 0 }, /* iSDNAccessRelatedInformation at 551 */
-    { (ASN_TAG_CLASS_CONTEXT | (6 << 2)), 6, 0, 0 }, /* originalCalledPartyID at 552 */
-    { (ASN_TAG_CLASS_CONTEXT | (7 << 2)), 7, 0, 0 }, /* routeList at 553 */
-    { (ASN_TAG_CLASS_CONTEXT | (8 << 2)), 8, 0, 0 }, /* scfID at 555 */
-    { (ASN_TAG_CLASS_CONTEXT | (9 << 2)), 9, 0, 0 }, /* travellingClassMark at 556 */
-    { (ASN_TAG_CLASS_CONTEXT | (11 << 2)), 10, 0, 0 }, /* carrier at 558 */
-    { (ASN_TAG_CLASS_CONTEXT | (12 << 2)), 16, 0, 0 }, /* displayInformation at 565 */
-    { (ASN_TAG_CLASS_CONTEXT | (13 << 2)), 17, 0, 0 }, /* forwardCallIndicators at 566 */
-    { (ASN_TAG_CLASS_CONTEXT | (14 << 2)), 18, 0, 0 }, /* genericNumbers at 567 */
-    { (ASN_TAG_CLASS_CONTEXT | (15 << 2)), 19, 0, 0 }, /* serviceInteractionIndicatorsTwo at 569 */
-    { (ASN_TAG_CLASS_CONTEXT | (16 << 2)), 20, 0, 0 }, /* iNServiceCompatibilityResponse at 571 */
-    { (ASN_TAG_CLASS_CONTEXT | (17 << 2)), 21, 0, 0 }, /* forwardGVNS at 572 */
-    { (ASN_TAG_CLASS_CONTEXT | (18 << 2)), 22, 0, 0 }, /* backwardGVNS at 573 */
-    { (ASN_TAG_CLASS_CONTEXT | (19 << 2)), 23, 0, 0 }, /* chargeNumber at 574 */
-    { (ASN_TAG_CLASS_CONTEXT | (20 << 2)), 24, 0, 0 }, /* callSegmentID at 575 */
-    { (ASN_TAG_CLASS_CONTEXT | (21 << 2)), 25, 0, 0 }, /* legToBeCreated at 576 */
-    { (ASN_TAG_CLASS_CONTEXT | (22 << 2)), 26, 0, 0 }, /* sDSSinformation at 577 */
-    { (ASN_TAG_CLASS_CONTEXT | (23 << 2)), 27, 0, 0 }, /* calledDirectoryNumber at 578 */
-    { (ASN_TAG_CLASS_CONTEXT | (24 << 2)), 28, 0, 0 }, /* bearerCapability at 579 */
-    { (ASN_TAG_CLASS_CONTEXT | (26 << 2)), 11, 0, 0 }, /* serviceInteractionIndicators at 560 */
-    { (ASN_TAG_CLASS_CONTEXT | (27 << 2)), 12, 0, 0 }, /* callingPartyNumber at 561 */
-    { (ASN_TAG_CLASS_CONTEXT | (28 << 2)), 13, 0, 0 }, /* callingPartysCategory at 562 */
-    { (ASN_TAG_CLASS_CONTEXT | (29 << 2)), 14, 0, 0 }, /* redirectingPartyID at 563 */
-    { (ASN_TAG_CLASS_CONTEXT | (30 << 2)), 15, 0, 0 }, /* redirectionInformation at 564 */
-    { (ASN_TAG_CLASS_CONTEXT | (31 << 2)), 34, 0, 0 }, /* cug-Interlock at 586 */
-    { (ASN_TAG_CLASS_CONTEXT | (32 << 2)), 35, 0, 0 }, /* cug-OutgoingAccess at 587 */
-    { (ASN_TAG_CLASS_CONTEXT | (33 << 2)), 36, 0, 0 }, /* ipRelatedInformation at 588 */
-    { (ASN_TAG_CLASS_CONTEXT | (60 << 2)), 29, 0, 0 }, /* calledPartySubaddress at 580 */
-    { (ASN_TAG_CLASS_CONTEXT | (61 << 2)), 30, 0, 0 }, /* connectionIdentifier at 581 */
-    { (ASN_TAG_CLASS_CONTEXT | (62 << 2)), 31, 0, 0 }, /* genericIdentifier at 582 */
-    { (ASN_TAG_CLASS_CONTEXT | (63 << 2)), 32, 0, 0 }, /* qOSParameter at 583 */
-    { (ASN_TAG_CLASS_CONTEXT | (64 << 2)), 33, 0, 0 } /* bISDNParameters at 584 */
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* destinationRoutingAddress at 546 */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* alertingPattern at 547 */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* correlationID at 548 */
+    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 }, /* cutAndPaste at 549 */
+    { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 4, 0, 0 }, /* forwardingCondition at 550 */
+    { (ASN_TAG_CLASS_CONTEXT | (5 << 2)), 5, 0, 0 }, /* iSDNAccessRelatedInformation at 552 */
+    { (ASN_TAG_CLASS_CONTEXT | (6 << 2)), 6, 0, 0 }, /* originalCalledPartyID at 553 */
+    { (ASN_TAG_CLASS_CONTEXT | (7 << 2)), 7, 0, 0 }, /* routeList at 554 */
+    { (ASN_TAG_CLASS_CONTEXT | (8 << 2)), 8, 0, 0 }, /* scfID at 556 */
+    { (ASN_TAG_CLASS_CONTEXT | (9 << 2)), 9, 0, 0 }, /* travellingClassMark at 557 */
+    { (ASN_TAG_CLASS_CONTEXT | (11 << 2)), 10, 0, 0 }, /* carrier at 559 */
+    { (ASN_TAG_CLASS_CONTEXT | (12 << 2)), 16, 0, 0 }, /* displayInformation at 566 */
+    { (ASN_TAG_CLASS_CONTEXT | (13 << 2)), 17, 0, 0 }, /* forwardCallIndicators at 567 */
+    { (ASN_TAG_CLASS_CONTEXT | (14 << 2)), 18, 0, 0 }, /* genericNumbers at 568 */
+    { (ASN_TAG_CLASS_CONTEXT | (15 << 2)), 19, 0, 0 }, /* serviceInteractionIndicatorsTwo at 570 */
+    { (ASN_TAG_CLASS_CONTEXT | (16 << 2)), 20, 0, 0 }, /* iNServiceCompatibilityResponse at 572 */
+    { (ASN_TAG_CLASS_CONTEXT | (17 << 2)), 21, 0, 0 }, /* forwardGVNS at 573 */
+    { (ASN_TAG_CLASS_CONTEXT | (18 << 2)), 22, 0, 0 }, /* backwardGVNS at 574 */
+    { (ASN_TAG_CLASS_CONTEXT | (19 << 2)), 23, 0, 0 }, /* chargeNumber at 575 */
+    { (ASN_TAG_CLASS_CONTEXT | (20 << 2)), 24, 0, 0 }, /* callSegmentID at 576 */
+    { (ASN_TAG_CLASS_CONTEXT | (21 << 2)), 25, 0, 0 }, /* legToBeCreated at 577 */
+    { (ASN_TAG_CLASS_CONTEXT | (22 << 2)), 26, 0, 0 }, /* sDSSinformation at 578 */
+    { (ASN_TAG_CLASS_CONTEXT | (23 << 2)), 27, 0, 0 }, /* calledDirectoryNumber at 579 */
+    { (ASN_TAG_CLASS_CONTEXT | (24 << 2)), 28, 0, 0 }, /* bearerCapability at 580 */
+    { (ASN_TAG_CLASS_CONTEXT | (26 << 2)), 11, 0, 0 }, /* serviceInteractionIndicators at 561 */
+    { (ASN_TAG_CLASS_CONTEXT | (27 << 2)), 12, 0, 0 }, /* callingPartyNumber at 562 */
+    { (ASN_TAG_CLASS_CONTEXT | (28 << 2)), 13, 0, 0 }, /* callingPartysCategory at 563 */
+    { (ASN_TAG_CLASS_CONTEXT | (29 << 2)), 14, 0, 0 }, /* redirectingPartyID at 564 */
+    { (ASN_TAG_CLASS_CONTEXT | (30 << 2)), 15, 0, 0 }, /* redirectionInformation at 565 */
+    { (ASN_TAG_CLASS_CONTEXT | (31 << 2)), 34, 0, 0 }, /* cug-Interlock at 587 */
+    { (ASN_TAG_CLASS_CONTEXT | (32 << 2)), 35, 0, 0 }, /* cug-OutgoingAccess at 588 */
+    { (ASN_TAG_CLASS_CONTEXT | (33 << 2)), 36, 0, 0 }, /* ipRelatedInformation at 589 */
+    { (ASN_TAG_CLASS_CONTEXT | (60 << 2)), 29, 0, 0 }, /* calledPartySubaddress at 581 */
+    { (ASN_TAG_CLASS_CONTEXT | (61 << 2)), 30, 0, 0 }, /* connectionIdentifier at 582 */
+    { (ASN_TAG_CLASS_CONTEXT | (62 << 2)), 31, 0, 0 }, /* genericIdentifier at 583 */
+    { (ASN_TAG_CLASS_CONTEXT | (63 << 2)), 32, 0, 0 }, /* qOSParameter at 584 */
+    { (ASN_TAG_CLASS_CONTEXT | (64 << 2)), 33, 0, 0 } /* bISDNParameters at 585 */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_ConnectArg_specs_1 = {
 	sizeof(struct ConnectArg),
diff --git a/asn1-compiled/Entry.c b/asn1-compiled/Entry.c
index f13443c..03337f3 100644
--- a/asn1-compiled/Entry.c
+++ b/asn1-compiled/Entry.c
@@ -27,8 +27,8 @@ static asn_TYPE_member_t asn_MBR_Entry_1[] = {
 		},
 };
 static asn_TYPE_tag2member_t asn_MAP_Entry_tag2el_1[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* agreements at 462 */
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* networkSpecific at 464 */
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* agreements at 463 */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* networkSpecific at 465 */
 };
 static asn_CHOICE_specifics_t asn_SPC_Entry_specs_1 = {
 	sizeof(struct Entry),
diff --git a/asn1-compiled/ErrorCode.c b/asn1-compiled/ErrorCode.c
index 2267bac..863a2c2 100644
--- a/asn1-compiled/ErrorCode.c
+++ b/asn1-compiled/ErrorCode.c
@@ -6,84 +6,102 @@
 
 #include "ErrorCode.h"
 
-static int
-memb_nationaler_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
+int
+ErrorCode_constraint(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 >= -32768 && value <= 32767)) {
-		/* Constraint check succeeded */
-		return 0;
-	} else {
-		_ASN_CTFAIL(app_key, td, sptr,
-			"%s: constraint failed (%s:%d)",
-			td->name, __FILE__, __LINE__);
-		return -1;
-	}
+	/* Replace with underlying type checker */
+	td->check_constraints = asn_DEF_INTEGER.check_constraints;
+	return td->check_constraints(td, sptr, ctfailcb, app_key);
 }
 
-static asn_TYPE_member_t asn_MBR_ErrorCode_1[] = {
-	{ ATF_NOFLAGS, 0, offsetof(struct ErrorCode, choice.nationaler),
-		(ASN_TAG_CLASS_PRIVATE | (19 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_NativeInteger,
-		memb_nationaler_constraint_1,
-		0,	/* PER is not compiled, use -gen-PER */
-		0,
-		"nationaler"
-		},
-	{ ATF_NOFLAGS, 0, offsetof(struct ErrorCode, choice.privateer),
-		(ASN_TAG_CLASS_PRIVATE | (20 << 2)),
-		-1,	/* IMPLICIT tag at current level */
-		&asn_DEF_INTEGER,
-		0,	/* Defer constraints checking to the member type */
-		0,	/* PER is not compiled, use -gen-PER */
-		0,
-		"privateer"
-		},
-};
-static asn_TYPE_tag2member_t asn_MAP_ErrorCode_tag2el_1[] = {
-    { (ASN_TAG_CLASS_PRIVATE | (19 << 2)), 0, 0, 0 }, /* nationaler at 275 */
-    { (ASN_TAG_CLASS_PRIVATE | (20 << 2)), 1, 0, 0 } /* privateer at 277 */
-};
-static asn_CHOICE_specifics_t asn_SPC_ErrorCode_specs_1 = {
-	sizeof(struct ErrorCode),
-	offsetof(struct ErrorCode, _asn_ctx),
-	offsetof(struct ErrorCode, present),
-	sizeof(((struct ErrorCode *)0)->present),
-	asn_MAP_ErrorCode_tag2el_1,
-	2,	/* Count of tags in the map */
-	0,
-	-1	/* Extensions start */
+/*
+ * This type is implemented using INTEGER,
+ * so here we adjust the DEF accordingly.
+ */
+static void
+ErrorCode_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+	td->free_struct    = asn_DEF_INTEGER.free_struct;
+	td->print_struct   = asn_DEF_INTEGER.print_struct;
+	td->ber_decoder    = asn_DEF_INTEGER.ber_decoder;
+	td->der_encoder    = asn_DEF_INTEGER.der_encoder;
+	td->xer_decoder    = asn_DEF_INTEGER.xer_decoder;
+	td->xer_encoder    = asn_DEF_INTEGER.xer_encoder;
+	td->uper_decoder   = asn_DEF_INTEGER.uper_decoder;
+	td->uper_encoder   = asn_DEF_INTEGER.uper_encoder;
+	if(!td->per_constraints)
+		td->per_constraints = asn_DEF_INTEGER.per_constraints;
+	td->elements       = asn_DEF_INTEGER.elements;
+	td->elements_count = asn_DEF_INTEGER.elements_count;
+	td->specifics      = asn_DEF_INTEGER.specifics;
+}
+
+void
+ErrorCode_free(asn_TYPE_descriptor_t *td,
+		void *struct_ptr, int contents_only) {
+	ErrorCode_1_inherit_TYPE_descriptor(td);
+	td->free_struct(td, struct_ptr, contents_only);
+}
+
+int
+ErrorCode_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
+		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
+	ErrorCode_1_inherit_TYPE_descriptor(td);
+	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
+}
+
+asn_dec_rval_t
+ErrorCode_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
+		void **structure, const void *bufptr, size_t size, int tag_mode) {
+	ErrorCode_1_inherit_TYPE_descriptor(td);
+	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
+}
+
+asn_enc_rval_t
+ErrorCode_encode_der(asn_TYPE_descriptor_t *td,
+		void *structure, int tag_mode, ber_tlv_tag_t tag,
+		asn_app_consume_bytes_f *cb, void *app_key) {
+	ErrorCode_1_inherit_TYPE_descriptor(td);
+	return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
+}
+
+asn_dec_rval_t
+ErrorCode_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
+		void **structure, const char *opt_mname, const void *bufptr, size_t size) {
+	ErrorCode_1_inherit_TYPE_descriptor(td);
+	return td->xer_decoder(opt_codec_ctx, td, structure, opt_mname, bufptr, size);
+}
+
+asn_enc_rval_t
+ErrorCode_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
+		int ilevel, enum xer_encoder_flags_e flags,
+		asn_app_consume_bytes_f *cb, void *app_key) {
+	ErrorCode_1_inherit_TYPE_descriptor(td);
+	return td->xer_encoder(td, structure, ilevel, flags, cb, app_key);
+}
+
+static ber_tlv_tag_t asn_DEF_ErrorCode_tags_1[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (2 << 2))
 };
 asn_TYPE_descriptor_t asn_DEF_ErrorCode = {
 	"ErrorCode",
 	"ErrorCode",
-	CHOICE_free,
-	CHOICE_print,
-	CHOICE_constraint,
-	CHOICE_decode_ber,
-	CHOICE_encode_der,
-	CHOICE_decode_xer,
-	CHOICE_encode_xer,
+	ErrorCode_free,
+	ErrorCode_print,
+	ErrorCode_constraint,
+	ErrorCode_decode_ber,
+	ErrorCode_encode_der,
+	ErrorCode_decode_xer,
+	ErrorCode_encode_xer,
 	0, 0,	/* No PER support, use "-gen-PER" to enable */
-	CHOICE_outmost_tag,
-	0,	/* No effective tags (pointer) */
-	0,	/* No effective tags (count) */
-	0,	/* No tags (pointer) */
-	0,	/* No tags (count) */
+	0,	/* Use generic outmost tag fetcher */
+	asn_DEF_ErrorCode_tags_1,
+	sizeof(asn_DEF_ErrorCode_tags_1)
+		/sizeof(asn_DEF_ErrorCode_tags_1[0]), /* 1 */
+	asn_DEF_ErrorCode_tags_1,	/* Same as above */
+	sizeof(asn_DEF_ErrorCode_tags_1)
+		/sizeof(asn_DEF_ErrorCode_tags_1[0]), /* 1 */
 	0,	/* No PER visible constraints */
-	asn_MBR_ErrorCode_1,
-	2,	/* Elements count */
-	&asn_SPC_ErrorCode_specs_1	/* Additional specs */
+	0, 0,	/* No members */
+	0	/* No specifics */
 };
 
diff --git a/asn1-compiled/ErrorCode.h b/asn1-compiled/ErrorCode.h
index 2521e70..edf90cd 100644
--- a/asn1-compiled/ErrorCode.h
+++ b/asn1-compiled/ErrorCode.h
@@ -11,35 +11,24 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <NativeInteger.h>
 #include <INTEGER.h>
-#include <constr_CHOICE.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/* Dependencies */
-typedef enum ErrorCode_PR {
-	ErrorCode_PR_NOTHING,	/* No components present */
-	ErrorCode_PR_nationaler,
-	ErrorCode_PR_privateer
-} ErrorCode_PR;
-
 /* ErrorCode */
-typedef struct ErrorCode {
-	ErrorCode_PR present;
-	union ErrorCode_u {
-		long	 nationaler;
-		INTEGER_t	 privateer;
-	} choice;
-	
-	/* Context for parsing across buffer boundaries */
-	asn_struct_ctx_t _asn_ctx;
-} ErrorCode_t;
+typedef INTEGER_t	 ErrorCode_t;
 
 /* Implementation */
 extern asn_TYPE_descriptor_t asn_DEF_ErrorCode;
+asn_struct_free_f ErrorCode_free;
+asn_struct_print_f ErrorCode_print;
+asn_constr_check_f ErrorCode_constraint;
+ber_type_decoder_f ErrorCode_decode_ber;
+der_type_encoder_f ErrorCode_encode_der;
+xer_type_decoder_f ErrorCode_decode_xer;
+xer_type_encoder_f ErrorCode_encode_xer;
 
 #ifdef __cplusplus
 }
diff --git a/asn1-compiled/ForwardServiceInteractionInd.c b/asn1-compiled/ForwardServiceInteractionInd.c
index f98f667..3add870 100644
--- a/asn1-compiled/ForwardServiceInteractionInd.c
+++ b/asn1-compiled/ForwardServiceInteractionInd.c
@@ -222,12 +222,12 @@ static ber_tlv_tag_t asn_DEF_ForwardServiceInteractionInd_tags_1[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_TYPE_tag2member_t asn_MAP_ForwardServiceInteractionInd_tag2el_1[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 0, 0, 0 }, /* conferenceTreatmentIndicator at 326 */
-    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 1, 0, 0 }, /* callDiversionTreatmentIndicator at 330 */
-    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 2, 0, 0 }, /* callOfferingTreatmentIndicator at 334 */
-    { (ASN_TAG_CLASS_CONTEXT | (5 << 2)), 3, 0, 0 }, /* callWaitingTreatmentIndicator at 343 */
-    { (ASN_TAG_CLASS_CONTEXT | (6 << 2)), 4, 0, 0 }, /* holdTreatmentIndicator at 349 */
-    { (ASN_TAG_CLASS_CONTEXT | (7 << 2)), 5, 0, 0 } /* ectTreatmentIndicator at 353 */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 0, 0, 0 }, /* conferenceTreatmentIndicator at 327 */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 1, 0, 0 }, /* callDiversionTreatmentIndicator at 331 */
+    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 2, 0, 0 }, /* callOfferingTreatmentIndicator at 335 */
+    { (ASN_TAG_CLASS_CONTEXT | (5 << 2)), 3, 0, 0 }, /* callWaitingTreatmentIndicator at 344 */
+    { (ASN_TAG_CLASS_CONTEXT | (6 << 2)), 4, 0, 0 }, /* holdTreatmentIndicator at 350 */
+    { (ASN_TAG_CLASS_CONTEXT | (7 << 2)), 5, 0, 0 } /* ectTreatmentIndicator at 354 */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_ForwardServiceInteractionInd_specs_1 = {
 	sizeof(struct ForwardServiceInteractionInd),
diff --git a/asn1-compiled/IPRelatedInformation.c b/asn1-compiled/IPRelatedInformation.c
index d269c91..a00dc18 100644
--- a/asn1-compiled/IPRelatedInformation.c
+++ b/asn1-compiled/IPRelatedInformation.c
@@ -48,10 +48,10 @@ static ber_tlv_tag_t asn_DEF_IPRelatedInformation_tags_1[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_TYPE_tag2member_t asn_MAP_IPRelatedInformation_tag2el_1[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* alternativeCalledPartyIds at 517 */
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* alternativeOriginatingPartyIds at 518 */
-    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* alternativeOriginalCalledPartyIds at 519 */
-    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* alternativeRedirectingPartyIds at 520 */
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* alternativeCalledPartyIds at 518 */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* alternativeOriginatingPartyIds at 519 */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* alternativeOriginalCalledPartyIds at 520 */
+    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* alternativeRedirectingPartyIds at 521 */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_IPRelatedInformation_specs_1 = {
 	sizeof(struct IPRelatedInformation),
diff --git a/asn1-compiled/InitialDPArg.c b/asn1-compiled/InitialDPArg.c
index d59cf34..a0acd12 100644
--- a/asn1-compiled/InitialDPArg.c
+++ b/asn1-compiled/InitialDPArg.c
@@ -489,59 +489,59 @@ static ber_tlv_tag_t asn_DEF_InitialDPArg_tags_1[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_TYPE_tag2member_t asn_MAP_InitialDPArg_tag2el_1[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* serviceKey at 600 */
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* dialledDigits at 601 */
-    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* calledPartyNumber at 602 */
-    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 }, /* callingPartyNumber at 603 */
-    { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 4, 0, 0 }, /* callingPartyBusinessGroupID at 604 */
-    { (ASN_TAG_CLASS_CONTEXT | (5 << 2)), 5, 0, 0 }, /* callingPartysCategory at 605 */
-    { (ASN_TAG_CLASS_CONTEXT | (6 << 2)), 6, 0, 0 }, /* callingPartySubaddress at 606 */
-    { (ASN_TAG_CLASS_CONTEXT | (7 << 2)), 7, 0, 0 }, /* cGEncountered at 607 */
-    { (ASN_TAG_CLASS_CONTEXT | (8 << 2)), 8, 0, 0 }, /* iPSSPCapabilities at 608 */
-    { (ASN_TAG_CLASS_CONTEXT | (9 << 2)), 9, 0, 0 }, /* iPAvailable at 609 */
-    { (ASN_TAG_CLASS_CONTEXT | (10 << 2)), 10, 0, 0 }, /* locationNumber at 610 */
-    { (ASN_TAG_CLASS_CONTEXT | (11 << 2)), 11, 0, 0 }, /* miscCallInfo at 611 */
-    { (ASN_TAG_CLASS_CONTEXT | (12 << 2)), 12, 0, 0 }, /* originalCalledPartyID at 612 */
-    { (ASN_TAG_CLASS_CONTEXT | (13 << 2)), 13, 0, 0 }, /* serviceProfileIdentifier at 613 */
-    { (ASN_TAG_CLASS_CONTEXT | (14 << 2)), 14, 0, 0 }, /* terminalType at 614 */
-    { (ASN_TAG_CLASS_CONTEXT | (16 << 2)), 15, 0, 0 }, /* triggerType at 616 */
-    { (ASN_TAG_CLASS_CONTEXT | (17 << 2)), 24, 0, 0 }, /* cause at 627 */
-    { (ASN_TAG_CLASS_CONTEXT | (18 << 2)), 25, 0, 0 }, /* componentType at 628 */
-    { (ASN_TAG_CLASS_CONTEXT | (19 << 2)), 26, 0, 0 }, /* component at 629 */
-    { (ASN_TAG_CLASS_CONTEXT | (20 << 2)), 27, 0, 0 }, /* componentCorrelationID at 630 */
-    { (ASN_TAG_CLASS_CONTEXT | (21 << 2)), 28, 0, 0 }, /* iSDNAccessRelatedInformation at 632 */
-    { (ASN_TAG_CLASS_CONTEXT | (22 << 2)), 29, 0, 0 }, /* iNServiceCompatibilityIndication at 634 */
-    { (ASN_TAG_CLASS_CONTEXT | (23 << 2)), 16, 0, 0 }, /* highLayerCompatibility at 617 */
-    { (ASN_TAG_CLASS_CONTEXT | (24 << 2)), 17, 0, 0 }, /* serviceInteractionIndicators at 619 */
-    { (ASN_TAG_CLASS_CONTEXT | (25 << 2)), 18, 0, 0 }, /* additionalCallingPartyNumber at 621 */
-    { (ASN_TAG_CLASS_CONTEXT | (26 << 2)), 19, 0, 0 }, /* forwardCallIndicators at 622 */
-    { (ASN_TAG_CLASS_CONTEXT | (27 << 2)), 20, 0, 0 }, /* bearerCapability at 623 */
-    { (ASN_TAG_CLASS_CONTEXT | (28 << 2)), 21, 0, 0 }, /* eventTypeBCSM at 624 */
-    { (ASN_TAG_CLASS_CONTEXT | (29 << 2)), 22, 0, 0 }, /* redirectingPartyID at 625 */
-    { (ASN_TAG_CLASS_CONTEXT | (30 << 2)), 23, 0, 0 }, /* redirectionInformation at 626 */
-    { (ASN_TAG_CLASS_CONTEXT | (31 << 2)), 30, 0, 0 }, /* genericNumbers at 635 */
-    { (ASN_TAG_CLASS_CONTEXT | (32 << 2)), 31, 0, 0 }, /* serviceInteractionIndicatorsTwo at 637 */
-    { (ASN_TAG_CLASS_CONTEXT | (33 << 2)), 32, 0, 0 }, /* forwardGVNS at 638 */
-    { (ASN_TAG_CLASS_CONTEXT | (34 << 2)), 33, 0, 0 }, /* createdCallSegmentAssociation at 639 */
-    { (ASN_TAG_CLASS_CONTEXT | (35 << 2)), 34, 0, 0 }, /* uSIServiceIndicator at 640 */
-    { (ASN_TAG_CLASS_CONTEXT | (36 << 2)), 35, 0, 0 }, /* uSIInformation at 641 */
-    { (ASN_TAG_CLASS_CONTEXT | (37 << 2)), 36, 0, 0 }, /* carrier at 642 */
-    { (ASN_TAG_CLASS_CONTEXT | (38 << 2)), 37, 0, 0 }, /* cCSS at 643 */
-    { (ASN_TAG_CLASS_CONTEXT | (39 << 2)), 38, 0, 0 }, /* vPNIndicator at 644 */
-    { (ASN_TAG_CLASS_CONTEXT | (40 << 2)), 39, 0, 0 }, /* cNInfo at 645 */
-    { (ASN_TAG_CLASS_CONTEXT | (41 << 2)), 40, 0, 0 }, /* callReference at 646 */
-    { (ASN_TAG_CLASS_CONTEXT | (42 << 2)), 41, 0, 0 }, /* routeingNumber at 647 */
-    { (ASN_TAG_CLASS_CONTEXT | (43 << 2)), 42, 0, 0 }, /* callingGeodeticLocation at 648 */
-    { (ASN_TAG_CLASS_CONTEXT | (44 << 2)), 48, 0, 0 }, /* globalCallReference at 655 */
-    { (ASN_TAG_CLASS_CONTEXT | (45 << 2)), 49, 0, 0 }, /* cug-Index at 656 */
-    { (ASN_TAG_CLASS_CONTEXT | (46 << 2)), 50, 0, 0 }, /* cug-Interlock at 657 */
-    { (ASN_TAG_CLASS_CONTEXT | (47 << 2)), 51, 0, 0 }, /* cug-OutgoingAccess at 658 */
-    { (ASN_TAG_CLASS_CONTEXT | (48 << 2)), 52, 0, 0 }, /* ipRelatedInformation at 659 */
-    { (ASN_TAG_CLASS_CONTEXT | (60 << 2)), 43, 0, 0 }, /* calledPartySubaddress at 649 */
-    { (ASN_TAG_CLASS_CONTEXT | (61 << 2)), 44, 0, 0 }, /* connectionIdentifier at 650 */
-    { (ASN_TAG_CLASS_CONTEXT | (62 << 2)), 45, 0, 0 }, /* genericIdentifier at 651 */
-    { (ASN_TAG_CLASS_CONTEXT | (63 << 2)), 46, 0, 0 }, /* qOSParameter at 652 */
-    { (ASN_TAG_CLASS_CONTEXT | (64 << 2)), 47, 0, 0 } /* bISDNParameters at 653 */
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* serviceKey at 601 */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* dialledDigits at 602 */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* calledPartyNumber at 603 */
+    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 }, /* callingPartyNumber at 604 */
+    { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 4, 0, 0 }, /* callingPartyBusinessGroupID at 605 */
+    { (ASN_TAG_CLASS_CONTEXT | (5 << 2)), 5, 0, 0 }, /* callingPartysCategory at 606 */
+    { (ASN_TAG_CLASS_CONTEXT | (6 << 2)), 6, 0, 0 }, /* callingPartySubaddress at 607 */
+    { (ASN_TAG_CLASS_CONTEXT | (7 << 2)), 7, 0, 0 }, /* cGEncountered at 608 */
+    { (ASN_TAG_CLASS_CONTEXT | (8 << 2)), 8, 0, 0 }, /* iPSSPCapabilities at 609 */
+    { (ASN_TAG_CLASS_CONTEXT | (9 << 2)), 9, 0, 0 }, /* iPAvailable at 610 */
+    { (ASN_TAG_CLASS_CONTEXT | (10 << 2)), 10, 0, 0 }, /* locationNumber at 611 */
+    { (ASN_TAG_CLASS_CONTEXT | (11 << 2)), 11, 0, 0 }, /* miscCallInfo at 612 */
+    { (ASN_TAG_CLASS_CONTEXT | (12 << 2)), 12, 0, 0 }, /* originalCalledPartyID at 613 */
+    { (ASN_TAG_CLASS_CONTEXT | (13 << 2)), 13, 0, 0 }, /* serviceProfileIdentifier at 614 */
+    { (ASN_TAG_CLASS_CONTEXT | (14 << 2)), 14, 0, 0 }, /* terminalType at 615 */
+    { (ASN_TAG_CLASS_CONTEXT | (16 << 2)), 15, 0, 0 }, /* triggerType at 617 */
+    { (ASN_TAG_CLASS_CONTEXT | (17 << 2)), 24, 0, 0 }, /* cause at 628 */
+    { (ASN_TAG_CLASS_CONTEXT | (18 << 2)), 25, 0, 0 }, /* componentType at 629 */
+    { (ASN_TAG_CLASS_CONTEXT | (19 << 2)), 26, 0, 0 }, /* component at 630 */
+    { (ASN_TAG_CLASS_CONTEXT | (20 << 2)), 27, 0, 0 }, /* componentCorrelationID at 631 */
+    { (ASN_TAG_CLASS_CONTEXT | (21 << 2)), 28, 0, 0 }, /* iSDNAccessRelatedInformation at 633 */
+    { (ASN_TAG_CLASS_CONTEXT | (22 << 2)), 29, 0, 0 }, /* iNServiceCompatibilityIndication at 635 */
+    { (ASN_TAG_CLASS_CONTEXT | (23 << 2)), 16, 0, 0 }, /* highLayerCompatibility at 618 */
+    { (ASN_TAG_CLASS_CONTEXT | (24 << 2)), 17, 0, 0 }, /* serviceInteractionIndicators at 620 */
+    { (ASN_TAG_CLASS_CONTEXT | (25 << 2)), 18, 0, 0 }, /* additionalCallingPartyNumber at 622 */
+    { (ASN_TAG_CLASS_CONTEXT | (26 << 2)), 19, 0, 0 }, /* forwardCallIndicators at 623 */
+    { (ASN_TAG_CLASS_CONTEXT | (27 << 2)), 20, 0, 0 }, /* bearerCapability at 624 */
+    { (ASN_TAG_CLASS_CONTEXT | (28 << 2)), 21, 0, 0 }, /* eventTypeBCSM at 625 */
+    { (ASN_TAG_CLASS_CONTEXT | (29 << 2)), 22, 0, 0 }, /* redirectingPartyID at 626 */
+    { (ASN_TAG_CLASS_CONTEXT | (30 << 2)), 23, 0, 0 }, /* redirectionInformation at 627 */
+    { (ASN_TAG_CLASS_CONTEXT | (31 << 2)), 30, 0, 0 }, /* genericNumbers at 636 */
+    { (ASN_TAG_CLASS_CONTEXT | (32 << 2)), 31, 0, 0 }, /* serviceInteractionIndicatorsTwo at 638 */
+    { (ASN_TAG_CLASS_CONTEXT | (33 << 2)), 32, 0, 0 }, /* forwardGVNS at 639 */
+    { (ASN_TAG_CLASS_CONTEXT | (34 << 2)), 33, 0, 0 }, /* createdCallSegmentAssociation at 640 */
+    { (ASN_TAG_CLASS_CONTEXT | (35 << 2)), 34, 0, 0 }, /* uSIServiceIndicator at 641 */
+    { (ASN_TAG_CLASS_CONTEXT | (36 << 2)), 35, 0, 0 }, /* uSIInformation at 642 */
+    { (ASN_TAG_CLASS_CONTEXT | (37 << 2)), 36, 0, 0 }, /* carrier at 643 */
+    { (ASN_TAG_CLASS_CONTEXT | (38 << 2)), 37, 0, 0 }, /* cCSS at 644 */
+    { (ASN_TAG_CLASS_CONTEXT | (39 << 2)), 38, 0, 0 }, /* vPNIndicator at 645 */
+    { (ASN_TAG_CLASS_CONTEXT | (40 << 2)), 39, 0, 0 }, /* cNInfo at 646 */
+    { (ASN_TAG_CLASS_CONTEXT | (41 << 2)), 40, 0, 0 }, /* callReference at 647 */
+    { (ASN_TAG_CLASS_CONTEXT | (42 << 2)), 41, 0, 0 }, /* routeingNumber at 648 */
+    { (ASN_TAG_CLASS_CONTEXT | (43 << 2)), 42, 0, 0 }, /* callingGeodeticLocation at 649 */
+    { (ASN_TAG_CLASS_CONTEXT | (44 << 2)), 48, 0, 0 }, /* globalCallReference at 656 */
+    { (ASN_TAG_CLASS_CONTEXT | (45 << 2)), 49, 0, 0 }, /* cug-Index at 657 */
+    { (ASN_TAG_CLASS_CONTEXT | (46 << 2)), 50, 0, 0 }, /* cug-Interlock at 658 */
+    { (ASN_TAG_CLASS_CONTEXT | (47 << 2)), 51, 0, 0 }, /* cug-OutgoingAccess at 659 */
+    { (ASN_TAG_CLASS_CONTEXT | (48 << 2)), 52, 0, 0 }, /* ipRelatedInformation at 660 */
+    { (ASN_TAG_CLASS_CONTEXT | (60 << 2)), 43, 0, 0 }, /* calledPartySubaddress at 650 */
+    { (ASN_TAG_CLASS_CONTEXT | (61 << 2)), 44, 0, 0 }, /* connectionIdentifier at 651 */
+    { (ASN_TAG_CLASS_CONTEXT | (62 << 2)), 45, 0, 0 }, /* genericIdentifier at 652 */
+    { (ASN_TAG_CLASS_CONTEXT | (63 << 2)), 46, 0, 0 }, /* qOSParameter at 653 */
+    { (ASN_TAG_CLASS_CONTEXT | (64 << 2)), 47, 0, 0 } /* bISDNParameters at 654 */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_InitialDPArg_specs_1 = {
 	sizeof(struct InitialDPArg),
diff --git a/asn1-compiled/LegID.c b/asn1-compiled/LegID.c
index 511d844..4a87853 100644
--- a/asn1-compiled/LegID.c
+++ b/asn1-compiled/LegID.c
@@ -27,8 +27,8 @@ static asn_TYPE_member_t asn_MBR_LegID_1[] = {
 		},
 };
 static asn_TYPE_tag2member_t asn_MAP_LegID_tag2el_1[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* sendingSideID at 472 */
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* receivingSideID at 474 */
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* sendingSideID at 473 */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* receivingSideID at 475 */
 };
 static asn_CHOICE_specifics_t asn_SPC_LegID_specs_1 = {
 	sizeof(struct LegID),
diff --git a/asn1-compiled/MiscCallInfo.c b/asn1-compiled/MiscCallInfo.c
index 24170f7..0c6cdd2 100644
--- a/asn1-compiled/MiscCallInfo.c
+++ b/asn1-compiled/MiscCallInfo.c
@@ -268,8 +268,8 @@ static ber_tlv_tag_t asn_DEF_MiscCallInfo_tags_1[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_TYPE_tag2member_t asn_MAP_MiscCallInfo_tag2el_1[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* messageType at 674 */
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* dpAssignment at 676 */
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* messageType at 675 */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* dpAssignment at 677 */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_MiscCallInfo_specs_1 = {
 	sizeof(struct MiscCallInfo),
diff --git a/asn1-compiled/ReturnError.c b/asn1-compiled/ReturnError.c
index 87a9eea..1cdfb56 100644
--- a/asn1-compiled/ReturnError.c
+++ b/asn1-compiled/ReturnError.c
@@ -17,7 +17,7 @@ static asn_TYPE_member_t asn_MBR_ReturnError_1[] = {
 		"invokeID"
 		},
 	{ ATF_NOFLAGS, 0, offsetof(struct ReturnError, errorCode),
-		-1 /* Ambiguous tag (CHOICE?) */,
+		(ASN_TAG_CLASS_UNIVERSAL | (2 << 2)),
 		0,
 		&asn_DEF_ErrorCode,
 		0,	/* Defer constraints checking to the member type */
@@ -39,15 +39,14 @@ static ber_tlv_tag_t asn_DEF_ReturnError_tags_1[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_TYPE_tag2member_t asn_MAP_ReturnError_tag2el_1[] = {
-    { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* invokeID at 167 */
-    { (ASN_TAG_CLASS_PRIVATE | (19 << 2)), 1, 0, 0 }, /* nationaler at 275 */
-    { (ASN_TAG_CLASS_PRIVATE | (20 << 2)), 1, 0, 0 } /* privateer at 277 */
+    { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* invokeID at 167 */
+    { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* errorCode at 168 */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_ReturnError_specs_1 = {
 	sizeof(struct ReturnError),
 	offsetof(struct ReturnError, _asn_ctx),
 	asn_MAP_ReturnError_tag2el_1,
-	3,	/* Count of tags in the map */
+	2,	/* Count of tags in the map */
 	0, 0, 0,	/* Optional elements (not needed) */
 	-1,	/* Start extensions */
 	-1	/* Stop extensions */
diff --git a/asn1-compiled/ServiceInteractionIndicatorsTwo.c b/asn1-compiled/ServiceInteractionIndicatorsTwo.c
index bad76c4..ac597ab 100644
--- a/asn1-compiled/ServiceInteractionIndicatorsTwo.c
+++ b/asn1-compiled/ServiceInteractionIndicatorsTwo.c
@@ -22,7 +22,7 @@ static ber_tlv_tag_t asn_DEF_redirectServiceTreatmentInd_tags_14[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_TYPE_tag2member_t asn_MAP_redirectServiceTreatmentInd_tag2el_14[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* redirectReason at 434 */
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* redirectReason at 435 */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_redirectServiceTreatmentInd_specs_14 = {
 	sizeof(struct redirectServiceTreatmentInd),
@@ -190,20 +190,20 @@ static ber_tlv_tag_t asn_DEF_ServiceInteractionIndicatorsTwo_tags_1[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_TYPE_tag2member_t asn_MAP_ServiceInteractionIndicatorsTwo_tag2el_1[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* forwardServiceInteractionInd at 387 */
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* backwardServiceInteractionInd at 390 */
-    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* bothwayThroughConnectionInd at 392 */
-    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 }, /* suspendTimer at 394 */
-    { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 4, 0, 0 }, /* connectedNumberTreatmentInd at 396 */
-    { (ASN_TAG_CLASS_CONTEXT | (5 << 2)), 5, 0, 0 }, /* suppressCallDiversionNotification at 398 */
-    { (ASN_TAG_CLASS_CONTEXT | (6 << 2)), 6, 0, 0 }, /* suppressCallTransferNotification at 400 */
-    { (ASN_TAG_CLASS_CONTEXT | (7 << 2)), 7, 0, 0 }, /* allowCdINNoPresentationInd at 402 */
-    { (ASN_TAG_CLASS_CONTEXT | (8 << 2)), 8, 0, 0 }, /* userDialogueDurationInd at 407 */
-    { (ASN_TAG_CLASS_CONTEXT | (9 << 2)), 9, 0, 0 }, /* overrideLineRestrictions at 412 */
-    { (ASN_TAG_CLASS_CONTEXT | (10 << 2)), 10, 0, 0 }, /* suppressVPNAPP at 419 */
-    { (ASN_TAG_CLASS_CONTEXT | (11 << 2)), 11, 0, 0 }, /* calledINNumberOverriding at 426 */
-    { (ASN_TAG_CLASS_CONTEXT | (12 << 2)), 12, 0, 0 }, /* redirectServiceTreatmentInd at 434 */
-    { (ASN_TAG_CLASS_CONTEXT | (13 << 2)), 13, 0, 0 } /* nonCUGCall at 447 */
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* forwardServiceInteractionInd at 388 */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* backwardServiceInteractionInd at 391 */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* bothwayThroughConnectionInd at 393 */
+    { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 }, /* suspendTimer at 395 */
+    { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 4, 0, 0 }, /* connectedNumberTreatmentInd at 397 */
+    { (ASN_TAG_CLASS_CONTEXT | (5 << 2)), 5, 0, 0 }, /* suppressCallDiversionNotification at 399 */
+    { (ASN_TAG_CLASS_CONTEXT | (6 << 2)), 6, 0, 0 }, /* suppressCallTransferNotification at 401 */
+    { (ASN_TAG_CLASS_CONTEXT | (7 << 2)), 7, 0, 0 }, /* allowCdINNoPresentationInd at 403 */
+    { (ASN_TAG_CLASS_CONTEXT | (8 << 2)), 8, 0, 0 }, /* userDialogueDurationInd at 408 */
+    { (ASN_TAG_CLASS_CONTEXT | (9 << 2)), 9, 0, 0 }, /* overrideLineRestrictions at 413 */
+    { (ASN_TAG_CLASS_CONTEXT | (10 << 2)), 10, 0, 0 }, /* suppressVPNAPP at 420 */
+    { (ASN_TAG_CLASS_CONTEXT | (11 << 2)), 11, 0, 0 }, /* calledINNumberOverriding at 427 */
+    { (ASN_TAG_CLASS_CONTEXT | (12 << 2)), 12, 0, 0 }, /* redirectServiceTreatmentInd at 435 */
+    { (ASN_TAG_CLASS_CONTEXT | (13 << 2)), 13, 0, 0 } /* nonCUGCall at 448 */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_ServiceInteractionIndicatorsTwo_specs_1 = {
 	sizeof(struct ServiceInteractionIndicatorsTwo),
diff --git a/asn1-compiled/USIServiceIndicator.c b/asn1-compiled/USIServiceIndicator.c
index 0a8dbcd..1200652 100644
--- a/asn1-compiled/USIServiceIndicator.c
+++ b/asn1-compiled/USIServiceIndicator.c
@@ -53,8 +53,8 @@ static asn_TYPE_member_t asn_MBR_USIServiceIndicator_1[] = {
 		},
 };
 static asn_TYPE_tag2member_t asn_MAP_USIServiceIndicator_tag2el_1[] = {
-    { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 1, 0, 0 }, /* local at 715 */
-    { (ASN_TAG_CLASS_UNIVERSAL | (6 << 2)), 0, 0, 0 } /* global at 713 */
+    { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 1, 0, 0 }, /* local at 716 */
+    { (ASN_TAG_CLASS_UNIVERSAL | (6 << 2)), 0, 0, 0 } /* global at 714 */
 };
 static asn_CHOICE_specifics_t asn_SPC_USIServiceIndicator_specs_1 = {
 	sizeof(struct USIServiceIndicator),
diff --git a/asn1/tcap.asn b/asn1/tcap.asn
index 93a4087..dddecd1 100644
--- a/asn1/tcap.asn
+++ b/asn1/tcap.asn
@@ -270,11 +270,12 @@ ReturnErrorProblem	::=	INTEGER {		unrecognizedInvokeID (0),
 								mistypedParameter (4) }
 
 
-ErrorCode ::= CHOICE
-			{
-				nationaler 		[PRIVATE 19] IMPLICIT INTEGER (-32768..32767),
-				privateer 		[PRIVATE 20] IMPLICIT INTEGER
-			}
+-- ErrorCode ::= CHOICE
+-- 			{
+-- 				nationaler 		[PRIVATE 19] IMPLICIT INTEGER (-32768..32767),
+-- 				privateer 		[PRIVATE 20] IMPLICIT INTEGER
+-- 			}
+ErrorCode ::= INTEGER